[camel] 17/18: Fix rest tests

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit aab471a1930754e03d922b2bf6c91a6bab68e70a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Feb 12 00:14:11 2020 +0100

    Fix rest tests
---
 .../java/org/apache/camel/component/rest/RestComponent.java    |  2 ++
 .../main/java/org/apache/camel/model/rest/RestDefinition.java  | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
 
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
index 36df25f..d9aa538 100644
--- 
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
+++ 
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
@@ -242,6 +242,8 @@ public class RestComponent extends DefaultComponent {
             conf.setScheme(or(conf.getScheme(), from.getScheme()));
             conf.setHost(or(conf.getHost(), from.getHost()));
             conf.setUseXForwardHeaders(or(conf.isUseXForwardHeaders(), 
from.isUseXForwardHeaders()));
+            conf.setApiHost(or(conf.getApiHost(), from.getApiHost()));
+            conf.setPort(or(conf.getPort(), from.getPort()));
             conf.setContextPath(or(conf.getContextPath(), 
from.getContextPath()));
             conf.setApiContextPath(or(conf.getApiContextPath(), 
from.getApiContextPath()));
             conf.setApiContextRouteId(or(conf.getApiContextRouteId(), 
from.getApiContextRouteId()));
diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 4be93ca..21209d2 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -773,16 +773,6 @@ public class RestDefinition extends 
OptionalIdentifiedDefinition<RestDefinition>
                 route.getOutputs().add(def);
             }
 
-//            // ensure property placeholders is resolved on the verb
-//            try {
-//                
ProcessorDefinitionHelper.resolvePropertyPlaceholders(camelContext, verb);
-//                for (RestOperationParamDefinition param : verb.getParams()) {
-//                    
ProcessorDefinitionHelper.resolvePropertyPlaceholders(camelContext, param);
-//                }
-//            } catch (Exception e) {
-//                throw RuntimeCamelException.wrapRuntimeCamelException(e);
-//            }
-
             // add the binding
             RestBindingDefinition binding = new RestBindingDefinition();
             binding.setComponent(component);