CAMEL-12941: camel-bindy - Add option to use null as default value for string types (#20607)

Author: davsclaus

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json

@@ -19,8 +19,9 @@
     "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" },
     "type": { "index": 1, "kind": "attribute", "displayName": "Type", "group": "common", "required": true, "type": "enum", "javaType": "org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed", "KeyValue" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Csv", "description": "Whether to use Csv, Fixed, or KeyValue." },
     "classType": { "index": 2, "kind": "attribute", "displayName": "Class Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of model class to use." },
-    "allowEmptyStream": { "index": 3, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "unwrapSingleInstance": { "index": 4, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
-    "locale": { "index": 5, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
+    "defaultValueStringAsNull": { "index": 3, "kind": "attribute", "displayName": "Default Value String As Null", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To change the default value for string types to be null instead of an empty string." },
+    "allowEmptyStream": { "index": 4, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
+    "unwrapSingleInstance": { "index": 5, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
+    "locale": { "index": 6, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
   }
 }

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json

@@ -19,8 +19,9 @@
     "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" },
     "type": { "index": 1, "kind": "attribute", "displayName": "Type", "group": "common", "required": true, "type": "enum", "javaType": "org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed", "KeyValue" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Fixed", "description": "Whether to use Csv, Fixed, or KeyValue." },
     "classType": { "index": 2, "kind": "attribute", "displayName": "Class Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of model class to use." },
-    "allowEmptyStream": { "index": 3, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "unwrapSingleInstance": { "index": 4, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
-    "locale": { "index": 5, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
+    "defaultValueStringAsNull": { "index": 3, "kind": "attribute", "displayName": "Default Value String As Null", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To change the default value for string types to be null instead of an empty string." },
+    "allowEmptyStream": { "index": 4, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
+    "unwrapSingleInstance": { "index": 5, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
+    "locale": { "index": 6, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
   }
 }

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json

@@ -19,8 +19,9 @@
     "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" },
     "type": { "index": 1, "kind": "attribute", "displayName": "Type", "group": "common", "required": true, "type": "enum", "javaType": "org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed", "KeyValue" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "KeyValue", "description": "Whether to use Csv, Fixed, or KeyValue." },
     "classType": { "index": 2, "kind": "attribute", "displayName": "Class Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of model class to use." },
-    "allowEmptyStream": { "index": 3, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "unwrapSingleInstance": { "index": 4, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
-    "locale": { "index": 5, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
+    "defaultValueStringAsNull": { "index": 3, "kind": "attribute", "displayName": "Default Value String As Null", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To change the default value for string types to be null instead of an empty string." },
+    "allowEmptyStream": { "index": 4, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
+    "unwrapSingleInstance": { "index": 5, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
+    "locale": { "index": 6, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
   }
 }

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bindy.json

@@ -16,8 +16,9 @@
     "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" },
     "type": { "index": 1, "kind": "attribute", "displayName": "Type", "group": "common", "required": true, "type": "enum", "javaType": "org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed", "KeyValue" ], "deprecated": false, "autowired": false, "secret": false, "description": "Whether to use Csv, Fixed, or KeyValue." },
     "classType": { "index": 2, "kind": "attribute", "displayName": "Class Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of model class to use." },
-    "allowEmptyStream": { "index": 3, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "unwrapSingleInstance": { "index": 4, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
-    "locale": { "index": 5, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
+    "defaultValueStringAsNull": { "index": 3, "kind": "attribute", "displayName": "Default Value String As Null", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To change the default value for string types to be null instead of an empty string." },
+    "allowEmptyStream": { "index": 4, "kind": "attribute", "displayName": "Allow Empty Stream", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
+    "unwrapSingleInstance": { "index": 5, "kind": "attribute", "displayName": "Unwrap Single Instance", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
+    "locale": { "index": 6, "kind": "attribute", "displayName": "Locale", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }
   }
 }

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd

@@ -8070,6 +8070,15 @@ Whether to use Csv, Fixed, or KeyValue.
             <xs:documentation xml:lang="en">
 <![CDATA[
 Name of model class to use.
+]]>
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="defaultValueStringAsNull" type="xs:string">
+          <xs:annotation>
+            <xs:documentation xml:lang="en">
+<![CDATA[
+To change the default value for string types to be null instead of an empty string. Default value: false
 ]]>
             </xs:documentation>
           </xs:annotation>

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd

@@ -6743,6 +6743,15 @@ Whether to use Csv, Fixed, or KeyValue.
             <xs:documentation xml:lang="en">
 <![CDATA[
 Name of model class to use.
+]]>
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="defaultValueStringAsNull" type="xs:string">
+          <xs:annotation>
+            <xs:documentation xml:lang="en">
+<![CDATA[
+To change the default value for string types to be null instead of an empty string. Default value: false
 ]]>
             </xs:documentation>
           </xs:annotation>

components/camel-bindy/src/generated/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormatConfigurer.java

@@ -24,6 +24,7 @@ public class BindyCsvDataFormatConfigurer extends org.apache.camel.support.compo
         Map<String, Object> map = new CaseInsensitiveMap();
         map.put("AllowEmptyStream", boolean.class);
         map.put("ClassType", java.lang.Class.class);
+        map.put("DefaultValueStringAsNull", boolean.class);
         map.put("Locale", java.lang.String.class);
         map.put("UnwrapSingleInstance", boolean.class);
         ALL_OPTIONS = map;
@@ -37,6 +38,8 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
         case "allowEmptyStream": target.setAllowEmptyStream(property(camelContext, boolean.class, value)); return true;
         case "classtype":
         case "classType": target.setClassType(property(camelContext, java.lang.Class.class, value)); return true;
+        case "defaultvaluestringasnull":
+        case "defaultValueStringAsNull": target.setDefaultValueStringAsNull(property(camelContext, boolean.class, value)); return true;
         case "locale": target.setLocale(property(camelContext, java.lang.String.class, value)); return true;
         case "unwrapsingleinstance":
         case "unwrapSingleInstance": target.setUnwrapSingleInstance(property(camelContext, boolean.class, value)); return true;
@@ -56,6 +59,8 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
         case "allowEmptyStream": return boolean.class;
         case "classtype":
         case "classType": return java.lang.Class.class;
+        case "defaultvaluestringasnull":
+        case "defaultValueStringAsNull": return boolean.class;
         case "locale": return java.lang.String.class;
         case "unwrapsingleinstance":
         case "unwrapSingleInstance": return boolean.class;
@@ -71,6 +76,8 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         case "allowEmptyStream": return target.isAllowEmptyStream();
         case "classtype":
         case "classType": return target.getClassType();
+        case "defaultvaluestringasnull":
+        case "defaultValueStringAsNull": return target.isDefaultValueStringAsNull();
         case "locale": return target.getLocale();
         case "unwrapsingleinstance":
         case "unwrapSingleInstance": return target.isUnwrapSingleInstance();