This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.21.1 in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/release/3.21.1 by this push: new e0b1ef9ee63 Apply formatter e0b1ef9ee63 is described below commit e0b1ef9ee632310da912448977fa4a1e63b5b418 Author: Gregor Zurowski <gre...@zurowski.org> AuthorDate: Sun Sep 24 06:29:30 2023 +0200 Apply formatter --- .../main/java/org/apache/camel/StreamCache.java | 7 ++--- .../apache/camel/model/OnCompletionDefinition.java | 35 ++++++++++++---------- .../apache/camel/model/OnExceptionDefinition.java | 22 +++++++------- .../DefaultErrorHandlerDefinition.java | 33 ++++++++++---------- .../org/apache/camel/main/BaseMainSupport.java | 3 -- .../stream/ByteArrayInputStreamCache.java | 7 ++--- .../converter/stream/FileInputStreamCache.java | 7 ++--- .../apache/camel/converter/stream/ReaderCache.java | 7 ++--- .../java/org/apache/camel/util/SensitiveUtils.java | 2 +- .../org/apache/camel/xml/in/ModelParserTest.java | 3 +- .../org/apache/camel/util/xml/SourceCache.java | 7 ++--- .../apache/camel/util/xml/StreamSourceCache.java | 7 ++--- 12 files changed, 70 insertions(+), 70 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/StreamCache.java b/core/camel-api/src/main/java/org/apache/camel/StreamCache.java index bdcec5cc3ca..af8e1f7f519 100644 --- a/core/camel-api/src/main/java/org/apache/camel/StreamCache.java +++ b/core/camel-api/src/main/java/org/apache/camel/StreamCache.java @@ -31,10 +31,9 @@ import java.io.OutputStream; * It is recommended in the {@link #copy(Exchange)} method to let the copied stream start from the start. If the * implementation does not support copy, then return <tt>null</tt>. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public interface StreamCache { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java index a7875995b02..13766368ed5 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java @@ -215,11 +215,12 @@ public class OnCompletionDefinition extends OutputDefinition<OnCompletionDefinit * Will use the original input message body when an {@link org.apache.camel.Exchange} for this on completion. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they @@ -232,7 +233,7 @@ public class OnCompletionDefinition extends OutputDefinition<OnCompletionDefinit * <p/> * By default this feature is off. * - * @return the builder + * @return the builder * @deprecated use {@link #useOriginalMessage()} */ @Deprecated @@ -245,11 +246,12 @@ public class OnCompletionDefinition extends OutputDefinition<OnCompletionDefinit * Will use the original input message when an {@link org.apache.camel.Exchange} for this on completion. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they @@ -379,11 +381,12 @@ public class OnCompletionDefinition extends OutputDefinition<OnCompletionDefinit * Will use the original input message body when an {@link org.apache.camel.Exchange} for this on completion. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java index 26db6bd68c1..abe074ad57f 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java @@ -669,11 +669,12 @@ public class OnExceptionDefinition extends OutputDefinition<OnExceptionDefinitio * original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they @@ -713,11 +714,12 @@ public class OnExceptionDefinition extends OutputDefinition<OnExceptionDefinitio * original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java index a46c3368cc2..82f291335b3 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java @@ -199,11 +199,12 @@ public class DefaultErrorHandlerDefinition extends BaseErrorHandlerDefinition { * original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they @@ -243,11 +244,12 @@ public class DefaultErrorHandlerDefinition extends BaseErrorHandlerDefinition { * original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they @@ -701,11 +703,12 @@ public class DefaultErrorHandlerDefinition extends BaseErrorHandlerDefinition { * original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. * <p/> * The original input message is defensively copied, and the copied message body is converted to - * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the original route), - * to ensure the body can be read when the original message is being used later. If the body is converted to {@link org.apache.camel.StreamCache} - * then the message body on the current {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. - * If the body is not converted to {@link org.apache.camel.StreamCache} then the body will not be - * able to re-read when accessed later. + * {@link org.apache.camel.StreamCache} if possible (stream caching is enabled, can be disabled globally or on the + * original route), to ensure the body can be read when the original message is being used later. If the body is + * converted to {@link org.apache.camel.StreamCache} then the message body on the current + * {@link org.apache.camel.Exchange} is replaced with the {@link org.apache.camel.StreamCache} body. If the body is + * not converted to {@link org.apache.camel.StreamCache} then the body will not be able to re-read when accessed + * later. * <p/> * <b>Important:</b> The original input means the input message that are bounded by the current * {@link org.apache.camel.spi.UnitOfWork}. An unit of work typically spans one route, or multiple routes if they diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 9235db716ea..0304d20b99a 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -56,12 +56,10 @@ import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Language; import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.PeriodTaskScheduler; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.RouteTemplateParameterSource; import org.apache.camel.spi.StartupStepRecorder; import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.support.LifecycleStrategySupport; import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.ResourceHelper; @@ -74,7 +72,6 @@ import org.apache.camel.util.OrderedLocationProperties; import org.apache.camel.util.OrderedProperties; import org.apache.camel.util.SensitiveUtils; import org.apache.camel.util.StringHelper; -import org.apache.camel.util.TimeUtils; import org.apache.camel.vault.VaultConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/camel-support/src/main/java/org/apache/camel/converter/stream/ByteArrayInputStreamCache.java b/core/camel-support/src/main/java/org/apache/camel/converter/stream/ByteArrayInputStreamCache.java index fc9932a549f..1fc31b3a644 100644 --- a/core/camel-support/src/main/java/org/apache/camel/converter/stream/ByteArrayInputStreamCache.java +++ b/core/camel-support/src/main/java/org/apache/camel/converter/stream/ByteArrayInputStreamCache.java @@ -29,10 +29,9 @@ import org.apache.camel.util.IOHelper; /** * A {@link StreamCache} for {@link java.io.ByteArrayInputStream}. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public class ByteArrayInputStreamCache extends FilterInputStream implements StreamCache { diff --git a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java index 1c06c700e49..230bd315fca 100644 --- a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java +++ b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java @@ -51,10 +51,9 @@ import org.slf4j.LoggerFactory; /** * A {@link StreamCache} for {@link File}s. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public final class FileInputStreamCache extends InputStream implements StreamCache { private InputStream stream; diff --git a/core/camel-support/src/main/java/org/apache/camel/converter/stream/ReaderCache.java b/core/camel-support/src/main/java/org/apache/camel/converter/stream/ReaderCache.java index 877efbe150c..b91b09bdf86 100644 --- a/core/camel-support/src/main/java/org/apache/camel/converter/stream/ReaderCache.java +++ b/core/camel-support/src/main/java/org/apache/camel/converter/stream/ReaderCache.java @@ -26,10 +26,9 @@ import org.apache.camel.StreamCache; /** * A {@link org.apache.camel.StreamCache} for String {@link java.io.Reader}s. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public class ReaderCache extends StringReader implements StreamCache { diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index 6c57f8d3aa7..5b577bee865 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -188,7 +188,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" - // SENSITIVE-PATTERN: END + // SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java index 602888f71de..307c079c026 100644 --- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java @@ -60,7 +60,8 @@ public class ModelParserTest { = Arrays.asList("barRest.xml", "simpleRest.xml", "simpleRestToD.xml", "restAllowedValues.xml"); private static final List<String> TEMPLATE_XMLS = Arrays.asList("barTemplate.xml"); private static final List<String> TEMPLATED_ROUTE_XMLS = Arrays.asList("barTemplatedRoute.xml"); - private static final List<String> ROUTE_CONFIGURATION_XMLS = Arrays.asList("errorHandlerConfiguration.xml", "errorHandlerConfigurationRedeliveryPolicyRef.xml"); + private static final List<String> ROUTE_CONFIGURATION_XMLS + = Arrays.asList("errorHandlerConfiguration.xml", "errorHandlerConfigurationRedeliveryPolicyRef.xml"); @Test public void testNoNamespace() throws Exception { diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java index 7d58c7aab6a..7f757474c46 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java @@ -26,10 +26,9 @@ import org.apache.camel.util.IOHelper; /** * {@link org.apache.camel.StreamCache} implementation for {@link StringSource}s. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public final class SourceCache extends StringSource implements StreamCache { diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java index 228e0565549..d0f6dd52f15 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java @@ -31,10 +31,9 @@ import org.apache.camel.util.IOHelper; /** * A {@link org.apache.camel.StreamCache} for {@link javax.xml.transform.stream.StreamSource}s. * <p/> - * <b>Important:</b> - * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users - * to create as instances, but they are part of - * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. + * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end + * users to create as instances, but they are part of Camels + * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality. */ public final class StreamSourceCache extends StreamSource implements StreamCache {