This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 0453035 Camel-Consul: Fixed build
0453035 is described below
commit 0453035f4a1dfb3ddaf9b654e2358a26c62332c6
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jun 3 08:43:19 2020 +0200
Camel-Consul: Fixed build
---
.../HealthCheckRepositoryAutoConfiguration.java | 63 ----------------------
.../src/main/resources/META-INF/spring.factories | 3 +-
.../src/main/docs/spring-boot.adoc | 4 +-
docs/modules/ROOT/pages/spring-boot.adoc | 4 +-
4 files changed, 3 insertions(+), 71 deletions(-)
diff --git
a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/health/HealthCheckRepositoryAutoConfiguration.java
b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/health/HealthCheckRepositoryAutoConfiguration.java
deleted file mode 100644
index 9315b22..0000000
---
a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/health/HealthCheckRepositoryAutoConfiguration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.consul.springboot.health;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.camel.component.consul.health.ConsulHealthCheckRepository;
-import org.apache.camel.health.HealthCheckRepository;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
-
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(CamelAutoConfiguration.class)
-@ConditionalOnProperty(prefix =
"camel.component.consul.health.check.repository", value = "enabled")
-@EnableConfigurationProperties(HealthCheckRepositoryConfiguration.class)
-public class HealthCheckRepositoryAutoConfiguration {
- @Autowired
- private HealthCheckRepositoryConfiguration configuration;
-
- @Lazy
- @Bean
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- @ConditionalOnMissingBean(ConsulHealthCheckRepository.class)
- public HealthCheckRepository consulRepository() throws Exception {
- return new ConsulHealthCheckRepository.Builder()
- .configuration(configuration.asHealthCheckConfiguration())
- .checks(configuration.getChecks())
- .configurations(
- configuration.getConfigurations() != null
- ? configuration.getConfigurations().entrySet()
- .stream()
- .collect(
- Collectors.toMap(Map.Entry::getKey, e ->
e.getValue().asHealthCheckConfiguration())
- )
- : Collections.emptyMap())
- .build();
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
index a8142d0..801b6f5 100644
---
a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
+++
b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
@@ -18,5 +18,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.consul.springboot.ConsulComponentAutoConfiguration,\
org.apache.camel.component.consul.springboot.cloud.ConsulServiceDiscoveryAutoConfiguration,\
org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryAutoConfiguration,\
-
org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration,\
-
org.apache.camel.component.consul.springboot.health.HealthCheckRepositoryAutoConfiguration
\ No newline at end of file
+
org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
index c4ab649..cd25c38 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -92,7 +92,7 @@ When using spring-boot with Spring Boot make sure to use the
following Maven dep
----
-The component supports 128 options, which are listed below.
+The component supports 126 options, which are listed below.
@@ -154,8 +154,6 @@ The component supports 128 options, which are listed below.
| *camel.springboot.endpoint-lazy-start-producer* | Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed [...]
| *camel.springboot.endpoint-runtime-statistics-enabled* | Sets whether
endpoint runtime statistics is enabled (gathers runtime usage of each incoming
and outgoing endpoints). The default value is false. | false | Boolean
| *camel.springboot.file-configurations* | Directory to load additional
configuration files that contains configuration values that takes precedence
over any other configuration. This can be used to refer to files that may have
secret configuration that has been mounted on the file system for containers.
You must use either file: or classpath: as prefix to load from file system or
classpath. Then you can specify a pattern to load from sub directories and a
name pattern such as file:/var/ [...]
-| *camel.springboot.health-check-enabled* | | | Boolean
-| *camel.springboot.health-check-routes-enabled* | | | Boolean
| *camel.springboot.include-non-singletons* | Whether to include non-singleton
beans (prototypes) when scanning for RouteBuilder instances. By default only
singleton beans is included in the context scan. | false | Boolean
| *camel.springboot.inflight-repository-browse-enabled* | Sets whether the
inflight repository should allow browsing each inflight exchange. This is by
default disabled as there is a very slight performance overhead when enabled. |
false | Boolean
| *camel.springboot.java-routes-exclude-pattern* | Used for exclusive
filtering component scanning of RouteBuilder classes with @Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a specific package use:
com/mycompany/bar/* To exclude all routes [...]
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc
b/docs/modules/ROOT/pages/spring-boot.adoc
index c4ab649..cd25c38 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -92,7 +92,7 @@ When using spring-boot with Spring Boot make sure to use the
following Maven dep
----
-The component supports 128 options, which are listed below.
+The component supports 126 options, which are listed below.
@@ -154,8 +154,6 @@ The component supports 128 options, which are listed below.
| *camel.springboot.endpoint-lazy-start-producer* | Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed [...]
| *camel.springboot.endpoint-runtime-statistics-enabled* | Sets whether
endpoint runtime statistics is enabled (gathers runtime usage of each incoming
and outgoing endpoints). The default value is false. | false | Boolean
| *camel.springboot.file-configurations* | Directory to load additional
configuration files that contains configuration values that takes precedence
over any other configuration. This can be used to refer to files that may have
secret configuration that has been mounted on the file system for containers.
You must use either file: or classpath: as prefix to load from file system or
classpath. Then you can specify a pattern to load from sub directories and a
name pattern such as file:/var/ [...]
-| *camel.springboot.health-check-enabled* | | | Boolean
-| *camel.springboot.health-check-routes-enabled* | | | Boolean
| *camel.springboot.include-non-singletons* | Whether to include non-singleton
beans (prototypes) when scanning for RouteBuilder instances. By default only
singleton beans is included in the context scan. | false | Boolean
| *camel.springboot.inflight-repository-browse-enabled* | Sets whether the
inflight repository should allow browsing each inflight exchange. This is by
default disabled as there is a very slight performance overhead when enabled. |
false | Boolean
| *camel.springboot.java-routes-exclude-pattern* | Used for exclusive
filtering component scanning of RouteBuilder classes with @Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a specific package use:
com/mycompany/bar/* To exclude all routes [...]
