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
commit e8f2c2e9b1f6fb9d5149d7dbda6a48d8a7659297
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jun 24 11:01:12 2019 +0200
Fixed camel-main setting duration max seconds.
---
.../camel/main/MainConfigurationProperties.java | 22 ----------------------
.../java/org/apache/camel/main/MainSupport.java | 17 +++++++++--------
.../camel-main-configuration-metadata.json | 7 -------
3 files changed, 9 insertions(+), 37 deletions(-)
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 7af382b..89518b9 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
@@ -25,7 +25,6 @@ public class MainConfigurationProperties extends
DefaultConfigurationProperties<
private boolean autowireComponentProperties = true;
private boolean autowireComponentPropertiesDeep;
private boolean autowireComponentPropertiesAllowPrivateSetter = true;
- private long duration = -1;
private int durationHitExitCode;
private boolean hangupInterceptorEnabled = true;
@@ -123,18 +122,6 @@ public class MainConfigurationProperties extends
DefaultConfigurationProperties<
this.autowireComponentPropertiesAllowPrivateSetter =
autowireComponentPropertiesAllowPrivateSetter;
}
- public long getDuration() {
- return duration;
- }
-
- /**
- * Sets the duration (in seconds) to run the application until it
- * should be terminated. Defaults to -1. Any value <= 0 will run forever.
- */
- public void setDuration(long duration) {
- this.duration = duration;
- }
-
public boolean isHangupInterceptorEnabled() {
return hangupInterceptorEnabled;
}
@@ -221,15 +208,6 @@ public class MainConfigurationProperties extends
DefaultConfigurationProperties<
}
/**
- * Sets the duration (in seconds) to run the application until it
- * should be terminated. Defaults to -1. Any value <= 0 will run forever.
- */
- public MainConfigurationProperties withDuration(long duration) {
- this.duration = duration;
- return this;
- }
-
- /**
* Whether to use graceful hangup when Camel is stopping or when the JVM
terminates.
*/
public MainConfigurationProperties withHangupInterceptorEnabled(boolean
hangupInterceptorEnabled) {
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 4e841f3..9aec640 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
@@ -138,7 +138,7 @@ public abstract class MainSupport extends ServiceSupport {
if (parameter.endsWith("s") || parameter.endsWith("S")) {
parameter = parameter.substring(0, parameter.length() - 1);
}
- configure().setDuration(Integer.parseInt(parameter));
+ configure().setDurationMaxSeconds(Integer.parseInt(parameter));
}
});
addOption(new ParameterOption("dm", "durationMaxMessages",
@@ -363,8 +363,8 @@ public abstract class MainSupport extends ServiceSupport {
}
@Deprecated
- public long getDuration() {
- return mainConfigurationProperties.getDuration();
+ public int getDuration() {
+ return mainConfigurationProperties.getDurationMaxSeconds();
}
/**
@@ -373,8 +373,8 @@ public abstract class MainSupport extends ServiceSupport {
* @deprecated use {@link #configure()}
*/
@Deprecated
- public void setDuration(long duration) {
- mainConfigurationProperties.setDuration(duration);
+ public void setDuration(int duration) {
+ mainConfigurationProperties.setDurationMaxSeconds(duration);
}
@Deprecated
@@ -551,9 +551,10 @@ public abstract class MainSupport extends ServiceSupport {
try {
int idle =
mainConfigurationProperties.getDurationMaxIdleSeconds();
int max = mainConfigurationProperties.getDurationMaxMessages();
- if (mainConfigurationProperties.getDuration() > 0) {
- LOG.info("Waiting for: {} seconds",
mainConfigurationProperties.getDuration());
- latch.await(mainConfigurationProperties.getDuration(),
TimeUnit.SECONDS);
+ long sec = mainConfigurationProperties.getDurationMaxSeconds();
+ if (sec > 0) {
+ LOG.info("Waiting for: {} seconds", sec);
+ latch.await(sec, TimeUnit.SECONDS);
exitCode.compareAndSet(UNINITIALIZED_EXIT_CODE,
mainConfigurationProperties.getDurationHitExitCode());
completed.set(true);
} else if (idle > 0 || max > 0) {
diff --git
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index 0f7662b..096901c 100644
---
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -65,13 +65,6 @@
"defaultValue":"1000"
},
{
- "name":"camel.main.duration",
- "type":"long",
-
"sourceType":"org.apache.camel.main.MainConfigurationProperties",
- "description":"Sets the duration (in seconds) to run
the application until it should be terminated. Defaults to -1. Any value = 0
will run forever.",
- "defaultValue":"-1"
- },
- {
"name":"camel.main.duration-hit-exit-code",
"type":"int",
"sourceType":"org.apache.camel.main.MainConfigurationProperties",
