This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca75d93fdd94dc469ea26d3affd8acf3d7cdcc54 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Jan 26 14:35:20 2026 +0000 (chores): ensure usage of platform-specific newline characters --- .../apache/camel/impl/console/BlockedConsole.java | 4 +- .../impl/console/CircuitBreakerDevConsole.java | 2 +- .../camel/impl/console/ConsumerDevConsole.java | 52 +++++++++---------- .../camel/impl/console/ContextDevConsole.java | 36 ++++++------- .../apache/camel/impl/console/DebugDevConsole.java | 28 +++++----- .../camel/impl/console/EndpointDevConsole.java | 8 +-- .../apache/camel/impl/console/EventConsole.java | 6 +-- .../impl/console/GarbageCollectorDevConsole.java | 2 +- .../camel/impl/console/HealthDevConsole.java | 6 +-- .../apache/camel/impl/console/InflightConsole.java | 6 +-- .../camel/impl/console/JavaSecurityDevConsole.java | 6 +-- .../apache/camel/impl/console/JvmDevConsole.java | 10 ++-- .../apache/camel/impl/console/LogDevConsole.java | 2 +- .../camel/impl/console/MemoryDevConsole.java | 16 +++--- .../camel/impl/console/ProcessorDevConsole.java | 48 ++++++++--------- .../camel/impl/console/ProducerDevConsole.java | 12 ++--- .../camel/impl/console/ReloadDevConsole.java | 8 +-- .../apache/camel/impl/console/RestDevConsole.java | 16 +++--- .../camel/impl/console/RouteControllerConsole.java | 46 ++++++++--------- .../apache/camel/impl/console/RouteDevConsole.java | 60 +++++++++++----------- .../camel/impl/console/RouteDumpDevConsole.java | 2 +- .../camel/impl/console/RouteGroupDevConsole.java | 38 +++++++------- .../impl/console/RouteStructureDevConsole.java | 2 +- .../apache/camel/impl/console/SendDevConsole.java | 10 ++-- .../camel/impl/console/ServiceDevConsole.java | 16 +++--- .../camel/impl/console/SourceDevConsole.java | 4 +- .../impl/console/SystemPropertiesDevConsole.java | 2 +- .../camel/impl/console/TaskRegistryDevConsole.java | 2 +- .../camel/impl/console/ThreadDevConsole.java | 12 ++--- .../apache/camel/impl/console/TopDevConsole.java | 46 ++++++++--------- .../camel/impl/console/TransformerConsole.java | 10 ++-- .../camel/impl/console/TypeConverterConsole.java | 16 +++--- .../camel/impl/console/VariablesDevConsole.java | 2 +- 33 files changed, 268 insertions(+), 268 deletions(-) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java index b641ade30121..06abfb082432 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java @@ -39,10 +39,10 @@ public class BlockedConsole extends AbstractDevConsole { StringBuilder sb = new StringBuilder(); AsyncProcessorAwaitManager am = PluginHelper.getAsyncProcessorAwaitManager(getCamelContext()); - sb.append(String.format("\n Blocked: %s", am.size())); + sb.append(String.format("%n Blocked: %s", am.size())); for (AsyncProcessorAwaitManager.AwaitThread at : am.browse()) { String age = TimeUtils.printDuration(at.getWaitDuration(), true); - sb.append(String.format("\n %s (at: %s/%s age: %s)", + sb.append(String.format("%n %s (at: %s/%s age: %s)", at.getExchange().getExchangeId(), at.getRouteId(), at.getNodeId(), age)); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/CircuitBreakerDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/CircuitBreakerDevConsole.java index 27f5a0dfda1e..07aa856757f0 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/CircuitBreakerDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/CircuitBreakerDevConsole.java @@ -47,7 +47,7 @@ public class CircuitBreakerDevConsole extends AbstractDevConsole { int sc = cb.getSuccess(); int fc = cb.getFailures(); String lastFailure = cb.getLastFailure() > 0 ? TimeUtils.printSince(cb.getLastFailure()) : "n/a"; - sb.append(String.format(" %s: %s (success: %d failure: %d last-failure: %s)\n", rid, state, sc, fc, + sb.append(String.format(" %s: %s (success: %d failure: %d last-failure: %s)%n", rid, state, sc, fc, lastFailure)); } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java index 8ded7df6a0d4..9c980feb88fc 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java @@ -59,26 +59,26 @@ public class ConsumerDevConsole extends AbstractDevConsole { if (!sb.isEmpty()) { sb.append("\n"); } - sb.append(String.format("\n Id: %s", id)); - sb.append(String.format("\n Uri: %s", mc.getEndpointUri())); - sb.append(String.format("\n State: %s", mc.getState())); - sb.append(String.format("\n Class: %s", mc.getServiceType())); - sb.append(String.format("\n Remote: %b", mc.isRemoteEndpoint())); - sb.append(String.format("\n Hosted: %b", mc.isHostedService())); - sb.append(String.format("\n Inflight: %d", inflight)); + sb.append(String.format("%n Id: %s", id)); + sb.append(String.format("%n Uri: %s", mc.getEndpointUri())); + sb.append(String.format("%n State: %s", mc.getState())); + sb.append(String.format("%n Class: %s", mc.getServiceType())); + sb.append(String.format("%n Remote: %b", mc.isRemoteEndpoint())); + sb.append(String.format("%n Hosted: %b", mc.isHostedService())); + sb.append(String.format("%n Inflight: %d", inflight)); if (mcc instanceof ManagedSchedulePollConsumerMBean mpc) { - sb.append(String.format("\n Polling: %s", mpc.isPolling())); - sb.append(String.format("\n First Poll Done: %s", mpc.isFirstPollDone())); - sb.append(String.format("\n Scheduler Started: %s", mpc.isSchedulerStarted())); - sb.append(String.format("\n Scheduler Class: %s", mpc.getSchedulerClassName())); - sb.append(String.format("\n Repeat Count: %s", mpc.getRepeatCount())); - sb.append(String.format("\n Fixed Delay: %s", mpc.isUseFixedDelay())); - sb.append(String.format("\n Greedy: %s", mpc.isGreedy())); - sb.append(String.format("\n Running Logging Level: %s", mpc.getRunningLoggingLevel())); - sb.append(String.format("\n Send Empty Message When Idle: %s", mpc.isSendEmptyMessageWhenIdle())); - sb.append(String.format("\n Counter (total: %d success: %d error: %d)", + sb.append(String.format("%n Polling: %s", mpc.isPolling())); + sb.append(String.format("%n First Poll Done: %s", mpc.isFirstPollDone())); + sb.append(String.format("%n Scheduler Started: %s", mpc.isSchedulerStarted())); + sb.append(String.format("%n Scheduler Class: %s", mpc.getSchedulerClassName())); + sb.append(String.format("%n Repeat Count: %s", mpc.getRepeatCount())); + sb.append(String.format("%n Fixed Delay: %s", mpc.isUseFixedDelay())); + sb.append(String.format("%n Greedy: %s", mpc.isGreedy())); + sb.append(String.format("%n Running Logging Level: %s", mpc.getRunningLoggingLevel())); + sb.append(String.format("%n Send Empty Message When Idle: %s", mpc.isSendEmptyMessageWhenIdle())); + sb.append(String.format("%n Counter (total: %d success: %d error: %d)", mpc.getCounter(), mpc.getSuccessCounter(), mpc.getErrorCounter())); - sb.append(String.format("\n Delay (initial: %d delay: %d unit: %s)", + sb.append(String.format("%n Delay (initial: %d delay: %d unit: %s)", mpc.getInitialDelay(), mpc.getDelay(), mpc.getTimeUnit())); sb.append(String.format( "\n Backoff(counter: %d multiplier: %d errorThreshold: %d, idleThreshold: %d )", @@ -102,20 +102,20 @@ public class ConsumerDevConsole extends AbstractDevConsole { Long repeatCount = (Long) ms.getAttribute(on, "RepeatCount"); String runLoggingLevel = (String) ms.getAttribute(on, "RunLoggingLevel"); - sb.append(String.format("\n Timer Name: %s", timerName)); - sb.append(String.format("\n Polling: %s", polling)); - sb.append(String.format("\n Fixed Rate: %s", fixedRate)); + sb.append(String.format("%n Timer Name: %s", timerName)); + sb.append(String.format("%n Polling: %s", polling)); + sb.append(String.format("%n Fixed Rate: %s", fixedRate)); if (delay != null) { - sb.append(String.format("\n Delay: %s", delay)); + sb.append(String.format("%n Delay: %s", delay)); } if (period != null) { - sb.append(String.format("\n Period: %s", period)); + sb.append(String.format("%n Period: %s", period)); } if (repeatCount != null) { - sb.append(String.format("\n Repeat Count: %s", repeatCount)); + sb.append(String.format("%n Repeat Count: %s", repeatCount)); } - sb.append(String.format("\n Running Logging Level: %s", runLoggingLevel)); - sb.append(String.format("\n Counter (total: %s)", counter)); + sb.append(String.format("%n Running Logging Level: %s", runLoggingLevel)); + sb.append(String.format("%n Counter (total: %s)", counter)); } } catch (Exception e) { diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java index 5ec5f20a0dcb..c5ec722d11cc 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java @@ -51,7 +51,7 @@ public class ContextDevConsole extends AbstractDevConsole { getCamelContext().getStatus().name().toLowerCase(Locale.ROOT), getCamelContext().getName(), profile, CamelContextHelper.getUptime(getCamelContext()))); if (getCamelContext().getDescription() != null) { - sb.append(String.format("\n %s", getCamelContext().getDescription())); + sb.append(String.format("%n %s", getCamelContext().getDescription())); } sb.append("\n"); @@ -61,7 +61,7 @@ public class ContextDevConsole extends AbstractDevConsole { if (mb != null) { int total = mb.getTotalRoutes(); int started = mb.getStartedRoutes(); - sb.append(String.format("\n Routes: %s (started: %s)", total, started)); + sb.append(String.format("%n Routes: %s (started: %s)", total, started)); int reloaded = 0; int reloadedFailed = 0; @@ -74,44 +74,44 @@ public class ContextDevConsole extends AbstractDevConsole { String load5 = getLoad5(mb); String load15 = getLoad15(mb); if (!load1.isEmpty() || !load5.isEmpty() || !load15.isEmpty()) { - sb.append(String.format("\n Load Average: %s %s %s", load1, load5, load15)); + sb.append(String.format("%n Load Average: %s %s %s", load1, load5, load15)); } String thp = getThroughput(mb); if (!thp.isEmpty()) { - sb.append(String.format("\n Messages/Sec: %s", thp)); + sb.append(String.format("%n Messages/Sec: %s", thp)); } - sb.append(String.format("\n Total: %s/%s", mb.getRemoteExchangesTotal(), mb.getExchangesTotal())); - sb.append(String.format("\n Failed: %s/%s", mb.getRemoteExchangesFailed(), mb.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s/%s", mb.getRemoteExchangesInflight(), mb.getExchangesInflight())); + sb.append(String.format("%n Total: %s/%s", mb.getRemoteExchangesTotal(), mb.getExchangesTotal())); + sb.append(String.format("%n Failed: %s/%s", mb.getRemoteExchangesFailed(), mb.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s/%s", mb.getRemoteExchangesInflight(), mb.getExchangesInflight())); long idle = mb.getIdleSince(); if (idle > 0) { - sb.append(String.format("\n Idle Since: %s", TimeUtils.printDuration(idle))); + sb.append(String.format("%n Idle Since: %s", TimeUtils.printDuration(idle))); } else { - sb.append(String.format("\n Idle Since: %s", "")); + sb.append(String.format("%n Idle Since: %s", "")); } - sb.append(String.format("\n Reloaded: %s/%s", reloaded, reloadedFailed)); - sb.append(String.format("\n Mean Time: %s", TimeUtils.printDuration(mb.getMeanProcessingTime(), true))); - sb.append(String.format("\n Max Time: %s", TimeUtils.printDuration(mb.getMaxProcessingTime(), true))); - sb.append(String.format("\n Min Time: %s", TimeUtils.printDuration(mb.getMinProcessingTime(), true))); + sb.append(String.format("%n Reloaded: %s/%s", reloaded, reloadedFailed)); + sb.append(String.format("%n Mean Time: %s", TimeUtils.printDuration(mb.getMeanProcessingTime(), true))); + sb.append(String.format("%n Max Time: %s", TimeUtils.printDuration(mb.getMaxProcessingTime(), true))); + sb.append(String.format("%n Min Time: %s", TimeUtils.printDuration(mb.getMinProcessingTime(), true))); if (mb.getExchangesTotal() > 0) { - sb.append(String.format("\n Last Time: %s", TimeUtils.printDuration(mb.getLastProcessingTime(), true))); + sb.append(String.format("%n Last Time: %s", TimeUtils.printDuration(mb.getLastProcessingTime(), true))); sb.append( - String.format("\n Delta Time: %s", TimeUtils.printDuration(mb.getDeltaProcessingTime(), true))); + String.format("%n Delta Time: %s", TimeUtils.printDuration(mb.getDeltaProcessingTime(), true))); } Date last = mb.getLastExchangeCreatedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Started: %s", ago)); + sb.append(String.format("%n Since Last Started: %s", ago)); } last = mb.getLastExchangeCompletedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Completed: %s", ago)); + sb.append(String.format("%n Since Last Completed: %s", ago)); } last = mb.getLastExchangeFailureTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Failed: %s", ago)); + sb.append(String.format("%n Since Last Failed: %s", ago)); } sb.append("\n"); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java index 65728ac6580f..b104700afc1f 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java @@ -70,30 +70,30 @@ public class DebugDevConsole extends AbstractDevConsole { BacklogDebugger backlog = getCamelContext().hasService(BacklogDebugger.class); if (backlog != null) { sb.append("Settings:"); - sb.append(String.format("\n Enabled: %s", backlog.isEnabled())); - sb.append(String.format("\n Standby: %s", backlog.isStandby())); - sb.append(String.format("\n Suspended Mode: %s", backlog.isSuspendMode())); - sb.append(String.format("\n Fallback Timeout: %ss", backlog.getFallbackTimeout())); // is in seconds - sb.append(String.format("\n Logging Level: %s", backlog.getLoggingLevel())); - sb.append(String.format("\n Include Exchange Properties: %s", backlog.isIncludeExchangeProperties())); - sb.append(String.format("\n Include Files: %s", backlog.isBodyIncludeFiles())); - sb.append(String.format("\n Include Streams: %s", backlog.isBodyIncludeStreams())); - sb.append(String.format("\n Max Chars: %s", backlog.getBodyMaxChars())); + sb.append(String.format("%n Enabled: %s", backlog.isEnabled())); + sb.append(String.format("%n Standby: %s", backlog.isStandby())); + sb.append(String.format("%n Suspended Mode: %s", backlog.isSuspendMode())); + sb.append(String.format("%n Fallback Timeout: %ss", backlog.getFallbackTimeout())); // is in seconds + sb.append(String.format("%n Logging Level: %s", backlog.getLoggingLevel())); + sb.append(String.format("%n Include Exchange Properties: %s", backlog.isIncludeExchangeProperties())); + sb.append(String.format("%n Include Files: %s", backlog.isBodyIncludeFiles())); + sb.append(String.format("%n Include Streams: %s", backlog.isBodyIncludeStreams())); + sb.append(String.format("%n Max Chars: %s", backlog.getBodyMaxChars())); sb.append("\n\nBreakpoints:"); - sb.append(String.format("\n Debug Counter: %s", backlog.getDebugCounter())); - sb.append(String.format("\n Single Step Mode: %s", backlog.isSingleStepMode())); + sb.append(String.format("%n Debug Counter: %s", backlog.getDebugCounter())); + sb.append(String.format("%n Single Step Mode: %s", backlog.isSingleStepMode())); for (String n : backlog.getBreakpoints()) { boolean suspended = backlog.getSuspendedBreakpointNodeIds().contains(n); if (suspended) { - sb.append(String.format("\n Breakpoint: %s (suspended)", n)); + sb.append(String.format("%n Breakpoint: %s (suspended)", n)); } else { - sb.append(String.format("\n Breakpoint: %s", n)); + sb.append(String.format("%n Breakpoint: %s", n)); } } sb.append("\n\nSuspended:"); for (String n : backlog.getSuspendedBreakpointNodeIds()) { - sb.append(String.format("\n Node: %s (suspended)", n)); + sb.append(String.format("%n Node: %s (suspended)", n)); BacklogTracerEventMessage trace = backlog.getSuspendedBreakpointMessage(n); if (trace != null) { sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java index 1363fb6bc412..f04e350a9c01 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java @@ -48,8 +48,8 @@ public class EndpointDevConsole extends AbstractDevConsole { } EndpointRegistry reg = getCamelContext().getEndpointRegistry(); sb.append( - String.format(" Endpoints: %s (static: %s dynamic: %s)\n", reg.size(), reg.staticSize(), reg.dynamicSize())); - sb.append(String.format(" Maximum Cache Size: %s\n", reg.getMaximumCacheSize())); + String.format(" Endpoints: %s (static: %s dynamic: %s)%n", reg.size(), reg.staticSize(), reg.dynamicSize())); + sb.append(String.format(" Maximum Cache Size: %s%n", reg.getMaximumCacheSize())); Collection<Endpoint> col = reg.getReadOnlyValues(); if (!col.isEmpty()) { for (Endpoint e : col) { @@ -64,10 +64,10 @@ public class EndpointDevConsole extends AbstractDevConsole { var stat = findStats(stats, e.getEndpointUri()); if (stat.isPresent()) { var st = stat.get(); - sb.append(String.format("\n %s (remote: %s direction: %s, usage: %s)", uri, remote, st.getDirection(), + sb.append(String.format("%n %s (remote: %s direction: %s, usage: %s)", uri, remote, st.getDirection(), st.getHits())); } else { - sb.append(String.format("\n %s (remote: %s)", uri, remote)); + sb.append(String.format("%n %s (remote: %s)", uri, remote)); } } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java index 02a77406948d..0b11c8b2c516 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java @@ -128,9 +128,9 @@ public class EventConsole extends AbstractDevConsole { if (event != null) { added++; if (event.getTimestamp() > 0) { - sb.append(String.format(" %s (age: %s)\n", event, TimeUtils.printSince(event.getTimestamp()))); + sb.append(String.format(" %s (age: %s)%n", event, TimeUtils.printSince(event.getTimestamp()))); } else { - sb.append(String.format(" %s\n", event)); + sb.append(String.format(" %s%n", event)); } } // move to next @@ -139,7 +139,7 @@ public class EventConsole extends AbstractDevConsole { event = events[cursor]; } if (added > 0) { - sb.insert(0, String.format("Last %s %s Events:\n", added, kind)); + sb.insert(0, String.format("Last %s %s Events:%n", added, kind)); } return sb.toString(); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java index 0ad109148b97..eff02cd31c2e 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java @@ -43,7 +43,7 @@ public class GarbageCollectorDevConsole extends AbstractDevConsole { List<GarbageCollectorMXBean> gcs = ManagementFactory.getGarbageCollectorMXBeans(); if (gcs != null && !gcs.isEmpty()) { for (GarbageCollectorMXBean gc : gcs) { - sb.append(String.format("\n %s: %s (%s ms)", gc.getName(), gc.getCollectionCount(), gc.getCollectionTime())); + sb.append(String.format("%n %s: %s (%s ms)", gc.getName(), gc.getCollectionCount(), gc.getCollectionTime())); } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java index 1ec502746cc0..1027e8942d15 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java @@ -49,13 +49,13 @@ public class HealthDevConsole extends AbstractDevConsole { results.forEach(res -> { boolean ok = res.getState().equals(HealthCheck.State.UP); if (ok) { - sb.append(String.format("\n %s: %s", res.getCheck().getId(), res.getState())); + sb.append(String.format("%n %s: %s", res.getCheck().getId(), res.getState())); } else { if (res.getMessage().isPresent()) { sb.append( - String.format("\n %s: %s (%s)", res.getCheck().getId(), res.getState(), res.getMessage().get())); + String.format("%n %s: %s (%s)", res.getCheck().getId(), res.getState(), res.getMessage().get())); } else { - sb.append(String.format("\n %s: %s", res.getCheck().getId(), res.getState())); + sb.append(String.format("%n %s: %s", res.getCheck().getId(), res.getState())); } if ("full".equals(exposureLevel)) { if (res.getError().isPresent()) { diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java index ad7f6f31b471..8d839f41349b 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java @@ -52,12 +52,12 @@ public class InflightConsole extends AbstractDevConsole { StringBuilder sb = new StringBuilder(); InflightRepository repo = getCamelContext().getInflightRepository(); - sb.append(String.format("\n Inflight: %s", repo.size())); - sb.append(String.format("\n InflightBrowseEnabled: %s", repo.isInflightBrowseEnabled())); + sb.append(String.format("%n Inflight: %s", repo.size())); + sb.append(String.format("%n InflightBrowseEnabled: %s", repo.isInflightBrowseEnabled())); if (repo.isInflightBrowseEnabled()) { for (InflightRepository.InflightExchange ie : repo.browse(filter, max, false)) { String age = TimeUtils.printDuration(ie.getDuration(), true); - sb.append(String.format("\n %s (from: %s at: %s/%s remote: %b age: %s)", + sb.append(String.format("%n %s (from: %s at: %s/%s remote: %b age: %s)", ie.getExchange().getExchangeId(), ie.getFromRouteId(), ie.getAtRouteId(), ie.getNodeId(), ie.isFromRemoteEndpoint(), age)); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java index d93cf64b4ae6..ed3a358c64bb 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java @@ -44,15 +44,15 @@ public class JavaSecurityDevConsole extends AbstractDevConsole { sb.append("Security Providers:"); sb.append("\n"); for (Provider p : providers) { - sb.append(String.format("\n %s (%s)\n", p.getName(), p.getVersionStr())); + sb.append(String.format("%n %s (%s)%n", p.getName(), p.getVersionStr())); if (p.getInfo() != null) { - sb.append(String.format("\n %s\n", p.getInfo())); + sb.append(String.format("%n %s%n", p.getInfo())); } List<Provider.Service> services = p.getServices().stream() .sorted(JavaSecurityDevConsole::compare) .toList(); for (Provider.Service s : services) { - sb.append(String.format("\n %s: %s (%s)", s.getType(), s.getAlgorithm(), s.getClassName())); + sb.append(String.format("%n %s: %s (%s)", s.getType(), s.getAlgorithm(), s.getClassName())); } sb.append("\n"); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java index 2931c7fd58c3..b0de442dadb7 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java @@ -52,11 +52,11 @@ public class JvmDevConsole extends AbstractDevConsole { RuntimeMXBean mb = ManagementFactory.getRuntimeMXBean(); if (mb != null) { - sb.append(String.format("Java Name: %s\n", mb.getVmName())); - sb.append(String.format("Java Version: %s\n", mb.getVmVersion())); - sb.append(String.format("Java Vendor: %s\n", mb.getVmVendor())); - sb.append(String.format("Uptime: %s\n", TimeUtils.printDuration(mb.getUptime()))); - sb.append(String.format("PID: %s\n", mb.getPid())); + sb.append(String.format("Java Name: %s%n", mb.getVmName())); + sb.append(String.format("Java Version: %s%n", mb.getVmVersion())); + sb.append(String.format("Java Vendor: %s%n", mb.getVmVendor())); + sb.append(String.format("Uptime: %s%n", TimeUtils.printDuration(mb.getUptime()))); + sb.append(String.format("PID: %s%n", mb.getPid())); if (!mb.getInputArguments().isEmpty()) { sb.append("Input Arguments:"); String arg = String.join("\n ", mb.getInputArguments()); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java index 3e90ae12ff57..becf4a300f6d 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java @@ -45,7 +45,7 @@ public class LogDevConsole extends AbstractDevConsole { Map<String, String> levels = fetchLoggingLevels(); if (!levels.isEmpty()) { sb.append("Logging Levels:\n"); - levels.forEach((k, v) -> sb.append(String.format("\n %s = %s", k, v))); + levels.forEach((k, v) -> sb.append(String.format("%n %s = %s", k, v))); } sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java index eb1e863f5f6e..3a2f0b9bd60d 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java @@ -41,15 +41,15 @@ public class MemoryDevConsole extends AbstractDevConsole { MemoryMXBean mb = ManagementFactory.getMemoryMXBean(); if (mb != null) { - sb.append(String.format("Heap Init: %s\n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getInit()))); - sb.append(String.format("Heap Max: %s\n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getMax()))); - sb.append(String.format("Heap Used: %s\n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getUsed()))); - sb.append(String.format("Heap Committed: %s\n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getCommitted()))); + sb.append(String.format("Heap Init: %s%n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getInit()))); + sb.append(String.format("Heap Max: %s%n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getMax()))); + sb.append(String.format("Heap Used: %s%n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getUsed()))); + sb.append(String.format("Heap Committed: %s%n", printUnitFromBytesDot(mb.getHeapMemoryUsage().getCommitted()))); sb.append("\n"); - sb.append(String.format("Non-Heap Init: %s\n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getInit()))); - sb.append(String.format("Non-Heap Max: %s\n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getMax()))); - sb.append(String.format("Non-Heap Used: %s\n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getUsed()))); - sb.append(String.format("Non-Heap Committed: %s\n", + sb.append(String.format("Non-Heap Init: %s%n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getInit()))); + sb.append(String.format("Non-Heap Max: %s%n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getMax()))); + sb.append(String.format("Non-Heap Used: %s%n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getUsed()))); + sb.append(String.format("Non-Heap Committed: %s%n", printUnitFromBytesDot(mb.getNonHeapMemoryUsage().getCommitted()))); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java index eee36667c00c..042dc628afcd 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java @@ -121,64 +121,64 @@ public class ProcessorDevConsole extends AbstractDevConsole { return; } sb.append("\n"); - sb.append(String.format("\n Route Id: %s", mp.getRouteId())); - sb.append(String.format("\n Id: %s", mp.getProcessorId())); + sb.append(String.format("%n Route Id: %s", mp.getRouteId())); + sb.append(String.format("%n Id: %s", mp.getProcessorId())); if (mp.getNodePrefixId() != null) { - sb.append(String.format("\n Node Prefix Id: %s", mp.getNodePrefixId())); + sb.append(String.format("%n Node Prefix Id: %s", mp.getNodePrefixId())); } if (mp.getDescription() != null) { - sb.append(String.format("\n Description: %s", mp.getDescription())); + sb.append(String.format("%n Description: %s", mp.getDescription())); } if (mp.getNote() != null) { - sb.append(String.format("\n Note: %s", mp.getNote())); + sb.append(String.format("%n Note: %s", mp.getNote())); } - sb.append(String.format("\n Processor: %s", mp.getProcessorName())); + sb.append(String.format("%n Processor: %s", mp.getProcessorName())); if (mp.getStepId() != null) { - sb.append(String.format("\n Step Id: %s", mp.getStepId())); + sb.append(String.format("%n Step Id: %s", mp.getStepId())); } - sb.append(String.format("\n Level: %d", mp.getLevel())); + sb.append(String.format("%n Level: %d", mp.getLevel())); if (mp.getSourceLocation() != null) { String loc = mp.getSourceLocation(); if (mp.getSourceLineNumber() != null) { loc += ":" + mp.getSourceLineNumber(); } - sb.append(String.format("\n Source: %s", loc)); + sb.append(String.format("%n Source: %s", loc)); } // processors which can send to a destination (such as to/toD/poll etc) String destination = getDestination(camelContext, mp); if (destination != null) { - sb.append(String.format("\n Uri: %s", destination)); + sb.append(String.format("%n Uri: %s", destination)); } - sb.append(String.format("\n State: %s", mp.getState())); - sb.append(String.format("\n Disabled: %s", mp.getDisabled())); - sb.append(String.format("\n Total: %s", mp.getExchangesTotal())); - sb.append(String.format("\n Failed: %s", mp.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s", mp.getExchangesInflight())); + sb.append(String.format("%n State: %s", mp.getState())); + sb.append(String.format("%n Disabled: %s", mp.getDisabled())); + sb.append(String.format("%n Total: %s", mp.getExchangesTotal())); + sb.append(String.format("%n Failed: %s", mp.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s", mp.getExchangesInflight())); long idle = mp.getIdleSince(); if (idle > 0) { - sb.append(String.format("\n Idle Since: %s", TimeUtils.printDuration(idle))); + sb.append(String.format("%n Idle Since: %s", TimeUtils.printDuration(idle))); } else { - sb.append(String.format("\n Idle Since: %s", "")); + sb.append(String.format("%n Idle Since: %s", "")); } - sb.append(String.format("\n Mean Time: %s", TimeUtils.printDuration(mp.getMeanProcessingTime(), true))); - sb.append(String.format("\n Max Time: %s", TimeUtils.printDuration(mp.getMaxProcessingTime(), true))); - sb.append(String.format("\n Min Time: %s", TimeUtils.printDuration(mp.getMinProcessingTime(), true))); + sb.append(String.format("%n Mean Time: %s", TimeUtils.printDuration(mp.getMeanProcessingTime(), true))); + sb.append(String.format("%n Max Time: %s", TimeUtils.printDuration(mp.getMaxProcessingTime(), true))); + sb.append(String.format("%n Min Time: %s", TimeUtils.printDuration(mp.getMinProcessingTime(), true))); if (mp.getExchangesTotal() > 0) { - sb.append(String.format("\n Last Time: %s", TimeUtils.printDuration(mp.getLastProcessingTime(), true))); + sb.append(String.format("%n Last Time: %s", TimeUtils.printDuration(mp.getLastProcessingTime(), true))); sb.append( - String.format("\n Delta Time: %s", TimeUtils.printDuration(mp.getDeltaProcessingTime(), true))); + String.format("%n Delta Time: %s", TimeUtils.printDuration(mp.getDeltaProcessingTime(), true))); } Date last = mp.getLastExchangeCompletedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Completed: %s", ago)); + sb.append(String.format("%n Since Last Completed: %s", ago)); } last = mp.getLastExchangeFailureTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Failed: %s", ago)); + sb.append(String.format("%n Since Last Failed: %s", ago)); } } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProducerDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProducerDevConsole.java index b8c9d96da367..046bce789815 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProducerDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProducerDevConsole.java @@ -57,13 +57,13 @@ public class ProducerDevConsole extends AbstractDevConsole { if (!sb.isEmpty()) { sb.append("\n"); } - sb.append(String.format("\n Uri: %s", mp.getEndpointUri())); - sb.append(String.format("\n State: %s", mp.getState())); - sb.append(String.format("\n Class: %s", mp.getServiceType())); - sb.append(String.format("\n Remote: %b", mp.isRemoteEndpoint())); - sb.append(String.format("\n Singleton: %b", mp.isSingleton())); + sb.append(String.format("%n Uri: %s", mp.getEndpointUri())); + sb.append(String.format("%n State: %s", mp.getState())); + sb.append(String.format("%n Class: %s", mp.getServiceType())); + sb.append(String.format("%n Remote: %b", mp.isRemoteEndpoint())); + sb.append(String.format("%n Singleton: %b", mp.isSingleton())); if (mp.getRouteId() != null) { - sb.append(String.format("\n Route Id: %s", mp.getRouteId())); + sb.append(String.format("%n Route Id: %s", mp.getRouteId())); } } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReloadDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReloadDevConsole.java index a9f6e21a597f..14ca45ed3e42 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReloadDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReloadDevConsole.java @@ -70,12 +70,12 @@ public class ReloadDevConsole extends AbstractDevConsole { } } } else { - sb.append(String.format("\nReloadStrategy: %s", r.getClass().getName())); - sb.append(String.format("\n Reloaded: %s", r.getReloadCounter())); - sb.append(String.format("\n Failed: %s", r.getFailedCounter())); + sb.append(String.format("%nReloadStrategy: %s", r.getClass().getName())); + sb.append(String.format("%n Reloaded: %s", r.getReloadCounter())); + sb.append(String.format("%n Failed: %s", r.getFailedCounter())); Exception cause = r.getLastError(); if (cause != null) { - sb.append(String.format("\n Error Message: %s", cause.getMessage())); + sb.append(String.format("%n Error Message: %s", cause.getMessage())); final String stackTrace = ExceptionHelper.stackTraceToString(cause); sb.append("\n\n"); sb.append(stackTrace); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RestDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RestDevConsole.java index c2fd1c4143ab..878b099c363d 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RestDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RestDevConsole.java @@ -53,23 +53,23 @@ public class RestDevConsole extends AbstractDevConsole { if (!sb.isEmpty()) { sb.append("\n"); } - sb.append(String.format("\n Url: %s", rs.getUrl())); - sb.append(String.format("\n Method: %s", rs.getMethod())); - sb.append(String.format("\n State: %s", rs.getState())); + sb.append(String.format("%n Url: %s", rs.getUrl())); + sb.append(String.format("%n Method: %s", rs.getMethod())); + sb.append(String.format("%n State: %s", rs.getState())); if (rs.getConsumes() != null) { - sb.append(String.format("\n Consumes: %s", rs.getConsumes())); + sb.append(String.format("%n Consumes: %s", rs.getConsumes())); } if (rs.getProduces() != null) { - sb.append(String.format("\n Produces: %s", rs.getProduces())); + sb.append(String.format("%n Produces: %s", rs.getProduces())); } if (rs.getInType() != null) { - sb.append(String.format("\n In Type: %s", rs.getInType())); + sb.append(String.format("%n In Type: %s", rs.getInType())); } if (rs.getOutType() != null) { - sb.append(String.format("\n Out Type: %s", rs.getOutType())); + sb.append(String.format("%n Out Type: %s", rs.getOutType())); } if (rs.getDescription() != null) { - sb.append(String.format("\n Description: %s", rs.getDescription())); + sb.append(String.format("%n Description: %s", rs.getDescription())); } } sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java index 2dc6167ee8cf..32313087385a 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java @@ -63,20 +63,20 @@ public class RouteControllerConsole extends AbstractDevConsole { long started = routes.stream().filter(r -> src.getRouteStatus(r.getRouteId()).isStarted()) .count(); - sb.append(String.format("\nInitial Starting Routes: %b", src.isStartingRoutes())); - sb.append(String.format("\nUnhealthy Routes: %b", src.hasUnhealthyRoutes())); + sb.append(String.format("%nInitial Starting Routes: %b", src.isStartingRoutes())); + sb.append(String.format("%nUnhealthy Routes: %b", src.hasUnhealthyRoutes())); sb.append(String.format("Total Routes: %d", routes.size())); - sb.append(String.format("\nStarted Routes: %d", started)); - sb.append(String.format("\nRestarting Routes: %d", src.getRestartingRoutes().size())); - sb.append(String.format("\nExhausted Routes: %d", src.getExhaustedRoutes().size())); - sb.append(String.format("\nInitial Delay: %d", src.getInitialDelay())); - sb.append(String.format("\nBackoff Delay: %d", src.getBackOffDelay())); - sb.append(String.format("\nBackoff Max Delay: %d", src.getBackOffMaxDelay())); - sb.append(String.format("\nBackoff Max Elapsed Time: %d", src.getBackOffMaxElapsedTime())); - sb.append(String.format("\nBackoff Max Attempts: %d", src.getBackOffMaxAttempts())); - sb.append(String.format("\nThread Pool Size: %d", src.getThreadPoolSize())); - sb.append(String.format("\nUnhealthy On Restarting: %b", src.isUnhealthyOnRestarting())); - sb.append(String.format("\nUnhealthy On Exhaust: %b", src.isUnhealthyOnExhausted())); + sb.append(String.format("%nStarted Routes: %d", started)); + sb.append(String.format("%nRestarting Routes: %d", src.getRestartingRoutes().size())); + sb.append(String.format("%nExhausted Routes: %d", src.getExhaustedRoutes().size())); + sb.append(String.format("%nInitial Delay: %d", src.getInitialDelay())); + sb.append(String.format("%nBackoff Delay: %d", src.getBackOffDelay())); + sb.append(String.format("%nBackoff Max Delay: %d", src.getBackOffMaxDelay())); + sb.append(String.format("%nBackoff Max Elapsed Time: %d", src.getBackOffMaxElapsedTime())); + sb.append(String.format("%nBackoff Max Attempts: %d", src.getBackOffMaxAttempts())); + sb.append(String.format("%nThread Pool Size: %d", src.getThreadPoolSize())); + sb.append(String.format("%nUnhealthy On Restarting: %b", src.isUnhealthyOnRestarting())); + sb.append(String.format("%nUnhealthy On Exhaust: %b", src.isUnhealthyOnExhausted())); sb.append("\n\nRoutes:\n"); for (Route route : routes) { @@ -116,20 +116,20 @@ public class RouteControllerConsole extends AbstractDevConsole { } if (supervising != null) { - sb.append(String.format("\n %s %s (%s) ", status, routeId, uri)); - sb.append(String.format("\n Supervising: %s", supervising)); - sb.append(String.format("\n Attempts: %s", attempts)); - sb.append(String.format("\n Last: %s", last)); - sb.append(String.format("\n Next Attempt: %s", next)); - sb.append(String.format("\n Elapsed: %s", elapsed)); + sb.append(String.format("%n %s %s (%s) ", status, routeId, uri)); + sb.append(String.format("%n Supervising: %s", supervising)); + sb.append(String.format("%n Attempts: %s", attempts)); + sb.append(String.format("%n Last: %s", last)); + sb.append(String.format("%n Next Attempt: %s", next)); + sb.append(String.format("%n Elapsed: %s", elapsed)); if (error != null) { - sb.append(String.format("\n Error: %s", error)); + sb.append(String.format("%n Error: %s", error)); if (stacktrace != null) { - sb.append(String.format("\n Stacktrace:\n%s", stacktrace)); + sb.append(String.format("%n Stacktrace:%n%s", stacktrace)); } } } else { - sb.append(String.format("\n %s %s (%s) ", status, routeId, uri)); + sb.append(String.format("%n %s %s (%s) ", status, routeId, uri)); } } } else { @@ -147,7 +147,7 @@ public class RouteControllerConsole extends AbstractDevConsole { String status = rc.getRouteStatus(routeId).name(); String uri = route.getEndpoint().getEndpointBaseUri(); uri = URISupport.sanitizeUri(uri); - sb.append(String.format("\n %s %s (%s)", status, routeId, uri)); + sb.append(String.format("%n %s %s (%s)", status, routeId, uri)); } } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java index 862f6ca5edf4..3c0384da59cf 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java @@ -90,88 +90,88 @@ public class RouteDevConsole extends AbstractDevConsole { } sb.append(String.format(" Id: %s", mrb.getRouteId())); if (mrb.getNodePrefixId() != null) { - sb.append(String.format("\n Node Prefix Id: %s", mrb.getNodePrefixId())); + sb.append(String.format("%n Node Prefix Id: %s", mrb.getNodePrefixId())); } if (mrb.getRouteGroup() != null) { - sb.append(String.format("\n Group: %s", mrb.getRouteGroup())); + sb.append(String.format("%n Group: %s", mrb.getRouteGroup())); } if (mrb.getDescription() != null) { - sb.append(String.format("\n Description: %s", mrb.getDescription())); + sb.append(String.format("%n Description: %s", mrb.getDescription())); } if (mrb.getNote() != null) { - sb.append(String.format("\n Note: %s", mrb.getNote())); + sb.append(String.format("%n Note: %s", mrb.getNote())); } if (mrb.isCreatedByKamelet()) { - sb.append(String.format("\n Created By Kamelet: %s", true)); + sb.append(String.format("%n Created By Kamelet: %s", true)); } if (mrb.isCreatedByRouteTemplate()) { - sb.append(String.format("\n Created By Route Template: %s", true)); + sb.append(String.format("%n Created By Route Template: %s", true)); } - sb.append(String.format("\n From: %s", mrb.getEndpointUri())); - sb.append(String.format("\n Remote: %s", mrb.isRemoteEndpoint())); + sb.append(String.format("%n From: %s", mrb.getEndpointUri())); + sb.append(String.format("%n Remote: %s", mrb.isRemoteEndpoint())); if (mrb.getSourceLocation() != null) { - sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); + sb.append(String.format("%n Source: %s", mrb.getSourceLocation())); } - sb.append(String.format("\n State: %s", mrb.getState())); + sb.append(String.format("%n State: %s", mrb.getState())); if (mrb.getLastError() != null) { String phase = StringHelper.capitalize(mrb.getLastError().getPhase().name().toLowerCase()); String ago = TimeUtils.printSince(mrb.getLastError().getDate().getTime()); - sb.append(String.format("\n Error Ago: %s", ago)); - sb.append(String.format("\n Error Phase: %s", phase)); + sb.append(String.format("%n Error Ago: %s", ago)); + sb.append(String.format("%n Error Phase: %s", phase)); Throwable cause = mrb.getLastError().getException(); if (cause != null) { - sb.append(String.format("\n Error Message: %s", cause.getMessage())); + sb.append(String.format("%n Error Message: %s", cause.getMessage())); final String stackTrace = ExceptionHelper.stackTraceToString(cause); sb.append("\n\n"); sb.append(stackTrace); sb.append("\n\n"); } } - sb.append(String.format("\n Uptime: %s", mrb.getUptime())); + sb.append(String.format("%n Uptime: %s", mrb.getUptime())); String coverage = calculateRouteCoverage(mrb, true); if (coverage != null) { - sb.append(String.format("\n Coverage: %s", coverage)); + sb.append(String.format("%n Coverage: %s", coverage)); } String load1 = getLoad1(mrb); String load5 = getLoad5(mrb); String load15 = getLoad15(mrb); if (!load1.isEmpty() || !load5.isEmpty() || !load15.isEmpty()) { - sb.append(String.format("\n Load Average: %s %s %s", load1, load5, load15)); + sb.append(String.format("%n Load Average: %s %s %s", load1, load5, load15)); } String thp = getThroughput(mrb); if (!thp.isEmpty()) { - sb.append(String.format("\n Messages/Sec: %s", thp)); + sb.append(String.format("%n Messages/Sec: %s", thp)); } - sb.append(String.format("\n Total: %s", mrb.getExchangesTotal())); - sb.append(String.format("\n Failed: %s", mrb.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s", mrb.getExchangesInflight())); + sb.append(String.format("%n Total: %s", mrb.getExchangesTotal())); + sb.append(String.format("%n Failed: %s", mrb.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s", mrb.getExchangesInflight())); long idle = mrb.getIdleSince(); if (idle > 0) { - sb.append(String.format("\n Idle Since: %s", TimeUtils.printDuration(idle))); + sb.append(String.format("%n Idle Since: %s", TimeUtils.printDuration(idle))); } else { - sb.append(String.format("\n Idle Since: %s", "")); + sb.append(String.format("%n Idle Since: %s", "")); } - 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 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))); if (mrb.getExchangesTotal() > 0) { - sb.append(String.format("\n Last Time: %s", TimeUtils.printDuration(mrb.getLastProcessingTime(), true))); - sb.append(String.format("\n Delta Time: %s", TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true))); + sb.append(String.format("%n Last Time: %s", TimeUtils.printDuration(mrb.getLastProcessingTime(), true))); + sb.append(String.format("%n Delta Time: %s", TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true))); } Date last = mrb.getLastExchangeCreatedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Started: %s", ago)); + sb.append(String.format("%n Since Last Started: %s", ago)); } last = mrb.getLastExchangeCompletedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Completed: %s", ago)); + sb.append(String.format("%n Since Last Completed: %s", ago)); } last = mrb.getLastExchangeFailureTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Failed: %s", ago)); + sb.append(String.format("%n Since Last Failed: %s", ago)); } if (processors) { includeProcessorsText(mrb, sb); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java index 438290e81c14..a69a503ddf57 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java @@ -89,7 +89,7 @@ public class RouteDumpDevConsole extends AbstractDevConsole { } sb.append(String.format(" Id: %s", mrb.getRouteId())); if (mrb.getSourceLocation() != null) { - sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); + sb.append(String.format("%n Source: %s", mrb.getSourceLocation())); } if (dump != null && !dump.isEmpty()) { sb.append("\n\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteGroupDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteGroupDevConsole.java index a1e29d502073..25446e421be1 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteGroupDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteGroupDevConsole.java @@ -81,53 +81,53 @@ public class RouteGroupDevConsole extends AbstractDevConsole { sb.append("\n"); } sb.append(String.format(" Group: %s", mrg.getRouteGroup())); - sb.append(String.format("\n Size: %s", mrg.getGroupSize())); - sb.append(String.format("\n State: %s", mrg.getState())); - sb.append(String.format("\n Uptime: %s", mrg.getUptime())); + sb.append(String.format("%n Size: %s", mrg.getGroupSize())); + sb.append(String.format("%n State: %s", mrg.getState())); + sb.append(String.format("%n Uptime: %s", mrg.getUptime())); String coverage = calculateRouteCoverage(mrg, true); if (coverage != null) { - sb.append(String.format("\n Coverage: %s", coverage)); + sb.append(String.format("%n Coverage: %s", coverage)); } String load1 = getLoad1(mrg); String load5 = getLoad5(mrg); String load15 = getLoad15(mrg); if (!load1.isEmpty() || !load5.isEmpty() || !load15.isEmpty()) { - sb.append(String.format("\n Load Average: %s %s %s", load1, load5, load15)); + sb.append(String.format("%n Load Average: %s %s %s", load1, load5, load15)); } String thp = getThroughput(mrg); if (!thp.isEmpty()) { - sb.append(String.format("\n Messages/Sec: %s", thp)); + sb.append(String.format("%n Messages/Sec: %s", thp)); } - sb.append(String.format("\n Total: %s", mrg.getExchangesTotal())); - sb.append(String.format("\n Failed: %s", mrg.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s", mrg.getExchangesInflight())); + sb.append(String.format("%n Total: %s", mrg.getExchangesTotal())); + sb.append(String.format("%n Failed: %s", mrg.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s", mrg.getExchangesInflight())); long idle = mrg.getIdleSince(); if (idle > 0) { - sb.append(String.format("\n Idle Since: %s", TimeUtils.printDuration(idle))); + sb.append(String.format("%n Idle Since: %s", TimeUtils.printDuration(idle))); } else { - sb.append(String.format("\n Idle Since: %s", "")); + sb.append(String.format("%n Idle Since: %s", "")); } - sb.append(String.format("\n Mean Time: %s", TimeUtils.printDuration(mrg.getMeanProcessingTime(), true))); - sb.append(String.format("\n Max Time: %s", TimeUtils.printDuration(mrg.getMaxProcessingTime(), true))); - sb.append(String.format("\n Min Time: %s", TimeUtils.printDuration(mrg.getMinProcessingTime(), true))); + sb.append(String.format("%n Mean Time: %s", TimeUtils.printDuration(mrg.getMeanProcessingTime(), true))); + sb.append(String.format("%n Max Time: %s", TimeUtils.printDuration(mrg.getMaxProcessingTime(), true))); + sb.append(String.format("%n Min Time: %s", TimeUtils.printDuration(mrg.getMinProcessingTime(), true))); if (mrg.getExchangesTotal() > 0) { - sb.append(String.format("\n Last Time: %s", TimeUtils.printDuration(mrg.getLastProcessingTime(), true))); - sb.append(String.format("\n Delta Time: %s", TimeUtils.printDuration(mrg.getDeltaProcessingTime(), true))); + sb.append(String.format("%n Last Time: %s", TimeUtils.printDuration(mrg.getLastProcessingTime(), true))); + sb.append(String.format("%n Delta Time: %s", TimeUtils.printDuration(mrg.getDeltaProcessingTime(), true))); } Date last = mrg.getLastExchangeCreatedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Started: %s", ago)); + sb.append(String.format("%n Since Last Started: %s", ago)); } last = mrg.getLastExchangeCompletedTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Completed: %s", ago)); + sb.append(String.format("%n Since Last Completed: %s", ago)); } last = mrg.getLastExchangeFailureTimestamp(); if (last != null) { String ago = TimeUtils.printSince(last.getTime()); - sb.append(String.format("\n Since Last Failed: %s", ago)); + sb.append(String.format("%n Since Last Failed: %s", ago)); } sb.append("\n"); return null; diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteStructureDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteStructureDevConsole.java index 26d4aef9ac14..1ae60a87a21f 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteStructureDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteStructureDevConsole.java @@ -74,7 +74,7 @@ public class RouteStructureDevConsole extends AbstractDevConsole { sb.append(String.format(" Id: %s", mrb.getRouteId())); if (mrb.getSourceLocation() != null) { - sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); + sb.append(String.format("%n Source: %s", mrb.getSourceLocation())); } sb.append("\n\n"); for (ModelDumpLine line : lines) { diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/SendDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/SendDevConsole.java index 2f6558f6f6dc..a6789ab1d7b7 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/SendDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/SendDevConsole.java @@ -157,14 +157,14 @@ public class SendDevConsole extends AbstractDevConsole { } if (target != null) { - sb.append(String.format("\n Endpoint: %s", target)); + sb.append(String.format("%n Endpoint: %s", target)); } else if (endpoint != null) { - sb.append(String.format("\n Endpoint: %s", endpoint)); + sb.append(String.format("%n Endpoint: %s", endpoint)); } - sb.append(String.format("\n Status: %s", status)); - sb.append(String.format("\n Elapsed: %s", TimeUtils.printDuration(taken))); + sb.append(String.format("%n Status: %s", status)); + sb.append(String.format("%n Elapsed: %s", TimeUtils.printDuration(taken))); if (cause != null) { - sb.append(String.format("\n Error Message: %s", cause.getMessage())); + sb.append(String.format("%n Error Message: %s", cause.getMessage())); final String stackTrace = ExceptionHelper.stackTraceToString(cause); sb.append("\n\n"); sb.append(stackTrace); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ServiceDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ServiceDevConsole.java index 2c0c89c082fd..6018b2698da5 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ServiceDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ServiceDevConsole.java @@ -42,16 +42,16 @@ public class ServiceDevConsole extends AbstractDevConsole { if (!sb.isEmpty()) { sb.append("\n"); } - sb.append(String.format("\n Component: %s", es.getComponent())); - sb.append(String.format("\n Direction: %s", es.getDirection())); - sb.append(String.format("\n Hosted: %b", es.isHostedService())); - sb.append(String.format("\n Protocol: %s", es.getServiceProtocol())); - sb.append(String.format("\n Service: %s", es.getServiceUrl())); - sb.append(String.format("\n Endpoint: %s", URISupport.sanitizeUri(es.getServiceUrl()))); + sb.append(String.format("%n Component: %s", es.getComponent())); + sb.append(String.format("%n Direction: %s", es.getDirection())); + sb.append(String.format("%n Hosted: %b", es.isHostedService())); + sb.append(String.format("%n Protocol: %s", es.getServiceProtocol())); + sb.append(String.format("%n Service: %s", es.getServiceUrl())); + sb.append(String.format("%n Endpoint: %s", URISupport.sanitizeUri(es.getServiceUrl()))); if (es.getRouteId() != null) { - sb.append(String.format("\n Route Id: %s", es.getRouteId())); + sb.append(String.format("%n Route Id: %s", es.getRouteId())); } - sb.append(String.format("\n Total Messages: %d", es.getHits())); + sb.append(String.format("%n Total Messages: %d", es.getHits())); } sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java index e0b17232700a..823bb0ce024e 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java @@ -76,7 +76,7 @@ public class SourceDevConsole extends AbstractDevConsole { t = reader.readLine(); if (t != null) { i++; - code.append(String.format("\n #%s %s", i, t)); + code.append(String.format("%n #%s %s", i, t)); } } while (t != null); IOHelper.close(reader); @@ -86,7 +86,7 @@ public class SourceDevConsole extends AbstractDevConsole { } sb.append(String.format(" Id: %s", mrb.getRouteId())); if (mrb.getSourceLocation() != null) { - sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); + sb.append(String.format("%n Source: %s", mrb.getSourceLocation())); } if (!code.isEmpty()) { sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/SystemPropertiesDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/SystemPropertiesDevConsole.java index bd0590ce938c..dc4fd7e9849c 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/SystemPropertiesDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/SystemPropertiesDevConsole.java @@ -45,7 +45,7 @@ public class SystemPropertiesDevConsole extends AbstractDevConsole { sb.append("System Properties:"); sb.append("\n"); for (String k : keys) { - sb.append(String.format(" %s = %s\n", k, System.getProperty(k))); + sb.append(String.format(" %s = %s%n", k, System.getProperty(k))); } sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TaskRegistryDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TaskRegistryDevConsole.java index f1ea140a4e8f..e92c19c64df5 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TaskRegistryDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TaskRegistryDevConsole.java @@ -38,7 +38,7 @@ public class TaskRegistryDevConsole extends AbstractDevConsole { StringBuilder sb = new StringBuilder(); TaskManagerRegistry reg = PluginHelper.getTaskManagerRegistry(getCamelContext().getCamelContextExtension()); - sb.append(String.format("\nTasks: %s", reg.getSize())); + sb.append(String.format("%nTasks: %s", reg.getSize())); int id = 0; for (Task task : reg.getTasks()) { String failure = task.getException() != null ? task.getException().getMessage() : ""; diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java index fdfacc4d5f0e..b598c13661c4 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java @@ -43,10 +43,10 @@ public class ThreadDevConsole extends AbstractDevConsole { boolean st = "true".equals(options.getOrDefault("stackTrace", "false")); ThreadMXBean tb = ManagementFactory.getThreadMXBean(); if (tb != null) { - sb.append(String.format("Threads: %s\n", tb.getThreadCount())); - sb.append(String.format("Daemon Threads: %s\n", tb.getDaemonThreadCount())); - sb.append(String.format("Total Started Threads: %s\n", tb.getTotalStartedThreadCount())); - sb.append(String.format("Peak Threads: %s\n", tb.getPeakThreadCount())); + sb.append(String.format("Threads: %s%n", tb.getThreadCount())); + sb.append(String.format("Daemon Threads: %s%n", tb.getDaemonThreadCount())); + sb.append(String.format("Total Started Threads: %s%n", tb.getTotalStartedThreadCount())); + sb.append(String.format("Peak Threads: %s%n", tb.getPeakThreadCount())); long[] ids = tb.getAllThreadIds(); Arrays.sort(ids); @@ -54,11 +54,11 @@ public class ThreadDevConsole extends AbstractDevConsole { ThreadInfo ti = st ? tb.getThreadInfo(id, Integer.MAX_VALUE) : tb.getThreadInfo(id); if (ti != null) { String lock = ti.getLockName() != null ? "locked: " + ti.getLockName() : ""; - sb.append(String.format("\n Thread %s: %s (%s) %s", id, ti.getThreadName(), ti.getThreadState().name(), + sb.append(String.format("%n Thread %s: %s (%s) %s", id, ti.getThreadName(), ti.getThreadState().name(), lock)); if (st) { for (StackTraceElement e : ti.getStackTrace()) { - sb.append(String.format("\n %s", e)); + sb.append(String.format("%n %s", e)); } } } 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 82be71ac99f0..32cb598490d5 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 @@ -76,22 +76,22 @@ public class TopDevConsole extends AbstractDevConsole { sb.append("\n"); } sb.append(String.format(" Route Id: %s", mrb.getRouteId())); - sb.append(String.format("\n From: %s", mrb.getEndpointUri())); + sb.append(String.format("%n From: %s", mrb.getEndpointUri())); if (mrb.getSourceLocation() != null) { - sb.append(String.format("\n Source: %s", mrb.getSourceLocation())); + sb.append(String.format("%n Source: %s", mrb.getSourceLocation())); } - sb.append(String.format("\n Total: %s", mrb.getExchangesTotal())); - sb.append(String.format("\n Failed: %s", mrb.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s", mrb.getExchangesInflight())); - 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 Total: %s", mrb.getExchangesTotal())); + sb.append(String.format("%n Failed: %s", mrb.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s", mrb.getExchangesInflight())); + 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 Last Time: %s", TimeUtils.printDuration(mrb.getLastProcessingTime(), true))); + String.format("%n Last Time: %s", TimeUtils.printDuration(mrb.getLastProcessingTime(), true))); sb.append( - String.format("\n Delta Time: %s", TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true))); + String.format("%n Delta Time: %s", TimeUtils.printDuration(mrb.getDeltaProcessingTime(), true))); sb.append( - String.format("\n Total Time: %s", TimeUtils.printDuration(mrb.getTotalProcessingTime(), true))); + String.format("%n Total Time: %s", TimeUtils.printDuration(mrb.getTotalProcessingTime(), true))); sb.append("\n"); return null; }; @@ -102,7 +102,7 @@ public class TopDevConsole extends AbstractDevConsole { sb.append("\n"); } sb.append(String.format(" Route Id: %s", mpb.getRouteId())); - sb.append(String.format("\n Processor Id: %s", mpb.getProcessorId())); + sb.append(String.format("%n Processor Id: %s", mpb.getProcessorId())); String loc = mpb.getSourceLocation(); StringBuilder code = new StringBuilder(); if (loc != null && mpb.getSourceLineNumber() != null) { @@ -119,7 +119,7 @@ public class TopDevConsole extends AbstractDevConsole { int high = line + 4; if (i >= low && i <= high) { String arrow = i == line ? "-->" : " "; - code.append(String.format("\n %s #%s %s", arrow, i, t)); + code.append(String.format("%n %s #%s %s", arrow, i, t)); } } } @@ -131,23 +131,23 @@ public class TopDevConsole extends AbstractDevConsole { } } if (loc != null) { - sb.append(String.format("\n Source: %s", loc)); + sb.append(String.format("%n Source: %s", loc)); if (!code.isEmpty()) { sb.append(code); } } - sb.append(String.format("\n Total: %s", mpb.getExchangesTotal())); - sb.append(String.format("\n Failed: %s", mpb.getExchangesFailed())); - sb.append(String.format("\n Inflight: %s", mpb.getExchangesInflight())); - 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 Total: %s", mpb.getExchangesTotal())); + sb.append(String.format("%n Failed: %s", mpb.getExchangesFailed())); + sb.append(String.format("%n Inflight: %s", mpb.getExchangesInflight())); + 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 Last Time: %s", TimeUtils.printDuration(mpb.getLastProcessingTime(), true))); + String.format("%n Last Time: %s", TimeUtils.printDuration(mpb.getLastProcessingTime(), true))); sb.append( - String.format("\n Delta Time: %s", TimeUtils.printDuration(mpb.getDeltaProcessingTime(), true))); + String.format("%n Delta Time: %s", TimeUtils.printDuration(mpb.getDeltaProcessingTime(), true))); sb.append( - String.format("\n Total Time: %s", TimeUtils.printDuration(mpb.getTotalProcessingTime(), true))); + String.format("%n Total Time: %s", TimeUtils.printDuration(mpb.getTotalProcessingTime(), true))); sb.append("\n"); return null; }; diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TransformerConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TransformerConsole.java index 6400d2fd96c5..01bf38928108 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TransformerConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TransformerConsole.java @@ -37,10 +37,10 @@ public class TransformerConsole extends AbstractDevConsole { StringBuilder sb = new StringBuilder(); TransformerRegistry reg = getCamelContext().getTransformerRegistry(); - sb.append(String.format("\n Size: %s", reg.size())); - sb.append(String.format("\n Dynamic Size: %s", reg.dynamicSize())); - sb.append(String.format("\n Static Size: %s", reg.staticSize())); - sb.append(String.format("\n Maximum Cache Size: %s", reg.getMaximumCacheSize())); + sb.append(String.format("%n Size: %s", reg.size())); + sb.append(String.format("%n Dynamic Size: %s", reg.dynamicSize())); + sb.append(String.format("%n Static Size: %s", reg.staticSize())); + sb.append(String.format("%n Maximum Cache Size: %s", reg.getMaximumCacheSize())); sb.append("\n"); sb.append("\nTransformers:\n"); @@ -48,7 +48,7 @@ public class TransformerConsole extends AbstractDevConsole { Transformer t = entry.getValue(); String from = t.getFrom() != null ? t.getFrom().getFullName() : "*"; String to = t.getTo() != null ? t.getTo().getFullName() : "*"; - sb.append(String.format("\n %s (from: %s to: %s)", t.getName(), from, to)); + sb.append(String.format("%n %s (from: %s to: %s)", t.getName(), from, to)); } sb.append("\n"); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java index 4aea4072a223..e44c13ba5820 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java @@ -35,16 +35,16 @@ public class TypeConverterConsole extends AbstractDevConsole { StringBuilder sb = new StringBuilder(); TypeConverterRegistry reg = getCamelContext().getTypeConverterRegistry(); - sb.append(String.format("\n Converters: %s", reg.size())); - sb.append(String.format("\n Exists: %s", reg.getTypeConverterExists().name())); - sb.append(String.format("\n Exists LoggingLevel: %s", reg.getTypeConverterExistsLoggingLevel())); + sb.append(String.format("%n Converters: %s", reg.size())); + sb.append(String.format("%n Exists: %s", reg.getTypeConverterExists().name())); + sb.append(String.format("%n Exists LoggingLevel: %s", reg.getTypeConverterExistsLoggingLevel())); final TypeConverterRegistry.Statistics statistics = reg.getStatistics(); - statistics.computeIfEnabled(statistics::getAttemptCounter, v -> sb.append(String.format("\n Attempts: %s", v))); - statistics.computeIfEnabled(statistics::getHitCounter, v -> sb.append(String.format("\n Hit: %s", v))); - statistics.computeIfEnabled(statistics::getMissCounter, v -> sb.append(String.format("\n Miss: %s", v))); - statistics.computeIfEnabled(statistics::getFailedCounter, v -> sb.append(String.format("\n Failed: %s", v))); - statistics.computeIfEnabled(statistics::getNoopCounter, v -> sb.append(String.format("\n Noop: %s", v))); + statistics.computeIfEnabled(statistics::getAttemptCounter, v -> sb.append(String.format("%n Attempts: %s", v))); + statistics.computeIfEnabled(statistics::getHitCounter, v -> sb.append(String.format("%n Hit: %s", v))); + statistics.computeIfEnabled(statistics::getMissCounter, v -> sb.append(String.format("%n Miss: %s", v))); + statistics.computeIfEnabled(statistics::getFailedCounter, v -> sb.append(String.format("%n Failed: %s", v))); + statistics.computeIfEnabled(statistics::getNoopCounter, v -> sb.append(String.format("%n Noop: %s", v))); return sb.toString(); } diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java index eec27287dc6f..60a557b3184b 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java @@ -46,7 +46,7 @@ public class VariablesDevConsole extends AbstractDevConsole { String k = entry.getKey(); Object v = entry.getValue(); String t = v != null ? v.getClass().getName() : "<null>"; - sb.append(String.format("\n %s (%s) = %s", k, t, v)); + sb.append(String.format("%n %s (%s) = %s", k, t, v)); } sb.append("\n"); }
