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
The following commit(s) were added to refs/heads/main by this push:
new 7a4cc50dd23 Regen for commit 609257c3b760e635b39e49c103c3d133e21a0bdf
(#7924)
7a4cc50dd23 is described below
commit 7a4cc50dd238f21973f922b69ab23894a47d0df1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 29 10:47:43 2022 +0200
Regen for commit 609257c3b760e635b39e49c103c3d133e21a0bdf (#7924)
Signed-off-by: GitHub <[email protected]>
Co-authored-by: davsclaus <[email protected]>
---
.../org/apache/camel/component/file/remote/FtpConsumer.java | 1 -
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 3 ++-
.../java/org/apache/camel/impl/console/TopDevConsole.java | 12 ++++++++----
.../org/apache/camel/main/DefaultMainShutdownStrategy.java | 3 ++-
.../src/main/java/org/apache/camel/util/TimeUtils.java | 12 ++++++------
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
index 2280d88adb5..d04af0708bb 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Date;
import java.util.List;
import org.apache.camel.Exchange;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 47976b7f312..fce466d32f7 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2605,7 +2605,8 @@ public abstract class AbstractCamelContext extends
BaseService
if (LOG.isInfoEnabled()) {
LOG.info("Resumed {} routes", suspendedRouteServices.size());
- LOG.info("Apache Camel {} ({}) resumed in {}", getVersion(),
getName(), TimeUtils.printDuration(watch.taken(), true));
+ LOG.info("Apache Camel {} ({}) resumed in {}", getVersion(),
getName(),
+ TimeUtils.printDuration(watch.taken(), true));
}
// and clear the list as they have been resumed
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
index 52eb671818d..8d934ee8058 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
@@ -84,8 +84,10 @@ public class TopDevConsole extends AbstractDevConsole {
sb.append(String.format("\n Mean Time: %s",
TimeUtils.printDuration(mrb.getMeanProcessingTime(), true)));
sb.append(String.format("\n Max Time: %s",
TimeUtils.printDuration(mrb.getMaxProcessingTime(), true)));
sb.append(String.format("\n Min Time: %s",
TimeUtils.printDuration(mrb.getMinProcessingTime(), true)));
- sb.append(String.format("\n Delta Time: %s",
TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true)));
- sb.append(String.format("\n Total Time: %s",
TimeUtils.printDuration(mrb.getTotalProcessingTime(), true)));
+ sb.append(
+ String.format("\n Delta Time: %s",
TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true)));
+ sb.append(
+ String.format("\n Total Time: %s",
TimeUtils.printDuration(mrb.getTotalProcessingTime(), true)));
sb.append("\n");
return null;
};
@@ -137,8 +139,10 @@ public class TopDevConsole extends AbstractDevConsole {
sb.append(String.format("\n Mean Time: %s",
TimeUtils.printDuration(mpb.getMeanProcessingTime(), true)));
sb.append(String.format("\n Max Time: %s",
TimeUtils.printDuration(mpb.getMaxProcessingTime(), true)));
sb.append(String.format("\n Min Time: %s",
TimeUtils.printDuration(mpb.getMinProcessingTime(), true)));
- sb.append(String.format("\n Delta Time: %s",
TimeUtils.printDuration(mpb.getDeltaProcessingTime(), true)));
- sb.append(String.format("\n Total Time: %s",
TimeUtils.printDuration(mpb.getTotalProcessingTime(), true)));
+ sb.append(
+ String.format("\n Delta Time: %s",
TimeUtils.printDuration(mpb.getDeltaProcessingTime(), true)));
+ sb.append(
+ String.format("\n Total Time: %s",
TimeUtils.printDuration(mpb.getTotalProcessingTime(), true)));
sb.append("\n");
return null;
};
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
index 38ffc68e609..b4602be9760 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
@@ -98,7 +98,8 @@ public class DefaultMainShutdownStrategy extends
SimpleMainShutdownStrategy {
StopWatch watch = new StopWatch();
while (!main.getCamelContext().isStopped() && !done &&
watch.taken() < max) {
String msg = "Waiting for CamelContext to graceful
shutdown (max:"
- + TimeUtils.printDuration(max, true) + ",
elapsed:" + TimeUtils.printDuration(watch.taken(), true) + ")";
+ + TimeUtils.printDuration(max, true) + ",
elapsed:"
+ + TimeUtils.printDuration(watch.taken(),
true) + ")";
if (waits > 0 && waits % 5 == 0) {
// do some info logging every 5th time
LOG.info(msg);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/TimeUtils.java
b/core/camel-util/src/main/java/org/apache/camel/util/TimeUtils.java
index cd6e8001e2a..723a864aa23 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/TimeUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/TimeUtils.java
@@ -38,8 +38,8 @@ public final class TimeUtils {
/**
* Prints the since ago in a human-readable format as 9s, 27m44s, 3h12m,
3d8h, as seen on Kubernetes etc.
*
- * @param time time of the event (millis since epoch)
- * @return ago in human-readable since the given time.
+ * @param time time of the event (millis since epoch)
+ * @return ago in human-readable since the given time.
*/
public static String printSince(long time) {
long age = System.currentTimeMillis() - time;
@@ -49,8 +49,8 @@ public final class TimeUtils {
/**
* Prints the ago in a human-readable format as 9s, 27m44s, 3h12m, 3d8h,
as seen on Kubernetes etc.
*
- * @param age age in millis
- * @return ago in human-readable.
+ * @param age age in millis
+ * @return ago in human-readable.
*/
public static String printAge(long age) {
return printDuration(age, false);
@@ -69,9 +69,9 @@ public final class TimeUtils {
/**
* Prints the duration in a human-readable format as 9s, 27m44s, 3h12m,
3d8h, etc.
*
- * @param uptime the uptime in millis
+ * @param uptime the uptime in millis
* @param precise whether to be precise and include more details
- * @return the time used for displaying on screen or in logs
+ * @return the time used for displaying on screen or in logs
*/
public static String printDuration(Duration uptime, boolean precise) {
return printDuration(uptime.toMillis(), precise);
