You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/11/07 13:03:43 UTC
[camel] 02/02: CAMEL-17505: camel-core - Don't set default values
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-17505/dataformat-dsl-with-primitive-types
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 97ca8b61851faec305c2913e738e7142ef745d95
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Mon Nov 7 14:02:11 2022 +0100
CAMEL-17505: camel-core - Don't set default values
---
.../org/apache/camel/model/dataformat/Any23DataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/AvroDataFormat.java | 6 +++---
.../apache/camel/model/dataformat/Base64DataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/BindyDataFormat.java | 4 ++--
.../org/apache/camel/model/dataformat/CBORDataFormat.java | 10 +++++-----
.../apache/camel/model/dataformat/CryptoDataFormat.java | 6 +++---
.../org/apache/camel/model/dataformat/CsvDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/FhirDataformat.java | 4 ++--
.../apache/camel/model/dataformat/FlatpackDataFormat.java | 4 ++--
.../org/apache/camel/model/dataformat/GrokDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/HL7DataFormat.java | 2 +-
.../camel/model/dataformat/JacksonXMLDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/JaxbDataFormat.java | 4 ++--
.../org/apache/camel/model/dataformat/JsonDataFormat.java | 10 +++++-----
.../org/apache/camel/model/dataformat/PGPDataFormat.java | 4 ++--
.../apache/camel/model/dataformat/ProtobufDataFormat.java | 10 +++++-----
.../org/apache/camel/model/dataformat/SoapDataFormat.java | 2 +-
.../apache/camel/model/dataformat/TarFileDataFormat.java | 2 +-
.../apache/camel/model/dataformat/ThriftDataFormat.java | 4 ++--
.../camel/model/dataformat/TidyMarkupDataFormat.java | 2 +-
.../model/dataformat/UniVocityAbstractDataFormat.java | 10 +++++-----
.../camel/model/dataformat/UniVocityCsvDataFormat.java | 6 +++---
.../camel/model/dataformat/UniVocityTsvDataFormat.java | 2 +-
.../camel/model/dataformat/XMLSecurityDataFormat.java | 10 +++++-----
.../apache/camel/model/dataformat/XStreamDataFormat.java | 14 +++++++++++++-
.../org/apache/camel/model/dataformat/YAMLDataFormat.java | 6 +++---
.../camel/model/dataformat/ZipDeflaterDataFormat.java | 2 +-
.../apache/camel/model/dataformat/ZipFileDataFormat.java | 2 +-
28 files changed, 74 insertions(+), 62 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 9c7914f060a..ea43ab81d79 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -169,7 +169,7 @@ public class Any23DataFormat extends DataFormatDefinition {
@XmlTransient
public static class Builder implements DataFormatBuilder<Any23DataFormat> {
- private String outputFormat = "RDF4JMODEL";
+ private String outputFormat;
private String baseUri;
private List<PropertyDefinition> configuration;
private Map<String, String> configurations;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
index 385c6611ddb..9d93ba3b137 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
@@ -534,7 +534,7 @@ public class AvroDataFormat extends DataFormatDefinition {
private String instanceClassName;
private AvroLibrary library = AvroLibrary.ApacheAvro;
private String objectMapper;
- private String useDefaultObjectMapper = "true";
+ private String useDefaultObjectMapper;
private String unmarshalTypeName;
private String jsonViewTypeName;
private String include;
@@ -548,9 +548,9 @@ public class AvroDataFormat extends DataFormatDefinition {
private String allowUnmarshallType;
private String timezone;
private String autoDiscoverObjectMapper;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
private String schemaResolver;
- private String autoDiscoverSchemaResolver = "true";
+ private String autoDiscoverSchemaResolver;
/**
* Class name to use for marshal and unmarshalling
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
index f72157eaeb7..4428192a480 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
@@ -99,7 +99,7 @@ public class Base64DataFormat extends DataFormatDefinition {
@XmlTransient
public static class Builder implements DataFormatBuilder<Base64DataFormat> {
- private String lineLength = "76";
+ private String lineLength;
private String lineSeparator;
private String urlSafe;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
index 6e953ad105d..c94c26d07de 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
@@ -229,8 +229,8 @@ public class BindyDataFormat extends DataFormatDefinition {
private Class<?> clazz;
private String type;
private String classType;
- private String allowEmptyStream = "false";
- private String unwrapSingleInstance = "true";
+ private String allowEmptyStream;
+ private String unwrapSingleInstance;
private String locale;
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
index 27e7a84f1a6..cb6cc657af1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
@@ -246,13 +246,13 @@ public class CBORDataFormat extends DataFormatDefinition {
private Class<?> collectionType;
private Class<?> unmarshalType;
private String objectMapper;
- private String useDefaultObjectMapper = "true";
+ private String useDefaultObjectMapper;
private String unmarshalTypeName;
private String collectionTypeName;
- private String useList = "false";
- private String allowUnmarshallType = "false";
- private String prettyPrint = "false";
- private String allowJmsType = "false";
+ private String useList;
+ private String allowUnmarshallType;
+ private String prettyPrint;
+ private String allowJmsType;
private String enableFeatures;
private String disableFeatures;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
index ce51e6e4bb8..a66d7d6885d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
@@ -191,10 +191,10 @@ public class CryptoDataFormat extends DataFormatDefinition {
private String cryptoProvider;
private String initVectorRef;
private String algorithmParameterRef;
- private String bufferSize = "4096";
+ private String bufferSize;
private String macAlgorithm = "HmacSHA1";
- private String shouldAppendHMAC = "true";
- private String inline = "false";
+ private String shouldAppendHMAC;
+ private String inline;
/**
* The JCE algorithm name indicating the cryptographic algorithm that will be used.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index fdf6d303944..5d5c914ad89 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -510,7 +510,7 @@ public class CsvDataFormat extends DataFormatDefinition {
@XmlTransient
public static class Builder implements DataFormatBuilder<CsvDataFormat> {
private String formatRef;
- private String formatName = "DEFAULT";
+ private String formatName;
private String commentMarkerDisabled;
private String commentMarker;
private String delimiter;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
index 58f46bcf704..8f4a6e03f07 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
@@ -403,7 +403,7 @@ public abstract class FhirDataformat extends DataFormatDefinition implements Con
implements DataFormatBuilder<F> {
private Object fhirContext;
- private String fhirVersion = "R4";
+ private String fhirVersion;
private String prettyPrint;
private Object parserErrorHandler;
private Object parserOptions;
@@ -419,7 +419,7 @@ public abstract class FhirDataformat extends DataFormatDefinition implements Con
private String summaryMode;
private String suppressNarratives;
private List<String> dontStripVersionsFromReferencesAtPaths;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
public T fhirContext(Object fhirContext) {
this.fhirContext = fhirContext;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
index 1e3b59e25ca..e48e70fc9ce 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
@@ -175,8 +175,8 @@ public class FlatpackDataFormat extends DataFormatDefinition {
private String definition;
private String fixed;
- private String delimiter = ",";
- private String ignoreFirstRecord = "true";
+ private String delimiter;
+ private String ignoreFirstRecord;
private String allowShortLines;
private String ignoreExtraColumns;
private String textQualifier;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
index 3f5e041db08..265bd301206 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
@@ -118,7 +118,7 @@ public class GrokDataFormat extends DataFormatDefinition {
private String pattern;
private String flattened;
- private String allowMultipleMatchesPerLine = "true";
+ private String allowMultipleMatchesPerLine;
private String namedOnly;
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
index 0bacf9ecd16..4eaa21d97c1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
@@ -83,7 +83,7 @@ public class HL7DataFormat extends DataFormatDefinition {
public static class Builder implements DataFormatBuilder<HL7DataFormat> {
private Object parser;
- private String validate = "true";
+ private String validate;
/**
* Whether to validate the HL7 message
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
index 9a3143fd99b..42f8914322a 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
@@ -367,7 +367,7 @@ public class JacksonXMLDataFormat extends DataFormatDefinition implements Conten
private String moduleRefs;
private String enableFeatures;
private String disableFeatures;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
/**
* Lookup and use the existing XmlMapper with the given id.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index 7c826cb8db3..82df4f41e9a 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -356,7 +356,7 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH
private String contextPath;
private String contextPathIsClassName;
private String schema;
- private String schemaSeverityLevel = "0";
+ private String schemaSeverityLevel;
private String prettyPrint;
private String objectFactory;
private String ignoreJAXBElement;
@@ -371,7 +371,7 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH
private String schemaLocation;
private String noNamespaceSchemaLocation;
private String jaxbProviderProperties;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
/**
* Package name where your JAXB classes are located.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index a8184d42a0c..099b83dd173 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -643,8 +643,8 @@ public class JsonDataFormat extends DataFormatDefinition implements ContentTypeH
public static class Builder implements DataFormatBuilder<JsonDataFormat> {
private String objectMapper;
- private String useDefaultObjectMapper = "true";
- private String autoDiscoverObjectMapper = "false";
+ private String useDefaultObjectMapper;
+ private String autoDiscoverObjectMapper;
private String prettyPrint;
private JsonLibrary library = JsonLibrary.Jackson;
private String unmarshalTypeName;
@@ -663,11 +663,11 @@ public class JsonDataFormat extends DataFormatDefinition implements ContentTypeH
private String permissions;
private String allowUnmarshallType;
private String timezone;
- private String dropRootNode = "false";
+ private String dropRootNode;
private String schemaResolver;
- private String autoDiscoverSchemaResolver = "true";
+ private String autoDiscoverSchemaResolver;
private String namingStrategy;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
public Builder contentTypeHeader(String contentTypeHeader) {
this.contentTypeHeader = contentTypeHeader;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
index 07c03d1c906..3e33bd68985 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
@@ -280,8 +280,8 @@ public class PGPDataFormat extends DataFormatDefinition {
private String keyFileName;
private String signatureKeyFileName;
private String signatureKeyRing;
- private String armored = "false";
- private String integrity = "true";
+ private String armored;
+ private String integrity;
private String provider;
private String algorithm;
private String compressionAlgorithm;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
index 9ee7e7b9472..9c4c48ad3a7 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
@@ -551,8 +551,8 @@ public class ProtobufDataFormat extends DataFormatDefinition implements ContentT
private Object defaultInstance;
private String instanceClass;
private String objectMapper;
- private String useDefaultObjectMapper = "true";
- private String autoDiscoverObjectMapper = "false";
+ private String useDefaultObjectMapper;
+ private String autoDiscoverObjectMapper;
private ProtobufLibrary library = ProtobufLibrary.GoogleProtobuf;
private String unmarshalTypeName;
private Class<?> unmarshalType;
@@ -570,9 +570,9 @@ public class ProtobufDataFormat extends DataFormatDefinition implements ContentT
private String allowUnmarshallType;
private String timezone;
private String schemaResolver;
- private String autoDiscoverSchemaResolver = "true";
- private String contentTypeFormat = "native";
- private String contentTypeHeader = "true";
+ private String autoDiscoverSchemaResolver;
+ private String contentTypeFormat;
+ private String contentTypeHeader;
/**
* Name of class to use when unmarshalling
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
index aad760a6f7c..dc60ba7cb00 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapDataFormat.java
@@ -208,7 +208,7 @@ public class SoapDataFormat extends DataFormatDefinition {
private String encoding;
private String elementNameStrategyRef;
private Object elementNameStrategy;
- private String version = "1.1";
+ private String version;
private String namespacePrefixRef;
private String schema;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
index f9208c19f65..9adbc8596f6 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
@@ -118,7 +118,7 @@ public class TarFileDataFormat extends DataFormatDefinition {
private String usingIterator;
private String allowEmptyDirectory;
private String preservePathElements;
- private String maxDecompressedSize = "1073741824";
+ private String maxDecompressedSize;
/**
* If the tar file has more than one entry, the setting this option to true, allows working with the splitter
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
index 7707d111d9e..b429b6686be 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
@@ -119,8 +119,8 @@ public class ThriftDataFormat extends DataFormatDefinition implements ContentTyp
private Object defaultInstance;
private String instanceClass;
- private String contentTypeFormat = "binary";
- private String contentTypeHeader = "true";
+ private String contentTypeFormat;
+ private String contentTypeHeader;
/**
* Name of class to use when unmarshalling
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
index 459df6aa409..e3c901c2d77 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
@@ -111,7 +111,7 @@ public class TidyMarkupDataFormat extends DataFormatDefinition {
public static class Builder implements DataFormatBuilder<TidyMarkupDataFormat> {
private Class<?> dataObjectType;
- private String dataObjectTypeName = "org.w3c.dom.Node";
+ private String dataObjectTypeName;
private String omitXmlDeclaration;
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
index bf58917b70c..e2e55bb6aa3 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
@@ -291,17 +291,17 @@ public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition {
implements DataFormatBuilder<F> {
private String nullValue;
- private String skipEmptyLines = "true";
- private String ignoreTrailingWhitespaces = "true";
- private String ignoreLeadingWhitespaces = "true";
+ private String skipEmptyLines;
+ private String ignoreTrailingWhitespaces;
+ private String ignoreLeadingWhitespaces;
private String headersDisabled;
private List<UniVocityHeader> headers;
private String headerExtractionEnabled;
private String numberOfRecordsToRead;
private String emptyValue;
private String lineSeparator;
- private String normalizedLineSeparator = "\\n";
- private String comment = "#";
+ private String normalizedLineSeparator;
+ private String comment;
private String lazyLoad;
private String asMap;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
index e52cea6e485..78b3b261c27 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
@@ -107,10 +107,10 @@ public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat {
@XmlTransient
public static class Builder extends AbstractBuilder<Builder, UniVocityCsvDataFormat> {
- private String delimiter = ",";
+ private String delimiter;
private String quoteAllFields;
- private String quote = "\"";
- private String quoteEscape = "\"";
+ private String quote;
+ private String quoteEscape;
/**
* Whether or not all values must be quoted when writing them.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
index c9419c412a1..edf1a158053 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
@@ -62,7 +62,7 @@ public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat {
@XmlTransient
public static class Builder extends AbstractBuilder<Builder, UniVocityTsvDataFormat> {
- private String escapeChar = "\\";
+ private String escapeChar;
/**
* The escape character.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
index 067bde9d1e4..e10f25fbdbd 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
@@ -302,18 +302,18 @@ public class XMLSecurityDataFormat extends DataFormatDefinition implements Names
@XmlTransient
public static class Builder implements DataFormatBuilder<XMLSecurityDataFormat> {
- private String xmlCipherAlgorithm = "AES-256-GCM";
+ private String xmlCipherAlgorithm;
private String passPhrase;
private byte[] passPhraseByte;
private String secureTag;
private String secureTagContents;
- private String keyCipherAlgorithm = "RSA_OAEP";
+ private String keyCipherAlgorithm;
private String recipientKeyAlias;
private String keyOrTrustStoreParametersRef;
private String keyPassword;
- private String digestAlgorithm = "SHA1";
- private String mgfAlgorithm = "MGF1_SHA1";
- private String addKeyValueForEncryptedKey = "true";
+ private String digestAlgorithm;
+ private String mgfAlgorithm;
+ private String addKeyValueForEncryptedKey;
private KeyStoreParameters keyOrTrustStoreParameters;
private Map<String, String> namespaces;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 9a82de88875..4a23715d472 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -322,7 +322,7 @@ public class XStreamDataFormat extends DataFormatDefinition implements ContentTy
private String driver;
private String driverRef;
private String mode;
- private String contentTypeHeader = "true";
+ private String contentTypeHeader;
private List<PropertyDefinition> converters;
private List<PropertyDefinition> aliases;
private List<PropertyDefinition> omitFields;
@@ -383,6 +383,18 @@ public class XStreamDataFormat extends DataFormatDefinition implements ContentTy
return converters(XStreamDataFormat.toList(converters));
}
+ /**
+ * Alias a Class to a shorter name to be used in XML elements.
+ */
+ public Builder aliases(List<PropertyDefinition> aliases) {
+ this.aliases = aliases;
+ return this;
+ }
+
+ public Builder aliases(Map<String, String> aliases) {
+ return aliases(toList(aliases));
+ }
+
/**
* Prevents a field from being serialized. To omit a field you must always provide the declaring type and not
* necessarily the type that is converted. Multiple values can be separated by comma.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index 03d0f29127b..963cbcd9b7b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -44,7 +44,7 @@ public class YAMLDataFormat extends DataFormatDefinition {
@XmlAttribute
@Metadata(defaultValue = "SnakeYAML")
- private YAMLLibrary library = YAMLLibrary.SnakeYAML;
+ private YAMLLibrary library;
@XmlAttribute(name = "unmarshalType")
private String unmarshalTypeName;
@XmlAttribute
@@ -288,11 +288,11 @@ public class YAMLDataFormat extends DataFormatDefinition {
private String representer;
private String dumperOptions;
private String resolver;
- private String useApplicationContextClassLoader = "true";
+ private String useApplicationContextClassLoader;
private String prettyFlow;
private String allowAnyType;
private List<YAMLTypeFilterDefinition> typeFilters;
- private String maxAliasesForCollections = "50";
+ private String maxAliasesForCollections;
private String allowRecursiveKeys;
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
index 907313ea43c..ace0e0ecd25 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
@@ -65,7 +65,7 @@ public class ZipDeflaterDataFormat extends DataFormatDefinition {
@XmlTransient
public static class Builder implements DataFormatBuilder<ZipDeflaterDataFormat> {
- private String compressionLevel = "-1";
+ private String compressionLevel;
/**
* To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is the
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
index 363d54845a5..f15fee2ae9f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
@@ -119,7 +119,7 @@ public class ZipFileDataFormat extends DataFormatDefinition {
private String usingIterator;
private String allowEmptyDirectory;
private String preservePathElements;
- private String maxDecompressedSize = "1073741824";
+ private String maxDecompressedSize;
/**
* If the zip file has more than one entry, the setting this option to true, allows working with the splitter