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-spring-boot.git
commit 170c2842b2671f42f06e1388e8b25bc92fcfc44b Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:25:34 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../camel-hystrix-starter/src/main/docs/hystrix-starter.adoc | 7 +++---- .../hystrix/springboot/HystrixMappingAutoConfiguration.java | 2 +- .../component/hystrix/springboot/HystrixMappingConfiguration.java | 4 ++-- .../hystrix/springboot/test/HystrixMappingDisablingTest.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/components-starter/camel-hystrix-starter/src/main/docs/hystrix-starter.adoc b/components-starter/camel-hystrix-starter/src/main/docs/hystrix-starter.adoc index 8c15bc1..903b005 100644 --- a/components-starter/camel-hystrix-starter/src/main/docs/hystrix-starter.adoc +++ b/components-starter/camel-hystrix-starter/src/main/docs/hystrix-starter.adoc @@ -24,9 +24,8 @@ The component supports 3 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.hystrix.mapping.enabled* | Enables the automatic mapping of the hystrics metric servlet into the Spring web context. | true | Boolean -| *camel.component.hystrix.mapping.path* | Endpoint for hystrix metrics servlet. | /hystrix.stream | String -| *camel.component.hystrix.mapping.servlet-name* | Name of the Hystrix metrics servlet. | HystrixEventStreamServlet | String +| *camel.hystrix.mapping.enabled* | Enables the automatic mapping of the hystrics metric servlet into the Spring web context. | true | Boolean +| *camel.hystrix.mapping.path* | Endpoint for hystrix metrics servlet. | /hystrix.stream | String +| *camel.hystrix.mapping.servlet-name* | Name of the Hystrix metrics servlet. | HystrixEventStreamServlet | String |=== - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java index 42b0a95..1338540 100644 --- a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java +++ b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * Servlet mapping auto-configuration. */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(name = "camel.component.hystrix.mapping.enabled", matchIfMissing = true) +@ConditionalOnProperty(name = "camel.hystrix.mapping.enabled", matchIfMissing = true) @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration") @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @ConditionalOnWebApplication diff --git a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingConfiguration.java b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingConfiguration.java index c70a71b..3f3a84e 100644 --- a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingConfiguration.java +++ b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingConfiguration.java @@ -19,9 +19,9 @@ package org.apache.camel.component.hystrix.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Mapping settings for the hystrix component. + * Mapping settings for the hystrix servlet. */ -@ConfigurationProperties(prefix = "camel.component.hystrix.mapping") +@ConfigurationProperties(prefix = "camel.hystrix.mapping") public class HystrixMappingConfiguration { /** diff --git a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingDisablingTest.java b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingDisablingTest.java index e4bb710..aa1114d 100644 --- a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingDisablingTest.java +++ b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingDisablingTest.java @@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner; @DirtiesContext @ContextConfiguration(classes = HystrixMappingDisablingTest.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { - "camel.component.hystrix.mapping.enabled=false" + "camel.hystrix.mapping.enabled=false" }) public class HystrixMappingDisablingTest {
