You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/05/11 16:32:00 UTC
[camel] branch main updated: Regen for commit 5acdaf05cf309671ac4afb10f91f413102af21c5 (#7593)
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 6678c5f0b21 Regen for commit 5acdaf05cf309671ac4afb10f91f413102af21c5 (#7593)
6678c5f0b21 is described below
commit 6678c5f0b2163689b4b37ab553b2c8bc002654b7
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed May 11 18:31:52 2022 +0200
Regen for commit 5acdaf05cf309671ac4afb10f91f413102af21c5 (#7593)
Signed-off-by: GitHub <no...@github.com>
Co-authored-by: jamesnetherton <ja...@users.noreply.github.com>
---
.../apache/camel/catalog/schemas/camel-spring.xsd | 13 ++++++++++---
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 21 ++++++++++++++-------
.../xml/CamelStreamCachingStrategyDefinition.java | 6 +++---
.../camel/main/DefaultConfigurationProperties.java | 12 ++++++------
4 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index e004fac7269..ae5bd7c872c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -2699,9 +2699,7 @@ stopping routes). The default logging level is DEBUG. Default value: DEBUG
<xs:complexType name="camelStreamCachingStrategyDefinition">
<xs:complexContent>
<xs:extension base="tns:identifiedType">
- <xs:sequence>
- <xs:element minOccurs="0" name="spoolThreshold" type="xs:string"/>
- </xs:sequence>
+ <xs:sequence/>
<xs:attribute name="enabled" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -2744,6 +2742,15 @@ default the data is not encrypted.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="spoolThreshold" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+Threshold in bytes when overflow to disk is activated. The default threshold is
+org.apache.camel.StreamCache#DEFAULT_SPOOL_THRESHOLD bytes (eg 128kb). Use -1 to
+disable overflow to disk. Default value: 131072
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="spoolUsedHeapMemoryThreshold" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
index 4924294ed42..b14f0b23d53 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
@@ -78,33 +78,40 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
@Metadata(defaultValue = "true", javaType = "java.lang.Boolean", description = "Sets whether to log retry attempts")
private String logRetryAttempted;
@XmlAttribute
- @Metadata(defaultValue = "true", javaType = "java.lang.Boolean", description = "Sets whether stack traces should be logged or not")
+ @Metadata(defaultValue = "true", javaType = "java.lang.Boolean",
+ description = "Sets whether stack traces should be logged or not")
private String logStackTrace;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean", description = "Sets whether stack traces should be logged or not")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
+ description = "Sets whether stack traces should be logged or not")
private String logRetryStackTrace;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean", description = "Sets whether errors should be logged even if its handled")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
+ description = "Sets whether errors should be logged even if its handled")
private String logHandled;
@XmlAttribute
@Metadata(defaultValue = "true", javaType = "java.lang.Boolean",
description = "Sets whether errors should be logged when a new exception occurred during handling a previous exception")
private String logNewException;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean", description = "Sets whether errors should be logged even if its continued")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
+ description = "Sets whether errors should be logged even if its continued")
private String logContinued;
@XmlAttribute
- @Metadata(defaultValue = "true", javaType = "java.lang.Boolean", description = "Sets whether exhausted exceptions should be logged or not")
+ @Metadata(defaultValue = "true", javaType = "java.lang.Boolean",
+ description = "Sets whether exhausted exceptions should be logged or not")
private String logExhausted;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean", description = "Sets whether to log exhausted errors including message history")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
+ description = "Sets whether to log exhausted errors including message history")
private String logExhaustedMessageHistory;
@XmlAttribute
@Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
description = "Sets whether exhausted message body/headers should be logged with message history included")
private String logExhaustedMessageBody;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean", description = "Disables redelivery by setting maximum redeliveries to 0.")
+ @Metadata(defaultValue = "false", javaType = "java.lang.Boolean",
+ description = "Disables redelivery by setting maximum redeliveries to 0.")
private String disableRedelivery;
@XmlAttribute
@Metadata(description = "Sets an optional delay pattern to use instead of fixed delay.")
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
index 97ff37b42de..e0a7d37c222 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
@@ -94,9 +94,9 @@ public class CamelStreamCachingStrategyDefinition extends IdentifiedType {
}
/**
- * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be cached in a
- * temporary file instead, and Camel will handle deleting the temporary file once the cached stream is no longer
- * necessary.
+ * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be
+ * cached in a temporary file instead, and Camel will handle deleting the temporary file once the cached stream is
+ * no longer necessary.
*
* Default is false.
*/
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
index 7423cea21ed..ce84bb39628 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
@@ -451,9 +451,9 @@ public abstract class DefaultConfigurationProperties<T> {
}
/**
- * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be cached in a
- * temporary file instead, and Camel will handle deleting the temporary file once the cached stream is no longer
- * necessary.
+ * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be
+ * cached in a temporary file instead, and Camel will handle deleting the temporary file once the cached stream is
+ * no longer necessary.
*
* Default is false.
*/
@@ -1747,9 +1747,9 @@ public abstract class DefaultConfigurationProperties<T> {
}
/**
- * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be cached in a
- * temporary file instead, and Camel will handle deleting the temporary file once the cached stream is no longer
- * necessary.
+ * To enable stream caching spooling to disk. This means, for large stream messages (over 128 KB by default) will be
+ * cached in a temporary file instead, and Camel will handle deleting the temporary file once the cached stream is
+ * no longer necessary.
*
* Default is false.
*/