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
The following commit(s) were added to refs/heads/master by this push:
new c6f1bab CAMEL-14492: Regen camel-etcd starter, first delete the old.
c6f1bab is described below
commit c6f1babfa241e4e82049760dae11bc2098e69659
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Feb 12 11:41:52 2020 +0100
CAMEL-14492: Regen camel-etcd starter, first delete the old.
---
components-starter/camel-etcd-starter/pom.xml | 53 ----
.../src/main/docs/etcd-starter.adoc | 43 ---
.../springboot/EtcdComponentAutoConfiguration.java | 128 ---------
.../springboot/EtcdComponentConfiguration.java | 291 ---------------------
.../cloud/EtcdCloudAutoConfiguration.java | 108 --------
.../src/main/resources/META-INF/LICENSE.txt | 203 --------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../src/main/resources/META-INF/spring.factories | 19 --
.../src/main/resources/META-INF/spring.provides | 17 --
.../springboot/cloud/EtcdServiceDiscoveryTest.java | 63 -----
.../src/test/resources/application.properties | 18 --
.../src/test/resources/logback.xml | 41 ---
components-starter/pom.xml | 1 -
tooling/camel-spring-boot-dependencies/pom.xml | 5 -
14 files changed, 1001 deletions(-)
diff --git a/components-starter/camel-etcd-starter/pom.xml
b/components-starter/camel-etcd-starter/pom.xml
deleted file mode 100644
index f3e8013..0000000
--- a/components-starter/camel-etcd-starter/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-etcd-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Etcd</name>
- <description>Spring-Boot Starter for Camel Etcd support</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-etcd</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git
a/components-starter/camel-etcd-starter/src/main/docs/etcd-starter.adoc
b/components-starter/camel-etcd-starter/src/main/docs/etcd-starter.adoc
deleted file mode 100644
index 1be089d..0000000
--- a/components-starter/camel-etcd-starter/src/main/docs/etcd-starter.adoc
+++ /dev/null
@@ -1,43 +0,0 @@
-== etcd - Spring Boot Auto-Configuration
-
-When using etcd with Spring Boot make sure to use the following Maven
dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-etcd-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 19 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.etcd.basic-property-binding* | Whether the component should
use basic property binding (Camel 2.x) or the newer property binding with
additional capabilities | false | Boolean
-| *camel.component.etcd.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
-| *camel.component.etcd.configuration.from-index* | The index to watch from |
0 | Long
-| *camel.component.etcd.configuration.password* | The password to use for
basic authentication. | | String
-| *camel.component.etcd.configuration.recursive* | To apply an action
recursively. | false | Boolean
-| *camel.component.etcd.configuration.send-empty-exchange-on-timeout* | To
send an empty message in case of timeout watching for a key. | false | Boolean
-| *camel.component.etcd.configuration.service-path* | The path to look for for
service discovery | /services/ | String
-| *camel.component.etcd.configuration.ssl-context-parameters* | To configure
security using SSLContextParameters. | | SSLContextParameters
-| *camel.component.etcd.configuration.time-to-live* | To set the lifespan of a
key in milliseconds. | | Integer
-| *camel.component.etcd.configuration.timeout* | To set the maximum time an
action could take to complete. | | Long
-| *camel.component.etcd.configuration.uris* | To set the URIs the client
connects. | http://localhost:2379,http://localhost:4001 | String
-| *camel.component.etcd.configuration.user-name* | The user name to use for
basic authentication. | | String
-| *camel.component.etcd.enabled* | Whether to enable auto configuration of the
etcd component. This is enabled by default. | | Boolean
-| *camel.component.etcd.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 then [...]
-| *camel.component.etcd.password* | The password to use for basic
authentication. | | String
-| *camel.component.etcd.ssl-context-parameters* | To configure security using
SSLContextParameters. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | | String
-| *camel.component.etcd.uris* | To set the URIs the client connects. | |
String
-| *camel.component.etcd.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
-| *camel.component.etcd.user-name* | The user name to use for basic
authentication. | | String
-|===
-
diff --git
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentAutoConfiguration.java
b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentAutoConfiguration.java
deleted file mode 100644
index afd4952..0000000
---
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentAutoConfiguration.java
+++ /dev/null
@@ -1,128 +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.etcd.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.etcd.EtcdComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@Configuration(proxyBeanMethods = false)
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
- EtcdComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
- EtcdComponentConfiguration.class})
-public class EtcdComponentAutoConfiguration {
-
- private static final Logger LOGGER = LoggerFactory
- .getLogger(EtcdComponentAutoConfiguration.class);
- @Autowired
- private ApplicationContext applicationContext;
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private EtcdComponentConfiguration configuration;
- @Autowired(required = false)
- private List<ComponentCustomizer<EtcdComponent>> customizers;
-
- static class GroupConditions extends GroupCondition {
- public GroupConditions() {
- super("camel.component", "camel.component.etcd");
- }
- }
-
- @Lazy
- @Bean(name = "etcd-component")
- @ConditionalOnMissingBean(EtcdComponent.class)
- public EtcdComponent configureEtcdComponent() throws Exception {
- EtcdComponent component = new EtcdComponent();
- component.setCamelContext(camelContext);
- Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
- for (Map.Entry<String, Object> entry : parameters.entrySet()) {
- Object value = entry.getValue();
- Class<?> paramClass = value.getClass();
- if (paramClass.getName().endsWith("NestedConfiguration")) {
- Class nestedClass = null;
- try {
- nestedClass = (Class) paramClass.getDeclaredField(
- "CAMEL_NESTED_CLASS").get(null);
- HashMap<String, Object> nestedParameters = new HashMap<>();
- IntrospectionSupport.getProperties(value, nestedParameters,
- null, false);
- Object nestedProperty = nestedClass.newInstance();
- CamelPropertiesHelper.setCamelProperties(camelContext,
- nestedProperty, nestedParameters, false);
- entry.setValue(nestedProperty);
- } catch (NoSuchFieldException e) {
- }
- }
- }
- CamelPropertiesHelper.setCamelProperties(camelContext, component,
- parameters, false);
- if (ObjectHelper.isNotEmpty(customizers)) {
- for (ComponentCustomizer<EtcdComponent> customizer : customizers) {
- boolean useCustomizer = (customizer instanceof HasId)
- ? HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.etcd.customizer",
- ((HasId) customizer).getId())
- : HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.etcd.customizer");
- if (useCustomizer) {
- LOGGER.debug("Configure component {}, with customizer {}",
- component, customizer);
- customizer.customize(component);
- }
- }
- }
- return component;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
deleted file mode 100644
index dd7c683..0000000
---
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
+++ /dev/null
@@ -1,291 +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.etcd.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * The camel etcd component allows you to work with Etcd, a distributed
reliable
- * key-value store.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.etcd")
-public class EtcdComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the etcd component. This is
- * enabled by default.
- */
- private Boolean enabled;
- /**
- * The password to use for basic authentication.
- */
- private String password;
- /**
- * To configure security using SSLContextParameters. The option is a
- * org.apache.camel.support.jsse.SSLContextParameters type.
- */
- private String sslContextParameters;
- /**
- * To set the URIs the client connects.
- */
- private String uris;
- /**
- * The user name to use for basic authentication.
- */
- private String userName;
- /**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions occurred while the consumer is trying to
pickup
- * incoming messages, or the likes, will now be processed as a message and
- * handled by the routing Error Handler. By default the consumer will use
- * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
- * will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
- * 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 then creating and starting the producer may take a little time
- * and prolong the total processing time of the processing.
- */
- private Boolean lazyStartProducer = false;
- /**
- * Whether the component should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities
- */
- private Boolean basicPropertyBinding = false;
- /**
- * Sets the common configuration shared among endpoints
- */
- private EtcdConfigurationNestedConfiguration configuration;
- /**
- * Enable usage of global SSL context parameters.
- */
- private Boolean useGlobalSslContextParameters = false;
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getSslContextParameters() {
- return sslContextParameters;
- }
-
- public void setSslContextParameters(String sslContextParameters) {
- this.sslContextParameters = sslContextParameters;
- }
-
- public String getUris() {
- return uris;
- }
-
- public void setUris(String uris) {
- this.uris = uris;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
- public Boolean getLazyStartProducer() {
- return lazyStartProducer;
- }
-
- public void setLazyStartProducer(Boolean lazyStartProducer) {
- this.lazyStartProducer = lazyStartProducer;
- }
-
- public Boolean getBasicPropertyBinding() {
- return basicPropertyBinding;
- }
-
- public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
- this.basicPropertyBinding = basicPropertyBinding;
- }
-
- public EtcdConfigurationNestedConfiguration getConfiguration() {
- return configuration;
- }
-
- public void setConfiguration(
- EtcdConfigurationNestedConfiguration configuration) {
- this.configuration = configuration;
- }
-
- public Boolean getUseGlobalSslContextParameters() {
- return useGlobalSslContextParameters;
- }
-
- public void setUseGlobalSslContextParameters(
- Boolean useGlobalSslContextParameters) {
- this.useGlobalSslContextParameters = useGlobalSslContextParameters;
- }
-
- public static class EtcdConfigurationNestedConfiguration {
- public static final Class CAMEL_NESTED_CLASS =
org.apache.camel.component.etcd.EtcdConfiguration.class;
- /**
- * The index to watch from
- */
- private Long fromIndex = 0L;
- /**
- * The password to use for basic authentication.
- */
- private String password;
- /**
- * To apply an action recursively.
- */
- private Boolean recursive = false;
- /**
- * To send an empty message in case of timeout watching for a key.
- */
- private Boolean sendEmptyExchangeOnTimeout = false;
- /**
- * The path to look for for service discovery
- */
- private String servicePath = "/services/";
- /**
- * To configure security using SSLContextParameters.
- */
- private SSLContextParameters sslContextParameters;
- /**
- * To set the lifespan of a key in milliseconds.
- */
- private Integer timeToLive;
- /**
- * To set the maximum time an action could take to complete.
- */
- private Long timeout;
- /**
- * To set the URIs the client connects.
- */
- private String uris = "http://localhost:2379,http://localhost:4001";;
- /**
- * The user name to use for basic authentication.
- */
- private String userName;
-
- public Long getFromIndex() {
- return fromIndex;
- }
-
- public void setFromIndex(Long fromIndex) {
- this.fromIndex = fromIndex;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Boolean getRecursive() {
- return recursive;
- }
-
- public void setRecursive(Boolean recursive) {
- this.recursive = recursive;
- }
-
- public Boolean getSendEmptyExchangeOnTimeout() {
- return sendEmptyExchangeOnTimeout;
- }
-
- public void setSendEmptyExchangeOnTimeout(
- Boolean sendEmptyExchangeOnTimeout) {
- this.sendEmptyExchangeOnTimeout = sendEmptyExchangeOnTimeout;
- }
-
- public String getServicePath() {
- return servicePath;
- }
-
- public void setServicePath(String servicePath) {
- this.servicePath = servicePath;
- }
-
- public SSLContextParameters getSslContextParameters() {
- return sslContextParameters;
- }
-
- public void setSslContextParameters(
- SSLContextParameters sslContextParameters) {
- this.sslContextParameters = sslContextParameters;
- }
-
- public Integer getTimeToLive() {
- return timeToLive;
- }
-
- public void setTimeToLive(Integer timeToLive) {
- this.timeToLive = timeToLive;
- }
-
- public Long getTimeout() {
- return timeout;
- }
-
- public void setTimeout(Long timeout) {
- this.timeout = timeout;
- }
-
- public String getUris() {
- return uris;
- }
-
- public void setUris(String uris) {
- this.uris = uris;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/cloud/EtcdCloudAutoConfiguration.java
b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/cloud/EtcdCloudAutoConfiguration.java
deleted file mode 100644
index 2a40921..0000000
---
a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/cloud/EtcdCloudAutoConfiguration.java
+++ /dev/null
@@ -1,108 +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.etcd.springboot.cloud;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.component.etcd.cloud.EtcdServiceDiscoveryFactory;
-import
org.apache.camel.model.cloud.springboot.EtcdServiceCallServiceDiscoveryConfigurationCommon;
-import
org.apache.camel.model.cloud.springboot.EtcdServiceCallServiceDiscoveryConfigurationProperties;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.support.IntrospectionSupport;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelAutoConfiguration.class)
-@Conditional(EtcdCloudAutoConfiguration.Condition.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(EtcdServiceCallServiceDiscoveryConfigurationProperties.class)
-public class EtcdCloudAutoConfiguration {
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private EtcdServiceCallServiceDiscoveryConfigurationProperties
configuration;
- @Autowired
- private ConfigurableBeanFactory beanFactory;
-
- @Lazy
- @Bean(name = "etcd-service-discovery")
- @ConditionalOnClass(CamelContext.class)
- public ServiceDiscovery configureServiceDiscoveryFactory() throws
Exception {
- EtcdServiceDiscoveryFactory factory = new
EtcdServiceDiscoveryFactory();
-
- IntrospectionSupport.setProperties(
- camelContext,
- camelContext.getTypeConverter(),
- factory,
- IntrospectionSupport.getNonNullProperties(configuration));
-
- return factory.newInstance(camelContext);
- }
-
- @PostConstruct
- public void postConstruct() {
- if (beanFactory != null) {
- Map<String, Object> parameters = new HashMap<>();
-
- for (Map.Entry<String,
EtcdServiceCallServiceDiscoveryConfigurationCommon> entry :
configuration.getConfigurations().entrySet()) {
- // clean up params
- parameters.clear();
-
- // The instance factory
- EtcdServiceDiscoveryFactory factory = new
EtcdServiceDiscoveryFactory();
-
- try {
- IntrospectionSupport.getProperties(entry.getValue(),
parameters, null, false);
- IntrospectionSupport.setProperties(camelContext,
camelContext.getTypeConverter(), factory, parameters);
-
- beanFactory.registerSingleton(entry.getKey(),
factory.newInstance(camelContext));
- } catch (Exception e) {
- throw new BeanCreationException(entry.getKey(),
e.getMessage(), e);
- }
- }
- }
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super(
- "camel.cloud.etcd",
- "camel.cloud.etcd.service-discovery"
- );
- }
- }
-}
diff --git
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-etcd-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
---
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/NOTICE.txt
b/components-starter/camel-etcd-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
---
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 055f4f8..0000000
---
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.etcd.springboot.EtcdComponentAutoConfiguration,\
-org.apache.camel.component.etcd.springboot.cloud.EtcdCloudAutoConfiguration
diff --git
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.provides
b/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 1574134..0000000
---
a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1,17 +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.
-## ---------------------------------------------------------------------------
-provides: camel-etcd
diff --git
a/components-starter/camel-etcd-starter/src/test/java/org/apache/camel/component/etcd/springboot/cloud/EtcdServiceDiscoveryTest.java
b/components-starter/camel-etcd-starter/src/test/java/org/apache/camel/component/etcd/springboot/cloud/EtcdServiceDiscoveryTest.java
deleted file mode 100644
index 3aa1921..0000000
---
a/components-starter/camel-etcd-starter/src/test/java/org/apache/camel/component/etcd/springboot/cloud/EtcdServiceDiscoveryTest.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.etcd.springboot.cloud;
-
-import org.apache.camel.cloud.ServiceDiscovery;
-import
org.apache.camel.model.cloud.springboot.EtcdServiceCallServiceDiscoveryConfigurationProperties;
-import org.junit.Test;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class EtcdServiceDiscoveryTest {
- @Test
- public void testServiceDiscoveryDisabled() {
- new ApplicationContextRunner()
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cloud.etcd.service-discovery.enabled=false")
- .run(
- context -> {
-
assertThat(context).doesNotHaveBean(EtcdServiceCallServiceDiscoveryConfigurationProperties.class);
-
assertThat(context).getBeans(ServiceDiscovery.class).doesNotContainKeys("etcd-service-discovery");
- }
- );
- }
-
- @Test
- public void testServiceDiscoveryEnabled() {
- new ApplicationContextRunner()
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cloud.etcd.service-discovery.enabled=true")
- .run(
- context -> {
-
assertThat(context).hasSingleBean(EtcdServiceCallServiceDiscoveryConfigurationProperties.class);
-
assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("etcd-service-discovery");
- }
- );
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git
a/components-starter/camel-etcd-starter/src/test/resources/application.properties
b/components-starter/camel-etcd-starter/src/test/resources/application.properties
deleted file mode 100644
index 71e1678..0000000
---
a/components-starter/camel-etcd-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-spring.main.banner-mode=off
diff --git
a/components-starter/camel-etcd-starter/src/test/resources/logback.xml
b/components-starter/camel-etcd-starter/src/test/resources/logback.xml
deleted file mode 100644
index f4c7f80..0000000
--- a/components-starter/camel-etcd-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- <file>target/camel-etcd-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 678f105..7e355b0 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -204,7 +204,6 @@
<module>camel-elasticsearch-rest-starter</module>
<module>camel-elsql-starter</module>
<module>camel-elytron-starter</module>
- <module>camel-etcd-starter</module>
<module>camel-exec-starter</module>
<module>camel-facebook-starter</module>
<module>camel-fastjson-starter</module>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index ad91a28..351cf71 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -738,11 +738,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-etcd-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-exec-starter</artifactId>
<version>${project.version}</version>
</dependency>
