This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4195599ce774b8a7610da6d94daeed82ff337b13 Author: Gregor Zurowski <gre...@zurowski.org> AuthorDate: Tue Sep 26 10:56:46 2023 +0200 Apply formatter on core modules --- core/camel-api/src/main/java/org/apache/camel/StreamCache.java | 7 +++---- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 3 --- .../apache/camel/converter/stream/ByteArrayInputStreamCache.java | 7 +++---- .../org/apache/camel/converter/stream/FileInputStreamCache.java | 7 +++---- .../main/java/org/apache/camel/converter/stream/ReaderCache.java | 7 +++---- .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +- .../src/test/java/org/apache/camel/xml/in/ModelParserTest.java | 3 ++- .../src/main/java/org/apache/camel/util/xml/SourceCache.java | 7 +++---- .../src/main/java/org/apache/camel/util/xml/StreamSourceCache.java | 7 +++---- 9 files changed, 21 insertions(+), 29 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 61876f4cadc..82400c520f7 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-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 5863226de5c..52212537518 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 @@ -55,12 +55,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; @@ -73,7 +71,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 e233823335e..85b75b050d2 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 f54e681abc9..c4f4dbbc556 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 @@ -186,7 +186,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 2af481086fc..096dcf753d4 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 @@ -58,7 +58,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 {