xml default

core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java

@@ -66,9 +66,9 @@ public void testFromRestModel() throws Exception {
         assertTrue(xml.contains("</rests>"));
 
         assertTrue(xml.contains(
-                "<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\" description=\"header param description1\" type=\"header\" required=\"true\""));
+                "<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\" description=\"header param description1\" type=\"header\""));
         assertTrue(xml.contains(
-                "<param defaultValue=\"b\" dataType=\"string\" name=\"header_letter\" description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\""));
+                "<param defaultValue=\"b\" name=\"header_letter\" description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\""));
         assertTrue(xml.contains("<value>1</value>"));
         assertTrue(xml.contains("<value>a</value>"));
 

core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java

@@ -66,9 +66,9 @@ public void testFromRestModelPlaceholder() throws Exception {
         assertTrue(xml.contains("</rests>"));
 
         assertTrue(xml.contains(
-                "<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\" description=\"header param description1\" type=\"header\" required=\"true\""));
+                "<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\" description=\"header param description1\" type=\"header\""));
         assertTrue(xml.contains(
-                "<param defaultValue=\"b\" dataType=\"string\" name=\"header_letter\" description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\""));
+                "<param defaultValue=\"b\" name=\"header_letter\" description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\""));
         assertTrue(xml.contains("<value>1</value>"));
         assertTrue(xml.contains("<value>a</value>"));
 

core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java

@@ -180,7 +180,7 @@ public final class SensitiveUtils {
                                                     + "|\\Qverificationcode\\E"
                                                     + "|\\Qwebhookverifytoken\\E"
                                                     + "|\\Qzookeeperpassword\\E"
-                                                    // SENSITIVE-PATTERN: END
+    // SENSITIVE-PATTERN: END
     ;
 
     private SensitiveUtils() {

core/camel-xml-io/src/test/resources/resequencerStream.xml

@@ -21,7 +21,7 @@
     <route>
     	<from uri="direct:start" />
     	<resequence>
-            <streamConfig capacity="1000" timeout="2000"/>
+            <streamConfig timeout="2000"/>
     		<simple>in.header.seqnum</simple>
     		<to uri="mock:result" />
     	</resequence>

core/camel-xml-io/src/test/resources/restAllowedValues.xml

@@ -21,7 +21,7 @@
     <rest path="/say/bye">
         <get consumes="application/json">
             <param name="header_count" type="header" description="header param description1" dataType="integer"
-                   defaultValue="1" required="true">
+                   defaultValue="1">
                 <allowableValues>
                     <value>1</value>
                     <value>2</value>

core/camel-xml-io/src/test/resources/routeWithJSonDataFormat.xml

@@ -22,7 +22,7 @@
         <from uri="seda:a"/>
         <pipeline>
             <marshal>
-                <json library="Jackson"/>
+                <json/>
             </marshal>
             <to uri="seda:b"/>
         </pipeline>

core/camel-xml-io/src/test/resources/routingSlip.xml

@@ -20,7 +20,7 @@
 <routes id="camel" xmlns="http://camel.apache.org/schema/spring">
   <route>
     <from uri="seda:a"/>
-    <routingSlip uriDelimiter=",">
+    <routingSlip>
       <header>destinations</header>
     </routingSlip>
   </route>

core/camel-xml-io/src/test/resources/routingSlipHeaderSet.xml

@@ -20,7 +20,7 @@
 <routes id="camel" xmlns="http://camel.apache.org/schema/spring">
   <route>
     <from uri="seda:a"/>
-    <routingSlip uriDelimiter=",">
+    <routingSlip>
       <header>theRoutingSlipHeader</header>
     </routingSlip>
   </route>

docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_9.adoc

@@ -18,6 +18,10 @@ Renamed `ExchangePropertyKey.ACTIVE_SPAN` to `ExchangePropertyKey.OTEL_ACTIVE_SP
 The `queueSize` attribute on endpoints which are `ManagedBrowseableEndpoint` is changed from returning a `Long` value
 to an `Integer` value.
 
+=== camel-xml-io
+
+The XML dumper no longer includes attributes which are using default values.
+
 === camel-jackson
 
 The option `useWriter` on JSON data format and camel-jackson,

tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java

@@ -62,6 +62,7 @@
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.camel.maven.packaging.generics.JandexStore;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.tooling.util.srcgen.GenericType;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -515,5 +516,25 @@ public String getAttributeName() {
             return an;
         }
 
+        public String getDefaultValue() {
+            String answer = null;
+            Metadata m = getAnnotation(Metadata.class);
+            if (m != null) {
+                answer = m.defaultValue();
+            }
+            if (answer == null || answer.isBlank()) {
+                answer = "null";
+            } else {
+                if (answer.equals("\"")) {
+                    answer = "\\\"";
+                }
+                if (answer.equals("\\")) {
+                    answer = "\\\\";
+                }
+                answer = "\"" + answer + "\"";
+            }
+            return answer;
+        }
+
     }
 }

tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-writer.vm

@@ -116,9 +116,9 @@ public class ModelWriter extends BaseWriter {
                 #end
                 #foreach( $member in $thisAttributes )
                     #if( $member.type.getName() == "java.lang.String" )
-        doWriteAttribute("${member.attributeName}", def.${member.getter}());
+        doWriteAttribute("${member.attributeName}", def.${member.getter}(), ${member.defaultValue});
                     #else
-        doWriteAttribute("${member.attributeName}", toString(def.${member.getter}()));
+        doWriteAttribute("${member.attributeName}", toString(def.${member.getter}()), ${member.defaultValue});
                     #end
                 #end
             #end
@@ -277,10 +277,19 @@ public class ModelWriter extends BaseWriter {
 
     protected void doWriteAttribute(
             String attribute,
-            Object value)
+            String value)
+            throws IOException {
+        doWriteAttribute(attribute, value, null);
+    }
+    protected void doWriteAttribute(
+            String attribute,
+            String value,
+            String defaultValue)
             throws IOException {
         if (value != null) {
-            attribute(attribute, value);
+            if (defaultValue == null || !defaultValue.equals(value)) {
+                attribute(attribute, value);
+            }
         }
     }
     protected void doWriteValue(String value) throws IOException {