This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch inline in repository https://gitbox.apache.org/repos/asf/camel.git
commit efc5e3dbe379b67c6f30f987edd7c2f4d8820e31 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Feb 27 14:36:04 2024 +0100 CAMEL-20466: camel-core - Rest DSL to be inlined by default to avoid clutter up list of routes --- .../org/apache/camel/impl/engine/AbstractCamelContext.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 8f6bb7eed26..22ba27a215c 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 @@ -2560,8 +2560,7 @@ public abstract class AbstractCamelContext extends BaseService } else if (order.getRoute().isCreatedByRestDsl()) { rests++; } - boolean skip = order.getRoute().isCreatedByRestDsl() - || (!registerKamelets && order.getRoute().isCreatedByKamelet()) + boolean skip = (!registerKamelets && order.getRoute().isCreatedByKamelet()) || (!registerTemplates && order.getRoute().isCreatedByRouteTemplate()); if (!skip && ServiceStatus.Started.name().equals(status)) { started++; @@ -2599,7 +2598,7 @@ public abstract class AbstractCamelContext extends BaseService } else if (route.isCreatedByRestDsl()) { rests++; } - boolean skip = route.isCreatedByRestDsl() || (!registerKamelets && route.isCreatedByKamelet()) + boolean skip = (!registerKamelets && route.isCreatedByKamelet()) || (!registerTemplates && route.isCreatedByRouteTemplate()); // use basic endpoint uri to not log verbose details or potential sensitive data String uri = route.getEndpoint().getEndpointBaseUri(); @@ -2626,7 +2625,6 @@ public abstract class AbstractCamelContext extends BaseService if (!registerTemplates) { newTotal -= templates; } - newTotal -= rests; StringJoiner sj = new StringJoiner(" "); sj.add("total:" + newTotal); if (total != started) { @@ -3074,8 +3072,7 @@ public abstract class AbstractCamelContext extends BaseService } else if (order.getRoute().isCreatedByRestDsl()) { rests++; } - boolean skip = order.getRoute().isCreatedByRestDsl() - || (!registerKamelets && order.getRoute().isCreatedByKamelet()) + boolean skip = (!registerKamelets && order.getRoute().isCreatedByKamelet()) || (!registerTemplates && order.getRoute().isCreatedByRouteTemplate()); if (!skip && ServiceStatus.Stopped.name().equals(status)) { stopped++; @@ -3098,7 +3095,6 @@ public abstract class AbstractCamelContext extends BaseService if (!registerTemplates) { newTotal -= templates; } - newTotal -= rests; StringJoiner sj = new StringJoiner(" "); sj.add("total:" + newTotal); if (total != stopped) {