This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new eea2632 Deprecate hystrix in camel-main eea2632 is described below commit eea263243b33f514c14ed7306bf667cb63830603 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Jun 15 10:59:54 2020 +0200 Deprecate hystrix in camel-main --- .../camel-main-configuration-metadata.json | 62 +++++++++++----------- .../camel/main/HystrixConfigurationProperties.java | 1 + .../camel/main/MainConfigurationProperties.java | 1 + .../maven/packaging/PrepareCamelMainMojo.java | 2 +- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json index 10839b8..03f494d 100644 --- a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json +++ b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json @@ -118,37 +118,37 @@ { "name": "camel.health.enabled", "description": "Whether health check is enabled globally", "sourceType": "org.apache.camel.main.HealthConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, { "name": "camel.health.registryEnabled", "description": "Whether registry health check is enabled Is default enabled", "sourceType": "org.apache.camel.main.HealthConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, { "name": "camel.health.routesEnabled", "description": "Whether routes health check is enabled Is default enabled", "sourceType": "org.apache.camel.main.HealthConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.allowMaximumSizeToDivergeFromCoreSize", "description": "Allows the configuration for maximumSize to take effect. That value can then be equal to, or higher, than coreSize", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.circuitBreakerEnabled", "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open\/closed, this property results in not even instantiating a circuit-breaker.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", [...] - { "name": "camel.hystrix.circuitBreakerErrorThresholdPercentage", "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts().", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", [...] - { "name": "camel.hystrix.circuitBreakerForceClosed", "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.circuitBreakerForceOpen", "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.circuitBreakerRequestVolumeThreshold", "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.circuitBreakerSleepWindowInMilliseconds", "description": "The time in milliseconds after a HystrixCircuitBreaker trips open that it should wait before trying requests again.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.corePoolSize", "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.executionIsolationSemaphoreMaxConcurrentRequests", "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.executionIsolationStrategy", "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": [...] - { "name": "camel.hystrix.executionIsolationThreadInterruptOnTimeout", "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.executionTimeoutEnabled", "description": "Whether the timeout mechanism is enabled for this command", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.executionTimeoutInMilliseconds", "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "java [...] - { "name": "camel.hystrix.fallbackEnabled", "description": "Whether HystrixCommand.getFallback() should be attempted when failure occurs.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.fallbackIsolationSemaphoreMaxConcurrentRequests", "description": "Number of concurrent requests permitted to HystrixCommand.getFallback(). Requests beyond the concurrent limit will fail-fast and not attempt retrieving a fallback.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.groupKey", "description": "Sets the group key to use. The default value is CamelHystrix.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": "java.lang.String" }, - { "name": "camel.hystrix.keepAliveTime", "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.maximumSize", "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.maxQueueSize", "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold().", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.metricsHealthSnapshotIntervalInMilliseconds", "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer" [...] - { "name": "camel.hystrix.metricsRollingPercentileBucketSize", "description": "Maximum number of values stored in each bucket of the rolling percentile. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.metricsRollingPercentileEnabled", "description": "Whether percentile metrics should be captured using HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.metricsRollingPercentileWindowBuckets", "description": "Number of buckets the rolling percentile window is broken into. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.metricsRollingPercentileWindowInMilliseconds", "description": "Duration of percentile rolling window in milliseconds. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.metricsRollingStatisticalWindowBuckets", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.metricsRollingStatisticalWindowInMilliseconds", "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.queueSizeRejectionThreshold", "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution.", "sourceType": "org.apache.camel.main.Hystrix [...] - { "name": "camel.hystrix.requestLogEnabled", "description": "Whether HystrixCommand execution and events should be logged to HystrixRequestLog.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean" }, - { "name": "camel.hystrix.threadPoolKey", "description": "Sets the thread pool key to use. Will by default use the same value as groupKey has been configured to use.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": "java.lang.String" }, - { "name": "camel.hystrix.threadPoolRollingNumberStatisticalWindowBuckets", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, - { "name": "camel.hystrix.threadPoolRollingNumberStatisticalWindowInMilliseconds", "description": "Duration of statistical rolling window in milliseconds. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer" }, + { "name": "camel.hystrix.allowMaximumSizeToDivergeFromCoreSize", "description": "Allows the configuration for maximumSize to take effect. That value can then be equal to, or higher, than coreSize", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.circuitBreakerEnabled", "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open\/closed, this property results in not even instantiating a circuit-breaker.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", [...] + { "name": "camel.hystrix.circuitBreakerErrorThresholdPercentage", "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts().", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", [...] + { "name": "camel.hystrix.circuitBreakerForceClosed", "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.circuitBreakerForceOpen", "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.circuitBreakerRequestVolumeThreshold", "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.circuitBreakerSleepWindowInMilliseconds", "description": "The time in milliseconds after a HystrixCircuitBreaker trips open that it should wait before trying requests again.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.corePoolSize", "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.executionIsolationSemaphoreMaxConcurrentRequests", "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.executionIsolationStrategy", "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": [...] + { "name": "camel.hystrix.executionIsolationThreadInterruptOnTimeout", "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.executionTimeoutEnabled", "description": "Whether the timeout mechanism is enabled for this command", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.executionTimeoutInMilliseconds", "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "java [...] + { "name": "camel.hystrix.fallbackEnabled", "description": "Whether HystrixCommand.getFallback() should be attempted when failure occurs.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.fallbackIsolationSemaphoreMaxConcurrentRequests", "description": "Number of concurrent requests permitted to HystrixCommand.getFallback(). Requests beyond the concurrent limit will fail-fast and not attempt retrieving a fallback.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.groupKey", "description": "Sets the group key to use. The default value is CamelHystrix.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": "java.lang.String", "deprecated": true }, + { "name": "camel.hystrix.keepAliveTime", "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.maximumSize", "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecat [...] + { "name": "camel.hystrix.maxQueueSize", "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold().", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.metricsHealthSnapshotIntervalInMilliseconds", "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer" [...] + { "name": "camel.hystrix.metricsRollingPercentileBucketSize", "description": "Maximum number of values stored in each bucket of the rolling percentile. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.metricsRollingPercentileEnabled", "description": "Whether percentile metrics should be captured using HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.metricsRollingPercentileWindowBuckets", "description": "Number of buckets the rolling percentile window is broken into. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.metricsRollingPercentileWindowInMilliseconds", "description": "Duration of percentile rolling window in milliseconds. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.metricsRollingStatisticalWindowBuckets", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside HystrixCommandMetrics.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.metricsRollingStatisticalWindowInMilliseconds", "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.queueSizeRejectionThreshold", "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution.", "sourceType": "org.apache.camel.main.Hystrix [...] + { "name": "camel.hystrix.requestLogEnabled", "description": "Whether HystrixCommand execution and events should be logged to HystrixRequestLog.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true }, + { "name": "camel.hystrix.threadPoolKey", "description": "Sets the thread pool key to use. Will by default use the same value as groupKey has been configured to use.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "string", "javaType": "java.lang.String", "deprecated": true }, + { "name": "camel.hystrix.threadPoolRollingNumberStatisticalWindowBuckets", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, + { "name": "camel.hystrix.threadPoolRollingNumberStatisticalWindowInMilliseconds", "description": "Duration of statistical rolling window in milliseconds. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance.", "sourceType": "org.apache.camel.main.HystrixConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "deprecated": true }, { "name": "camel.lra.coordinatorContextPath", "description": "The context-path for the LRA coordinator. Is default \/lra-coordinator", "sourceType": "org.apache.camel.main.LraConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "\/lra-coordinator" }, { "name": "camel.lra.coordinatorUrl", "description": "The URL for the LRA coordinator service that orchestrates the transactions", "sourceType": "org.apache.camel.main.LraConfigurationProperties", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.lra.localParticipantContextPath", "description": "The context-path for the local participant. Is default \/lra-participant", "sourceType": "org.apache.camel.main.LraConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "\/lra-participant" }, diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java index c4ad458..204c144 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java @@ -27,6 +27,7 @@ import org.apache.camel.spi.Configurer; * Global configuration for Hystrix EIP circuit breaker. */ @Configurer +@Deprecated public class HystrixConfigurationProperties { private final MainConfigurationProperties parent; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java index eeaf466..651b682 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java @@ -81,6 +81,7 @@ public class MainConfigurationProperties extends DefaultConfigurationProperties< /** * To configure Circuit Breaker EIP with Hystrix */ + @Deprecated public HystrixConfigurationProperties hystrix() { return hystrixConfigurationProperties; } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java index a21ec21..2909e51 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java @@ -87,7 +87,7 @@ public class PrepareCamelMainMojo extends AbstractGeneratorMojo { MethodSource<?> setter = clazz.getMethod(setterName, javaType); if (setter != null) { String desc = setter.getJavaDoc().getFullText(); - boolean deprecated = setter.getAnnotation(Deprecated.class) != null; + boolean deprecated = clazz.getAnnotation(Deprecated.class) != null || setter.getAnnotation(Deprecated.class) != null; String type = fromMainToType(javaType); MainModel.MainOptionModel model = new MainModel.MainOptionModel(); model.setName(name);