You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/06 08:50:26 UTC
[camel-spring-boot] branch main updated: CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a38a343 CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
a38a343 is described below
commit a38a343a4f6284d719a79c81d9fe02d004cf1f6a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 6 09:49:36 2022 +0100
CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
---
.../springboot/catalog/components/quartz.json | 11 ++++-----
.../camel-quartz-starter/src/main/docs/quartz.json | 14 ++++-------
.../springboot/QuartzComponentConfiguration.java | 28 +++++++---------------
3 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
index c6ac1e9..5390dc4 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
@@ -23,18 +23,17 @@
},
"componentProperties": {
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
- "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true" },
- "prefixInstanceName": { "kind": "property", "displayName": "Prefix Instance Name", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to fal [...]
- "prefixJobNameWithEndpointId": { "kind": "property", "displayName": "Prefix Job Name With Endpoint Id", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to prefix the quartz job with the endpoint id. This option is default false." },
+ "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. <p\/> This options is default true" },
+ "prefixInstanceName": { "kind": "property", "displayName": "Prefix Instance Name", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to prefix the Quartz Scheduler instance name with the CamelContext name. <p\/> This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option [...]
+ "prefixJobNameWithEndpointId": { "kind": "property", "displayName": "Prefix Job Name With Endpoint Id", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to prefix the quartz job with the endpoint id. <p\/> This option is default false." },
"properties": { "kind": "property", "displayName": "Properties", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "autowired": false, "secret": false, "description": "Properties to configure the Quartz scheduler." },
"propertiesFile": { "kind": "property", "displayName": "Properties File", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "File name of the properties to load from the classpath" },
"propertiesRef": { "kind": "property", "displayName": "Properties Ref", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to an existing Properties or Map to lookup in the registry to use for configuring quartz." },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
"scheduler": { "kind": "property", "displayName": "Scheduler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.quartz.Scheduler", "deprecated": false, "autowired": false, "secret": false, "description": "To use the custom configured Quartz scheduler, instead of creating a new Scheduler." },
"schedulerFactory": { "kind": "property", "displayName": "Scheduler Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.quartz.SchedulerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the custom SchedulerFactory which is used to create the Scheduler." },
- "autoStartScheduler": { "kind": "property", "displayName": "Auto Start Scheduler", "group": "scheduler", "label": "scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether or not the scheduler should be auto started. This options is default true" },
- "interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being i [...]
- "startDelayedSeconds": { "kind": "property", "displayName": "Start Delayed Seconds", "group": "scheduler", "label": "scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Seconds to wait before starting the quartz scheduler." }
+ "autoStartScheduler": { "kind": "property", "displayName": "Auto Start Scheduler", "group": "scheduler", "label": "scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether or not the scheduler should be auto started. <p\/> This options is default true" },
+ "interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being i [...]
},
"properties": {
"groupName": { "kind": "path", "displayName": "Group Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Camel", "description": "The quartz group name to use. The combination of group name and trigger name should be unique." },
diff --git a/components-starter/camel-quartz-starter/src/main/docs/quartz.json b/components-starter/camel-quartz-starter/src/main/docs/quartz.json
index 05b4afa..19e20b5 100644
--- a/components-starter/camel-quartz-starter/src/main/docs/quartz.json
+++ b/components-starter/camel-quartz-starter/src/main/docs/quartz.json
@@ -16,7 +16,7 @@
{
"name": "camel.component.quartz.auto-start-scheduler",
"type": "java.lang.Boolean",
- "description": "Whether or not the scheduler should be auto started. This options is default true",
+ "description": "Whether or not the scheduler should be auto started. <p\/> This options is default true",
"sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
@@ -42,7 +42,7 @@
{
"name": "camel.component.quartz.enable-jmx",
"type": "java.lang.Boolean",
- "description": "Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true",
+ "description": "Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. <p\/> This options is default true",
"sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
@@ -62,14 +62,14 @@
{
"name": "camel.component.quartz.prefix-instance-name",
"type": "java.lang.Boolean",
- "description": "Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's.",
+ "description": "Whether to prefix the Quartz Scheduler instance name with the CamelContext name. <p\/> This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to <tt>false to reuse Quartz scheduler instances between multiple CamelContext's.",
"sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
{
"name": "camel.component.quartz.prefix-job-name-with-endpoint-id",
"type": "java.lang.Boolean",
- "description": "Whether to prefix the quartz job with the endpoint id. This option is default false.",
+ "description": "Whether to prefix the quartz job with the endpoint id. <p\/> This option is default false.",
"sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": false
},
@@ -102,12 +102,6 @@
"type": "org.quartz.SchedulerFactory",
"description": "To use the custom SchedulerFactory which is used to create the Scheduler. The option is a org.quartz.SchedulerFactory type.",
"sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration"
- },
- {
- "name": "camel.component.quartz.start-delayed-seconds",
- "type": "java.lang.Integer",
- "description": "Seconds to wait before starting the quartz scheduler.",
- "sourceType": "org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration"
}
],
"hints": []
diff --git a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
index 1bf833b..2b50ab7 100644
--- a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
+++ b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
@@ -50,20 +50,20 @@ public class QuartzComponentConfiguration
private Boolean bridgeErrorHandler = false;
/**
* Whether to enable Quartz JMX which allows to manage the Quartz scheduler
- * from JMX. This options is default true
+ * from JMX. <p/> This options is default true
*/
private Boolean enableJmx = true;
/**
* Whether to prefix the Quartz Scheduler instance name with the
- * CamelContext name. This is enabled by default, to let each CamelContext
- * use its own Quartz scheduler instance by default. You can set this option
- * to false to reuse Quartz scheduler instances between multiple
- * CamelContext's.
+ * CamelContext name. <p/> This is enabled by default, to let each
+ * CamelContext use its own Quartz scheduler instance by default. You can
+ * set this option to <tt>false to reuse Quartz scheduler instances between
+ * multiple CamelContext's.
*/
private Boolean prefixInstanceName = true;
/**
- * Whether to prefix the quartz job with the endpoint id. This option is
- * default false.
+ * Whether to prefix the quartz job with the endpoint id. <p/> This option
+ * is default false.
*/
private Boolean prefixJobNameWithEndpointId = false;
/**
@@ -99,7 +99,7 @@ public class QuartzComponentConfiguration
*/
private SchedulerFactory schedulerFactory;
/**
- * Whether or not the scheduler should be auto started. This options is
+ * Whether or not the scheduler should be auto started. <p/> This options is
* default true
*/
private Boolean autoStartScheduler = true;
@@ -113,10 +113,6 @@ public class QuartzComponentConfiguration
* Camel jobs to complete and shutdown gracefully.
*/
private Boolean interruptJobsOnShutdown = false;
- /**
- * Seconds to wait before starting the quartz scheduler.
- */
- private Integer startDelayedSeconds;
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
@@ -214,12 +210,4 @@ public class QuartzComponentConfiguration
public void setInterruptJobsOnShutdown(Boolean interruptJobsOnShutdown) {
this.interruptJobsOnShutdown = interruptJobsOnShutdown;
}
-
- public Integer getStartDelayedSeconds() {
- return startDelayedSeconds;
- }
-
- public void setStartDelayedSeconds(Integer startDelayedSeconds) {
- this.startDelayedSeconds = startDelayedSeconds;
- }
}
\ No newline at end of file