This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.20.x by this push:
new d318e0a CAMEL-12096: rest-dsl did not work configuring
hostNameResolver via spring-boot auto configuration.
d318e0a is described below
commit d318e0a8d5dd021fbe4fcb73161ed8c1f9528601
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 20 14:55:25 2017 +0100
CAMEL-12096: rest-dsl did not work configuring hostNameResolver via
spring-boot auto configuration.
---
.../camel/component/rest/RestApiEndpoint.java | 6 ++--
.../apache/camel/component/rest/RestEndpoint.java | 6 ++--
.../org/apache/camel/spi/RestConfiguration.java | 41 +++++++++++++++++++---
.../src/main/resources/application.properties | 3 +-
4 files changed, 45 insertions(+), 11 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index 1fe7299..2190c4c 100644
---
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -175,11 +175,11 @@ public class RestApiEndpoint extends DefaultEndpoint {
// if no explicit hostname set then resolve the hostname
if (ObjectHelper.isEmpty(host)) {
- if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.allLocalIp) {
+ if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.allLocalIp) {
host = "0.0.0.0";
- } else if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localHostName) {
+ } else if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localHostName) {
host = HostUtils.getLocalHostName();
- } else if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localIp) {
+ } else if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localIp) {
host = HostUtils.getLocalIp();
}
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 5518a10..3bafc85 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -471,11 +471,11 @@ public class RestEndpoint extends DefaultEndpoint {
// if no explicit hostname set then resolve the hostname
if (ObjectHelper.isEmpty(host)) {
- if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.allLocalIp) {
+ if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.allLocalIp) {
host = "0.0.0.0";
- } else if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localHostName) {
+ } else if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localHostName) {
host = HostUtils.getLocalHostName();
- } else if (config.getRestHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localIp) {
+ } else if (config.getHostNameResolver() ==
RestConfiguration.RestHostNameResolver.localIp) {
host = HostUtils.getLocalIp();
}
}
diff --git
a/camel-core/src/main/java/org/apache/camel/spi/RestConfiguration.java
b/camel-core/src/main/java/org/apache/camel/spi/RestConfiguration.java
index 6f85d95..b482668 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/RestConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/RestConfiguration.java
@@ -51,7 +51,7 @@ public class RestConfiguration {
private String apiContextIdPattern;
private boolean apiContextListing;
private boolean apiVendorExtension;
- private RestHostNameResolver restHostNameResolver =
RestHostNameResolver.allLocalIp;
+ private RestHostNameResolver hostNameResolver =
RestHostNameResolver.allLocalIp;
private RestBindingMode bindingMode = RestBindingMode.off;
private boolean skipBindingOnErrorCode = true;
private boolean enableCORS;
@@ -304,27 +304,60 @@ public class RestConfiguration {
* Gets the resolver to use for resolving hostname
*
* @return the resolver
+ * @deprecated use getHostNameResolver
*/
+ @Deprecated
public RestHostNameResolver getRestHostNameResolver() {
- return restHostNameResolver;
+ return getHostNameResolver();
}
/**
* Sets the resolver to use for resolving hostname
*
* @param restHostNameResolver the resolver
+ * @deprecated use setHostNameResolver
*/
+ @Deprecated
public void setRestHostNameResolver(RestHostNameResolver
restHostNameResolver) {
- this.restHostNameResolver = restHostNameResolver;
+ setHostNameResolver(restHostNameResolver);
}
/**
* Sets the resolver to use for resolving hostname
*
* @param restHostNameResolver the resolver
+ * @deprecated use setHostNameResolver
*/
+ @Deprecated
public void setRestHostNameResolver(String restHostNameResolver) {
- this.restHostNameResolver =
RestHostNameResolver.valueOf(restHostNameResolver);
+ settHostNameResolver(restHostNameResolver);
+ }
+
+ /**
+ * Gets the resolver to use for resolving hostname
+ *
+ * @return the resolver
+ */
+ public RestHostNameResolver getHostNameResolver() {
+ return hostNameResolver;
+ }
+
+ /**
+ * Sets the resolver to use for resolving hostname
+ *
+ * @param hostNameResolver the resolver
+ */
+ public void setHostNameResolver(RestHostNameResolver hostNameResolver) {
+ this.hostNameResolver = hostNameResolver;
+ }
+
+ /**
+ * Sets the resolver to use for resolving hostname
+ *
+ * @param hostNameResolver the resolver
+ */
+ public void settHostNameResolver(String hostNameResolver) {
+ this.hostNameResolver = RestHostNameResolver.valueOf(hostNameResolver);
}
/**
diff --git
a/examples/camel-example-spring-boot-geocoder/src/main/resources/application.properties
b/examples/camel-example-spring-boot-geocoder/src/main/resources/application.properties
index bb504db..13fc86e 100644
---
a/examples/camel-example-spring-boot-geocoder/src/main/resources/application.properties
+++
b/examples/camel-example-spring-boot-geocoder/src/main/resources/application.properties
@@ -23,7 +23,8 @@ camel.rest.component=servlet
# host and port for the rest service
camel.rest.port=8080
-camel.rest.host=localhost
+# resolve the hostname to be localhost
+camel.rest.host-name-resolver=localhostname
camel.rest.context-path=/camel
# turn on cors on the rest service
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
