[camel] branch master updated: camel-main: remove superflous adapt(ModelCamelContext.class) when configuring rest properties (#3626)

[davsclaus]

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


The following commit(s) were added to refs/heads/master by this push:
     new 29ac42f  camel-main: remove superflous adapt(ModelCamelContext.class) 
when configuring rest properties (#3626)
29ac42f is described below

commit 29ac42ff2ecfa4345515c6342314591a27c34fb7
Author: Luca Burgazzoli <lburgazz...@users.noreply.github.com>
AuthorDate: Thu Mar 12 07:36:30 2020 +0100

    camel-main: remove superflous adapt(ModelCamelContext.class) when 
configuring rest properties (#3626)
---
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 3ac7b7b..0401ae8 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -770,11 +770,10 @@ public abstract class BaseMainSupport extends 
ServiceSupport {
         }
         if (!restProperties.isEmpty()) {
             LOG.debug("Auto-configuring Rest DSL from loaded properties: {}", 
restProperties.size());
-            ModelCamelContext model = 
camelContext.adapt(ModelCamelContext.class);
-            RestConfiguration rest = model.getRestConfiguration();
+            RestConfiguration rest = camelContext.getRestConfiguration();
             if (rest == null) {
                 rest = new RestConfiguration();
-                model.setRestConfiguration(rest);
+                camelContext.setRestConfiguration(rest);
             }
             setPropertiesOnTarget(camelContext, rest, restProperties, 
"camel.rest.",
                     mainConfigurationProperties.isAutoConfigurationFailFast(), 
true, autoConfiguredProperties);
@@ -806,8 +805,7 @@ public abstract class BaseMainSupport extends 
ServiceSupport {
             });
         }
         if (!restProperties.isEmpty()) {
-            ModelCamelContext model = 
camelContext.adapt(ModelCamelContext.class);
-            RestConfiguration rest = model.getRestConfiguration();
+            RestConfiguration rest = camelContext.getRestConfiguration();
             restProperties.forEach((k, v) -> {
                 LOG.warn("Property not auto-configured: camel.rest.{}={} on 
bean: {}", k, v, rest);
             });