You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/23 07:53:23 UTC
[camel] branch main updated (c011d20393d -> 983b6f1a82c)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from c011d20393d (chores) camel-spring-security: documented unused parameters
new 6aab9dd8778 (chores) camel-main: removed unused parameters
new 983b6f1a82c (chores) camel-main: documented unused parameters
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 10 +++++-----
.../java/org/apache/camel/main/DefaultRoutesCollector.java | 5 +++++
.../java/org/apache/camel/main/MainSupportModelConfigurer.java | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
[camel] 02/02: (chores) camel-main: documented unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 983b6f1a82c81680ca673652e316129bba190770
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 23 08:14:11 2022 +0200
(chores) camel-main: documented unused parameters
---
.../src/main/java/org/apache/camel/main/DefaultRoutesCollector.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
index 3462c8792cc..7cc688f99d1 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
@@ -203,7 +203,12 @@ public class DefaultRoutesCollector implements RoutesCollector {
/**
* Strategy to allow collecting additional routes from registry.
+ *
+ * @param camelContext the context
+ * @param excludePattern the exclusion pattern
+ * @param includePattern the inclusion pattern
*/
+ @SuppressWarnings("unused")
protected Collection<RoutesBuilder> collectAdditionalRoutesFromRegistry(
CamelContext camelContext,
String excludePattern,
[camel] 01/02: (chores) camel-main: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6aab9dd8778fbeeaac88410ed5e36fcf1faad7c1
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 23 08:11:47 2022 +0200
(chores) camel-main: removed unused parameters
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 10 +++++-----
.../java/org/apache/camel/main/MainSupportModelConfigurer.java | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
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 66faf23b413..bb03247c31e 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
@@ -1015,19 +1015,19 @@ public abstract class BaseMainSupport extends BaseService {
if (!threadPoolProperties.isEmpty() || mainConfigurationProperties.hasThreadPoolConfiguration()) {
LOG.debug("Auto-configuring Thread Pool from loaded properties: {}", threadPoolProperties.size());
MainSupportModelConfigurer.setThreadPoolProperties(camelContext, mainConfigurationProperties, threadPoolProperties,
- mainConfigurationProperties.isAutoConfigurationFailFast(), autoConfiguredProperties);
+ autoConfiguredProperties);
}
// need to let camel-main setup health-check using its convention over configuration
boolean hc = mainConfigurationProperties.health().getEnabled() != null; // health-check is enabled by default
if (hc || !healthProperties.isEmpty() || mainConfigurationProperties.hasHealthCheckConfiguration()) {
LOG.debug("Auto-configuring HealthCheck from loaded properties: {}", healthProperties.size());
- setHealthCheckProperties(camelContext, healthProperties, mainConfigurationProperties.isAutoConfigurationFailFast(),
+ setHealthCheckProperties(camelContext, healthProperties,
autoConfiguredProperties);
}
if (!routeTemplateProperties.isEmpty()) {
LOG.debug("Auto-configuring Route templates from loaded properties: {}", routeTemplateProperties.size());
setRouteTemplateProperties(camelContext, routeTemplateProperties,
- mainConfigurationProperties.isAutoConfigurationFailFast(), autoConfiguredProperties);
+ autoConfiguredProperties);
}
if (!lraProperties.isEmpty() || mainConfigurationProperties.hasLraConfiguration()) {
LOG.debug("Auto-configuring Saga LRA from loaded properties: {}", lraProperties.size());
@@ -1103,7 +1103,7 @@ public abstract class BaseMainSupport extends BaseService {
private void setRouteTemplateProperties(
CamelContext camelContext, OrderedLocationProperties routeTemplateProperties,
- boolean failIfNotSet, OrderedLocationProperties autoConfiguredProperties)
+ OrderedLocationProperties autoConfiguredProperties)
throws Exception {
// store the route template parameters as a source and register it on the camel context
@@ -1127,7 +1127,7 @@ public abstract class BaseMainSupport extends BaseService {
private void setHealthCheckProperties(
CamelContext camelContext, OrderedLocationProperties healthCheckProperties,
- boolean failIfNotSet, OrderedLocationProperties autoConfiguredProperties)
+ OrderedLocationProperties autoConfiguredProperties)
throws Exception {
HealthConfigurationProperties health = mainConfigurationProperties.health();
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainSupportModelConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/MainSupportModelConfigurer.java
index e1ca0b1d5f9..e5276a13d95 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupportModelConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupportModelConfigurer.java
@@ -86,7 +86,7 @@ public final class MainSupportModelConfigurer {
CamelContext camelContext,
MainConfigurationProperties mainConfigurationProperties,
OrderedLocationProperties threadPoolProperties,
- boolean failIfNotSet, OrderedLocationProperties autoConfiguredProperties)
+ OrderedLocationProperties autoConfiguredProperties)
throws Exception {
ThreadPoolConfigurationProperties tp = mainConfigurationProperties.threadPool();