You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/08/22 05:06:20 UTC
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.20.130 (#11167)
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 83fbde7a69b Upgrade AWS SDK v2 to version 2.20.130 (#11167)
83fbde7a69b is described below
commit 83fbde7a69b01591f5e0df936ca739dd88767c3d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 22 07:06:14 2023 +0200
Upgrade AWS SDK v2 to version 2.20.130 (#11167)
* Upgrade AWS SDK v2 to version 2.20.130
Signed-off-by: Andrea Cosentino <an...@gmail.com>
* Regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/component/aws2/sqs/Sqs2Consumer.java | 3 ++-
.../component/aws2/sqs/AmazonSQSClientMock.java | 2 +-
.../ConsulClusteredRoutePolicyFactoryIT.java | 3 ++-
.../cluster/ConsulClusteredRoutePolicyIT.java | 3 ++-
.../component/consul/cluster/ConsulMasterIT.java | 3 ++-
.../camel/component/mail/RawMailMessageTest.java | 2 +-
.../integration/OpensearchSizeLimitIT.java | 1 -
.../component/sjms/AsyncStartStopListenerTest.java | 3 ++-
.../camel/component/sjms/JmsSelectorTest.java | 3 ++-
.../sjms/SjmsEndpointConnectionSettingsTest.java | 3 ++-
.../camel/component/sjms/SjmsEndpointTest.java | 3 ++-
.../component/sjms/SjmsSendDynamicAwareTest.java | 12 ++++++---
.../consumer/InOutConsumerTempQueueAsyncTest.java | 3 ++-
.../sjms/consumer/InOutConsumerTempQueueTest.java | 3 ++-
.../consumer/InOutSynchronousConsumerTest.java | 3 ++-
.../sjms/consumer/JmsPollingConsumerTest.java | 6 +++--
.../sjms/jms/DestinationNameParserTest.java | 3 ++-
.../org/apache/camel/spi/DumpRoutesStrategy.java | 4 +--
.../camel/cli/connector/LocalCliConnector.java | 2 +-
.../dsl/Aws2S3ComponentBuilderFactory.java | 16 ++++++++++++
.../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 30 ++++++++++++++++++++++
parent/pom.xml | 2 +-
.../rocketmq/services/RocketMQServiceFactory.java | 1 -
23 files changed, 88 insertions(+), 26 deletions(-)
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
index ee037337e5e..7ffe78812f1 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
@@ -440,7 +440,8 @@ public class Sqs2Consumer extends ScheduledBatchPollingConsumer {
.build();
try {
- LOG.trace("Extending visibility window by {} seconds for request entries {}", repeatSeconds, batchEntries);
+ LOG.trace("Extending visibility window by {} seconds for request entries {}", repeatSeconds,
+ batchEntries);
getEndpoint().getClient().changeMessageVisibilityBatch(request);
LOG.debug("Extended visibility window for request entries {}", batchEntries);
} catch (MessageNotInflightException | ReceiptHandleIsInvalidException e) {
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
index 7d3affb8cf7..e8c5cd895b5 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
@@ -232,7 +232,7 @@ public class AmazonSQSClientMock implements SqsClient {
public SqsServiceClientConfiguration serviceClientConfiguration() {
return null;
}
-
+
@Override
public ChangeMessageVisibilityBatchResponse changeMessageVisibilityBatch(
ChangeMessageVisibilityBatchRequest changeMessageVisibilityBatchRequest) {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
index 06c4e3ba45a..2ad16f87934 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
@@ -95,7 +95,8 @@ public class ConsulClusteredRoutePolicyFactoryIT {
// Start the context after some random time so the startup order
// changes for each test.
- Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS).untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
+ Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
LOGGER.info("Starting CamelContext on node: {}", id);
context.start();
LOGGER.info("Started CamelContext on node: {}", id);
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
index 61cc2c9ddff..37f11a327aa 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
@@ -95,7 +95,8 @@ public class ConsulClusteredRoutePolicyIT {
// Start the context after some random time so the startup order
// changes for each test.
- Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS).untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
+ Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
context.start();
contextLatch.await();
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
index 4535ca268ad..4ab49a31017 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
@@ -93,7 +93,8 @@ public class ConsulMasterIT {
// Start the context after some random time so the startup order
// changes for each test.
- Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS).untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
+ Awaitility.await().pollDelay(ThreadLocalRandom.current().nextInt(500), TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> Assertions.assertDoesNotThrow(context::start));
context.start();
contextLatch.await();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 58f4b7bd968..0916a379a43 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -36,9 +36,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Unit test for Mail using camel headers to set recipient subject.
diff --git a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchSizeLimitIT.java b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchSizeLimitIT.java
index 298c54910f4..f7889bc046c 100644
--- a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchSizeLimitIT.java
+++ b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchSizeLimitIT.java
@@ -26,7 +26,6 @@ import org.opensearch.client.opensearch.core.search.HitsMetadata;
import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
class OpensearchSizeLimitIT extends OpensearchTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
index 55886c0e946..876e3dc8872 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
@@ -70,7 +70,8 @@ public class AsyncStartStopListenerTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:foo.startstop.AsyncStartStopListenerTest?asyncStartListener=true&asyncStopListener=true").to("mock:result");
+ from("sjms:queue:foo.startstop.AsyncStartStopListenerTest?asyncStartListener=true&asyncStopListener=true")
+ .to("mock:result");
from("sjms:queue:foo.start.AsyncStartStopListenerTest?asyncStartListener=true").to("mock:result");
from("sjms:queue:foo.stop.AsyncStartStopListenerTest?asyncStopListener=true").to("mock:result");
from("sjms:queue:foo.AsyncStartStopListenerTest").to("mock:result");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
index f8437d3a742..34b8db5cf14 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
@@ -48,7 +48,8 @@ public class JmsSelectorTest extends JmsTestSupport {
return new RouteBuilder() {
public void configure() {
from("sjms:test.a.JmsSelectorTest").to("log:test-before?showAll=true").to("sjms:test.b.JmsSelectorTest");
- from("sjms:test.b.JmsSelectorTest?messageSelector=cheese='y'").to("log:test-after?showAll=true").to("mock:result");
+ from("sjms:test.b.JmsSelectorTest?messageSelector=cheese='y'").to("log:test-after?showAll=true")
+ .to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
index 39bd2e4933b..35cd33737c6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
@@ -34,7 +34,8 @@ public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
@Test
public void testConnectionFactory() {
- Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointConnectionSettingsTest?connectionFactory=#activemq");
+ Endpoint endpoint
+ = context.getEndpoint("sjms:queue:test.SjmsEndpointConnectionSettingsTest?connectionFactory=#activemq");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
index cdca02b2abf..d7972d694d6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
@@ -137,7 +137,8 @@ public class SjmsEndpointTest extends CamelTestSupport {
public void testReplyToAndMEPMatch() {
String replyTo = "reply.to.queue";
Endpoint endpoint = context
- .getEndpoint("sjms:queue:test.SjmsEndpointTest?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
+ .getEndpoint(
+ "sjms:queue:test.SjmsEndpointTest?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
index c4a7294cf1d..90e5bf1b5af 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
@@ -40,10 +40,12 @@ public class SjmsSendDynamicAwareTest extends CamelTestSupport {
this.sjmsSendDynamicAware.setScheme("sjms");
Exchange exchange = createExchangeWithBody("The Body");
SendDynamicAware.DynamicAwareEntry entry
- = new SendDynamicAware.DynamicAwareEntry("sjms:destination.SjmsSendDynamicAwareTest", "sjms:${header.test}", null, null);
+ = new SendDynamicAware.DynamicAwareEntry(
+ "sjms:destination.SjmsSendDynamicAwareTest", "sjms:${header.test}", null, null);
Processor processor = this.sjmsSendDynamicAware.createPreProcessor(createExchangeWithBody("Body"), entry);
processor.process(exchange);
- assertEquals("destination.SjmsSendDynamicAwareTest", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
+ assertEquals("destination.SjmsSendDynamicAwareTest",
+ exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
}
@Test
@@ -51,9 +53,11 @@ public class SjmsSendDynamicAwareTest extends CamelTestSupport {
this.sjmsSendDynamicAware.setScheme("sjms");
Exchange exchange = createExchangeWithBody("The Body");
SendDynamicAware.DynamicAwareEntry entry
- = new SendDynamicAware.DynamicAwareEntry("sjms://destination.SjmsSendDynamicAwareTest", "sjms://${header.test}", null, null);
+ = new SendDynamicAware.DynamicAwareEntry(
+ "sjms://destination.SjmsSendDynamicAwareTest", "sjms://${header.test}", null, null);
Processor processor = this.sjmsSendDynamicAware.createPreProcessor(createExchangeWithBody("Body"), entry);
processor.process(exchange);
- assertEquals("destination.SjmsSendDynamicAwareTest", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
+ assertEquals("destination.SjmsSendDynamicAwareTest",
+ exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
}
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
index ee930757909..e3b366196d6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
@@ -42,7 +42,8 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
public void configure() {
from("sjms:queue:start.queue.InOutConsumerTempQueueAsyncTest?asyncConsumer=true")
.log("Requesting ${body} with thread ${threadName}")
- .to(ExchangePattern.InOut, "sjms:queue:in.out.temp.queue.InOutConsumerTempQueueAsyncTest?replyToConcurrentConsumers=2")
+ .to(ExchangePattern.InOut,
+ "sjms:queue:in.out.temp.queue.InOutConsumerTempQueueAsyncTest?replyToConcurrentConsumers=2")
.log("Result ${body} with thread ${threadName}")
.to("mock:result");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
index 7f724e39e09..a380d094778 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
@@ -38,7 +38,8 @@ public class InOutConsumerTempQueueTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start.queue.InOutConsumerTempQueueTest").to("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueTest?exchangePattern=InOut")
+ from("sjms:queue:start.queue.InOutConsumerTempQueueTest")
+ .to("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueTest?exchangePattern=InOut")
.to("mock:result");
from("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueTest?exchangePattern=InOut").to("log:before")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
index fc752a09a14..bc2d98b40c8 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
@@ -50,7 +50,8 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
.to("log:after")
.to("mock:result");
- from("sjms:queue:in.queue.InOutSynchronousConsumerTest").process(exchange -> exchange.getMessage().setBody("Bye World"));
+ from("sjms:queue:in.queue.InOutSynchronousConsumerTest")
+ .process(exchange -> exchange.getMessage().setBody("Bye World"));
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
index 5a59602dbf2..495e4e2382e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
@@ -123,9 +123,11 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start").log("Sending ${body} to queue.start.JmsPollingConsumerTest").to("sjms:queue.start.JmsPollingConsumerTest");
+ from("direct:start").log("Sending ${body} to queue.start.JmsPollingConsumerTest")
+ .to("sjms:queue.start.JmsPollingConsumerTest");
- from("sjms:queue.foo.JmsPollingConsumerTest").log("Received ${body} from queue.start.JmsPollingConsumerTest").to("mock:result");
+ from("sjms:queue.foo.JmsPollingConsumerTest").log("Received ${body} from queue.start.JmsPollingConsumerTest")
+ .to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
index 0d051f8aa35..b7e3a0fd447 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
@@ -40,7 +40,8 @@ public class DestinationNameParserTest {
@Test
public void testGetShortName() {
- assertEquals("foo.DestinationNameParserTest", DestinationNameParser.getShortName("topic:foo.DestinationNameParserTest"));
+ assertEquals("foo.DestinationNameParserTest",
+ DestinationNameParser.getShortName("topic:foo.DestinationNameParserTest"));
assertFalse(DestinationNameParser.isTopic("queue:bar.DestinationNameParserTest"), "bar");
assertFalse(DestinationNameParser.isTopic("bar"), "bar");
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/DumpRoutesStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/DumpRoutesStrategy.java
index 9b9ae13a96b..04cba2962f6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/DumpRoutesStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/DumpRoutesStrategy.java
@@ -40,8 +40,8 @@ public interface DumpRoutesStrategy extends StaticService {
/**
* Controls what to include in output.
*
- * Possible values: all, routes, rests, routeConfigurations, routeTemplates. Multiple values can be separated by comma.
- * Default is routes.
+ * Possible values: all, routes, rests, routeConfigurations, routeTemplates. Multiple values can be separated by
+ * comma. Default is routes.
*/
void setInclude(String include);
diff --git a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 958b4cb3119..365f13b6908 100644
--- a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++ b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -471,7 +471,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
} catch (Exception e) {
// ignore
- LOG.debug("Error executing action file: {} due to: {}. This exception is ignored.", actionFile, e.getMessage(),
+ LOG.debug("Error executing action file: {} due to: {}. This exception is ignored.", actionFile, e.getMessage(),
e);
}
}
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
index 96c54e8a411..bbcdb0ed079 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
@@ -503,6 +503,21 @@ public interface Aws2S3ComponentBuilderFactory {
doSetProperty("batchSize", batchSize);
return this;
}
+ /**
+ * The buffer size (in bytes) in streaming upload mode.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Default: 1000000
+ * Group: producer
+ *
+ * @param bufferSize the value to set
+ * @return the dsl builder
+ */
+ default Aws2S3ComponentBuilder bufferSize(int bufferSize) {
+ doSetProperty("bufferSize", bufferSize);
+ return this;
+ }
/**
* Delete file object after the S3 file has been uploaded.
*
@@ -1028,6 +1043,7 @@ public interface Aws2S3ComponentBuilderFactory {
case "autocloseBody": getOrCreateConfiguration((AWS2S3Component) component).setAutocloseBody((boolean) value); return true;
case "batchMessageNumber": getOrCreateConfiguration((AWS2S3Component) component).setBatchMessageNumber((int) value); return true;
case "batchSize": getOrCreateConfiguration((AWS2S3Component) component).setBatchSize((int) value); return true;
+ case "bufferSize": getOrCreateConfiguration((AWS2S3Component) component).setBufferSize((int) value); return true;
case "deleteAfterWrite": getOrCreateConfiguration((AWS2S3Component) component).setDeleteAfterWrite((boolean) value); return true;
case "keyName": getOrCreateConfiguration((AWS2S3Component) component).setKeyName((java.lang.String) value); return true;
case "lazyStartProducer": ((AWS2S3Component) component).setLazyStartProducer((boolean) value); return true;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index 8f79648cdbf..982e54c75a6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -1963,6 +1963,36 @@ public interface AWS2S3EndpointBuilderFactory {
doSetProperty("batchSize", batchSize);
return this;
}
+ /**
+ * The buffer size (in bytes) in streaming upload mode.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Default: 1000000
+ * Group: producer
+ *
+ * @param bufferSize the value to set
+ * @return the dsl builder
+ */
+ default AWS2S3EndpointProducerBuilder bufferSize(int bufferSize) {
+ doSetProperty("bufferSize", bufferSize);
+ return this;
+ }
+ /**
+ * The buffer size (in bytes) in streaming upload mode.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Default: 1000000
+ * Group: producer
+ *
+ * @param bufferSize the value to set
+ * @return the dsl builder
+ */
+ default AWS2S3EndpointProducerBuilder bufferSize(String bufferSize) {
+ doSetProperty("bufferSize", bufferSize);
+ return this;
+ }
/**
* Delete file object after the S3 file has been uploaded.
*
diff --git a/parent/pom.xml b/parent/pom.xml
index 72cbc937229..1eb5b84b609 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,7 +68,7 @@
<avro-ipc-jetty-version>1.11.2</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.2</avro-ipc-netty-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.20.129</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.130</aws-java-sdk2-version>
<aws-xray-version>2.14.0</aws-xray-version>
<azure-sdk-bom-version>1.2.15</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
diff --git a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
index d4966f3d983..ad962917129 100644
--- a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
+++ b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
@@ -44,7 +44,6 @@ public final class RocketMQServiceFactory {
}
}
-
private RocketMQServiceFactory() {
}