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 3be04f0044f Regen for commit ddd5a37cfb0139d10de17bcab9c1b705e052ebdd
(#8954)
3be04f0044f is described below
commit 3be04f0044ff8fcecf81ea06f8aec0ee17095a70
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Dec 28 13:16:25 2022 +0100
Regen for commit ddd5a37cfb0139d10de17bcab9c1b705e052ebdd (#8954)
Signed-off-by: GitHub <nore...@github.com>
Signed-off-by: GitHub <nore...@github.com>
Co-authored-by: davsclaus <davscl...@users.noreply.github.com>
---
.../apache/camel/catalog/main/camel-main-configuration-metadata.json | 2 +-
.../test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java | 1 -
core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java | 4 +---
core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java | 3 +--
.../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java | 3 +--
core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java | 3 ++-
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index b9836b00584..d2d09c2a980 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -95,7 +95,7 @@
{ "name": "camel.main.routesReloadEnabled", "description": "Used for
enabling automatic routes reloading. If enabled then Camel will watch for file
changes in the given reload directory, and trigger reloading routes if files
are changed.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.routesReloadPattern", "description": "Used for
inclusive filtering of routes from directories. Typical used for specifying to
accept routes in XML or YAML files, such as .yaml,.xml. Multiple patterns can
be specified separated by comma.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.routesReloadRemoveAllRoutes", "description": "When
reloading routes should all existing routes be stopped and removed. By default,
Camel will stop and remove all existing routes before reloading routes. This
ensures that only the reloaded routes will be active. If disabled then only
routes with the same route id is updated, and any existing routes are continued
to run.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
"type": "boolean", "ja [...]
- { "name": "camel.main.routesReloadRestartDuration", "description":
"Whether to restart max duration when routes are reloaded. For example if max
duration is 60 seconds, and a route is reloaded after 25 seconds, then this
will restart the count and wait 60 seconds again.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
+ { "name": "camel.main.routesReloadRestartDuration", "description":
"Whether to restart max duration when routes are reloaded. For example if max
duration is 60 seconds, and a route is reloaded after 25 seconds, then this
will restart the count and wait 60 seconds again.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.shutdownLogInflightExchangesOnTimeout",
"description": "Sets whether to log information about the inflight Exchanges
which are still running during a shutdown which didn't complete without the
given timeout. This requires to enable the option
inflightRepositoryBrowseEnabled.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.shutdownNowOnTimeout", "description": "Sets whether
to force shutdown of all consumers when a timeout occurred and thus not all
consumers was shutdown within that period. You should have good reasons to set
this option to false as it means that the routes keep running and is halted
abruptly when CamelContext has been shutdown.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.shutdownRoutesInReverseOrder", "description": "Sets
whether routes should be shutdown in reverse or the same order as they were
started.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
diff --git
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index 7c0c1f54218..2da3f638f5b 100644
---
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -37,7 +37,6 @@ import
org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppingEvent;
-import org.apache.camel.spi.CamelEvent.ExchangeAsyncProcessingStartedEvent;
import org.apache.camel.spi.CamelEvent.ExchangeCompletedEvent;
import org.apache.camel.spi.CamelEvent.ExchangeCreatedEvent;
import org.apache.camel.spi.CamelEvent.ExchangeEvent;
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
index 8293904eac8..04bbcf6b362 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
@@ -450,10 +450,8 @@ public interface CamelEvent {
}
}
-
/**
- * Special event only in use for camel-tracing / camel-opentelemtry.
- * This event is NOT (by default) in use.
+ * Special event only in use for camel-tracing / camel-opentelemtry. This
event is NOT (by default) in use.
*/
interface ExchangeAsyncProcessingStartedEvent extends ExchangeEvent {
@Override
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
b/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
index 1e78de880e2..7cd7a5cee11 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
@@ -325,8 +325,7 @@ public interface EventFactory {
* This is guaranteed to run on the same thread on which {@code
RoutePolicySupport.onExchangeBegin} was called
* and/or {@code ExchangeSendingEvent} was fired.
*
- * Special event only in use for camel-tracing / camel-opentelemtry.
- * This event is NOT (by default) in use.
+ * Special event only in use for camel-tracing / camel-opentelemtry. This
event is NOT (by default) in use.
*
* @param exchange the exchange
* @return the created event
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
index fb474d7eef6..f5ba3fb10fc 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
@@ -25,8 +25,7 @@ import org.apache.camel.support.RoutePolicySupport;
* Notifies that async processing has started. It's guaranteed to run on the
same thread on which
* {@link RoutePolicySupport#onExchangeBegin(Route, Exchange)} was called
and/or {@link ExchangeSendingEvent} was fired.
*
- * Special event only in use for camel-tracing / camel-opentelemtry.
- * This event is NOT (by default) in use.
+ * Special event only in use for camel-tracing / camel-opentelemtry. This
event is NOT (by default) in use.
*
* @see ExchangeAsyncProcessingStartedEvent
*/
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index cb97aed4570..7125d075978 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -314,7 +314,8 @@ public abstract class MainSupport extends BaseMainSupport {
@Override
protected void configureLifecycle(CamelContext camelContext) throws
Exception {
- if ((mainConfigurationProperties.getDurationMaxSeconds() > 0 &&
mainConfigurationProperties.isRoutesReloadRestartDuration())
+ if ((mainConfigurationProperties.getDurationMaxSeconds() > 0
+ && mainConfigurationProperties.isRoutesReloadRestartDuration())
|| mainConfigurationProperties.getDurationMaxMessages() > 0
|| mainConfigurationProperties.getDurationMaxIdleSeconds() >
0) {
// register lifecycle, so we can trigger to shutdown the JVM when
maximum number of messages has been processed
