This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6ad733a68f2914754896f1a5ae3177f00a7d90be Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Apr 2 15:54:37 2020 +0200 Fix quarkus rest extension --- .../camel/quarkus/component/rest/QuarkusRestComponent.java | 3 +-- .../apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestComponent.java b/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestComponent.java index 13925b9..86c3316 100644 --- a/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestComponent.java +++ b/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestComponent.java @@ -42,8 +42,7 @@ public class QuarkusRestComponent extends RestComponent { RestConfiguration config = new RestConfiguration(); mergeConfigurations(getCamelContext(), config, findGlobalRestConfiguration()); - mergeConfigurations(getCamelContext(), config, getCamelContext().getRestConfiguration(cname, false)); - mergeConfigurations(getCamelContext(), config, getCamelContext().getRestConfiguration(pname, false)); + mergeConfigurations(getCamelContext(), config, getCamelContext().getRestConfiguration()); // if no explicit host was given, then fallback and use default configured host String h = getAndRemoveOrResolveReferenceParameter(parameters, "host", String.class, getHost()); diff --git a/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java b/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java index 6c1281c..94f5aa0 100644 --- a/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java +++ b/extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java @@ -29,6 +29,7 @@ import org.apache.camel.component.rest.RestEndpoint; import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestProducerFactory; +import org.apache.camel.support.CamelContextHelper; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -172,13 +173,7 @@ public class QuarkusRestEndpoint extends RestEndpoint { if (factory != null) { LOG.debug("Using RestProducerFactory: {}", factory); - RestConfiguration config = getCamelContext().getRestConfiguration(pname, false); - if (config == null) { - config = getCamelContext().getRestConfiguration(); - } - if (config == null) { - config = getCamelContext().getRestConfiguration(pname, true); - } + RestConfiguration config = CamelContextHelper.getRestConfiguration(getCamelContext(), pname); Producer producer; if (apiDocFactory != null) {
