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/03/01 16:36:24 UTC
[camel] branch main updated (2161f15 -> 31d7044)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 2161f15 Regen for commit 1672476dd0266a3e8182bad75df0fdbdd3514307
new fd60b0d CAMEL-17728: camel-quartz - Remove outdated doc
new 31d7044 CAMEL-17728: camel-quarz - Remove option that was no longer in use.
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:
.../apache/camel/catalog/components/quartz.json | 1 -
.../component/quartz/QuartzEndpointConfigurer.java | 6 -----
.../component/quartz/QuartzEndpointUriFactory.java | 3 +--
.../org/apache/camel/component/quartz/quartz.json | 1 -
.../src/main/docs/quartz-component.adoc | 14 ----------
.../camel/component/quartz/QuartzEndpoint.java | 13 ----------
.../endpoint/dsl/QuartzEndpointBuilderFactory.java | 30 ----------------------
7 files changed, 1 insertion(+), 67 deletions(-)
[camel] 01/02: CAMEL-17728: camel-quartz - Remove outdated doc
Posted by da...@apache.org.
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
commit fd60b0d81ddafd9518a5ebe50ca248d073e9cfd1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 1 17:28:22 2022 +0100
CAMEL-17728: camel-quartz - Remove outdated doc
---
.../camel-quartz/src/main/docs/quartz-component.adoc | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/components/camel-quartz/src/main/docs/quartz-component.adoc b/components/camel-quartz/src/main/docs/quartz-component.adoc
index 69e5df8..28ba9e8 100644
--- a/components/camel-quartz/src/main/docs/quartz-component.adoc
+++ b/components/camel-quartz/src/main/docs/quartz-component.adoc
@@ -97,20 +97,6 @@ configuration file.
This option is set to true by default, unless explicitly disabled.
-== Starting the Quartz scheduler
-
-The xref:quartz-component.adoc[Quartz] component offers an option to let the
-Quartz scheduler be started delayed, or not auto started at all.
-
-This is an example:
-
-[source,xml]
-----
-<bean id="quartz" class="org.apache.camel.component.quartz.QuartzComponent">
- <property name="startDelayedSeconds" value="5"/>
-</bean>
-----
-
== Clustering
If you use Quartz in clustered mode, e.g. the `JobStore` is clustered.
[camel] 02/02: CAMEL-17728: camel-quarz - Remove option that was no longer in use.
Posted by da...@apache.org.
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
commit 31d70449f7c05e0e0df224e0fc8d6d2c1cbb71ce
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 1 17:34:05 2022 +0100
CAMEL-17728: camel-quarz - Remove option that was no longer in use.
---
.../apache/camel/catalog/components/quartz.json | 1 -
.../component/quartz/QuartzEndpointConfigurer.java | 6 -----
.../component/quartz/QuartzEndpointUriFactory.java | 3 +--
.../org/apache/camel/component/quartz/quartz.json | 1 -
.../camel/component/quartz/QuartzEndpoint.java | 13 ----------
.../endpoint/dsl/QuartzEndpointBuilderFactory.java | 30 ----------------------
6 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
index 97bb808..55d8be7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
@@ -53,7 +53,6 @@
"triggerParameters": { "kind": "parameter", "displayName": "Trigger Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "trigger.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on the trigger. The parameter timeZone is supported if the cron option is present. Otherwise the parameters repeatI [...]
"usingFixedCamelContextName": { "kind": "parameter", "displayName": "Using Fixed Camel Context Name", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If it is true, JobDataMap uses the CamelContext name directly to reference the CamelContext, if it is false, JobDataMap uses use the CamelContext management name which could be changed d [...]
"autoStartScheduler": { "kind": "parameter", "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." },
- "startDelayedSeconds": { "kind": "parameter", "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." },
"triggerStartDelay": { "kind": "parameter", "displayName": "Trigger Start Delay", "group": "scheduler", "label": "scheduler", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "500", "description": "In case of scheduler has already started, we want the trigger start slightly after current time to ensure endpoint is fully started before the job kicks in. Negative value shifts trigger start time in the past." }
}
}
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointConfigurer.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointConfigurer.java
index 143631c..9aeea61 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointConfigurer.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointConfigurer.java
@@ -44,8 +44,6 @@ public class QuartzEndpointConfigurer extends PropertyConfigurerSupport implemen
case "prefixJobNameWithEndpointId": target.setPrefixJobNameWithEndpointId(property(camelContext, boolean.class, value)); return true;
case "recoverablejob":
case "recoverableJob": target.setRecoverableJob(property(camelContext, boolean.class, value)); return true;
- case "startdelayedseconds":
- case "startDelayedSeconds": target.setStartDelayedSeconds(property(camelContext, int.class, value)); return true;
case "stateful": target.setStateful(property(camelContext, boolean.class, value)); return true;
case "triggerparameters":
case "triggerParameters": target.setTriggerParameters(property(camelContext, java.util.Map.class, value)); return true;
@@ -83,8 +81,6 @@ public class QuartzEndpointConfigurer extends PropertyConfigurerSupport implemen
case "prefixJobNameWithEndpointId": return boolean.class;
case "recoverablejob":
case "recoverableJob": return boolean.class;
- case "startdelayedseconds":
- case "startDelayedSeconds": return int.class;
case "stateful": return boolean.class;
case "triggerparameters":
case "triggerParameters": return java.util.Map.class;
@@ -123,8 +119,6 @@ public class QuartzEndpointConfigurer extends PropertyConfigurerSupport implemen
case "prefixJobNameWithEndpointId": return target.isPrefixJobNameWithEndpointId();
case "recoverablejob":
case "recoverableJob": return target.isRecoverableJob();
- case "startdelayedseconds":
- case "startDelayedSeconds": return target.getStartDelayedSeconds();
case "stateful": return target.isStateful();
case "triggerparameters":
case "triggerParameters": return target.getTriggerParameters();
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
index 88d9ca1..b561033 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class QuartzEndpointUriFactory extends org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(19);
+ Set<String> props = new HashSet<>(18);
props.add("cron");
props.add("triggerName");
props.add("customCalendar");
@@ -36,7 +36,6 @@ public class QuartzEndpointUriFactory extends org.apache.camel.support.component
props.add("recoverableJob");
props.add("triggerParameters");
props.add("durableJob");
- props.add("startDelayedSeconds");
props.add("jobParameters");
props.add("exceptionHandler");
props.add("usingFixedCamelContextName");
diff --git a/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json b/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
index 97bb808..55d8be7 100644
--- a/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
+++ b/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
@@ -53,7 +53,6 @@
"triggerParameters": { "kind": "parameter", "displayName": "Trigger Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "trigger.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on the trigger. The parameter timeZone is supported if the cron option is present. Otherwise the parameters repeatI [...]
"usingFixedCamelContextName": { "kind": "parameter", "displayName": "Using Fixed Camel Context Name", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If it is true, JobDataMap uses the CamelContext name directly to reference the CamelContext, if it is false, JobDataMap uses use the CamelContext management name which could be changed d [...]
"autoStartScheduler": { "kind": "parameter", "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." },
- "startDelayedSeconds": { "kind": "parameter", "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." },
"triggerStartDelay": { "kind": "parameter", "displayName": "Trigger Start Delay", "group": "scheduler", "label": "scheduler", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "500", "description": "In case of scheduler has already started, we want the trigger start slightly after current time to ensure endpoint is fully started before the job kicks in. Negative value shifts trigger start time in the past." }
}
}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 4cc6344..bfcb05a 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -92,8 +92,6 @@ public class QuartzEndpoint extends DefaultEndpoint {
private boolean recoverableJob;
@UriParam(label = "scheduler", defaultValue = "500", javaType = "java.time.Duration")
private long triggerStartDelay = 500;
- @UriParam(label = "scheduler")
- private int startDelayedSeconds;
@UriParam(label = "scheduler", defaultValue = "true")
private boolean autoStartScheduler = true;
@UriParam(label = "advanced")
@@ -238,17 +236,6 @@ public class QuartzEndpoint extends DefaultEndpoint {
this.jobParameters = jobParameters;
}
- public int getStartDelayedSeconds() {
- return startDelayedSeconds;
- }
-
- /**
- * Seconds to wait before starting the quartz scheduler.
- */
- public void setStartDelayedSeconds(int startDelayedSeconds) {
- this.startDelayedSeconds = startDelayedSeconds;
- }
-
public boolean isAutoStartScheduler() {
return autoStartScheduler;
}
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index 07e1be7..309bf55 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -312,36 +312,6 @@ public interface QuartzEndpointBuilderFactory {
return this;
}
/**
- * Seconds to wait before starting the quartz scheduler.
- *
- * The option is a: <code>int</code> type.
- *
- * Group: scheduler
- *
- * @param startDelayedSeconds the value to set
- * @return the dsl builder
- */
- default QuartzEndpointBuilder startDelayedSeconds(
- int startDelayedSeconds) {
- doSetProperty("startDelayedSeconds", startDelayedSeconds);
- return this;
- }
- /**
- * Seconds to wait before starting the quartz scheduler.
- *
- * The option will be converted to a <code>int</code> type.
- *
- * Group: scheduler
- *
- * @param startDelayedSeconds the value to set
- * @return the dsl builder
- */
- default QuartzEndpointBuilder startDelayedSeconds(
- String startDelayedSeconds) {
- doSetProperty("startDelayedSeconds", startDelayedSeconds);
- return this;
- }
- /**
* In case of scheduler has already started, we want the trigger start
* slightly after current time to ensure endpoint is fully started
* before the job kicks in. Negative value shifts trigger start time in