[camel-spring-boot] branch main updated: CAMEL-16552: camel-spring-boot - Configuring route templates trouble setting route id when using spring yaml configuration

[davsclaus]

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-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new 7201147  CAMEL-16552: camel-spring-boot - Configuring route templates 
trouble setting route id when using spring yaml configuration
7201147 is described below

commit 7201147f7129e2aee89ce9bfbe4c80eafde44ce4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 27 12:12:40 2021 +0200

    CAMEL-16552: camel-spring-boot - Configuring route templates trouble 
setting route id when using spring yaml configuration
---
 .../boot/routetemplate/CamelRouteTemplateAutoConfiguration.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java
index 3fc76b7..3ccc775 100644
--- 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java
+++ 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java
@@ -43,21 +43,18 @@ public class CamelRouteTemplateAutoConfiguration {
         PropertiesRouteTemplateParametersSource source = new 
PropertiesRouteTemplateParametersSource();
         int counter = 0;
         for (Map<String, String> e : rt.getConfig()) {
-            boolean customRouteId = true;
             String routeId = e.remove("routeId");
             if (routeId == null) {
                 routeId = e.remove("route-id");
             }
             if (routeId == null) {
                 routeId = String.valueOf(counter);
-                customRouteId = false;
+                // use counter as route id since none was specified
+                counter++;
             }
             for (Map.Entry<String, String> entry : e.entrySet()) {
                 source.addParameter(routeId, entry.getKey(), entry.getValue());
             }
-            if (!customRouteId) {
-                counter++;
-            }
         }
 
         
camelContext.getRegistry().bind("CamelSpringBootRouteTemplateParametersSource", 
RouteTemplateParameterSource.class, source);