Repository: camel Updated Branches: refs/heads/master a85bc0054 -> 5dafecf98
CAMEL-10868: Create camel-spring-cloud-netflix component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dafecf9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dafecf9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dafecf9 Branch: refs/heads/master Commit: 5dafecf98243e355773cae053b585169c6595bfe Parents: a85bc00 Author: lburgazzoli <[email protected]> Authored: Tue Feb 21 16:00:48 2017 +0100 Committer: lburgazzoli <[email protected]> Committed: Wed Feb 22 09:49:25 2017 +0100 ---------------------------------------------------------------------- apache-camel/pom.xml | 9 + .../src/main/descriptors/common-bin.xml | 2 + .../ribbon/cloud/RibbonServiceDefinition.java | 24 ++- components/camel-spring-cloud-netflix/pom.xml | 136 +++++++++++++ .../src/main/docs/spring-cloud-netflix.adoc | 40 ++++ .../CamelCloudNetflixAutoConfiguration.java | 46 +++++ ...amelCloudNetflixRibbonAutoConfiguration.java | 49 +++++ ...elCloudNetflixRibbonClientConfiguration.java | 47 +++++ .../netflix/CamelCloudNetflixServerList.java | 104 ++++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../main/resources/META-INF/spring.factories | 20 ++ ...melCloudNetflixServiceCallConfiguration.java | 48 +++++ .../CamelCloudNetflixServiceCallTest.java | 61 ++++++ .../src/test/resources/logback.xml | 39 ++++ ...CamelCloudLoadBalancerAutoConfiguration.java | 2 - .../cloud/CamelCloudServiceDiscovery.java | 1 - ...lCloudServiceDiscoveryAutoConfiguration.java | 6 +- .../spring/cloud/CamelCloudServiceFilter.java | 36 ++++ ...amelCloudServiceFilterAutoConfiguration.java | 14 +- .../main/resources/META-INF/spring.factories | 3 +- components/pom.xml | 1 + components/readme.adoc | 4 +- docs/user-manual/en/SUMMARY.md | 1 + parent/pom.xml | 10 + .../camel-spring-cloud-netflix-starter/pom.xml | 59 ++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../src/main/resources/META-INF/spring.provides | 18 ++ .../spring-boot/components-starter/pom.xml | 1 + .../camel-spring-boot-dependencies/pom.xml | 15 ++ 31 files changed, 1206 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 3f6b6a9..75a0cf5 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -882,6 +882,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-dm</artifactId> </dependency> <dependency> @@ -2020,6 +2024,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix-starter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-dm-starter</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 7550c86..e7f1b2b 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -229,6 +229,8 @@ <include>org.apache.camel:camel-spring-boot-starter</include> <include>org.apache.camel:camel-spring-cloud</include> <include>org.apache.camel:camel-spring-cloud-starter</include> + <include>org.apache.camel:camel-spring-cloud-netflix</include> + <include>org.apache.camel:camel-spring-cloud-netflix-starter</include> <include>org.apache.camel:camel-spring-dm</include> <include>org.apache.camel:camel-spring-integration</include> <include>org.apache.camel:camel-spring-javaconfig</include> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceDefinition.java ---------------------------------------------------------------------- diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceDefinition.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceDefinition.java index d9d5772..a7415ee 100644 --- a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceDefinition.java +++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/cloud/RibbonServiceDefinition.java @@ -30,17 +30,37 @@ import org.apache.camel.util.ObjectHelper; public class RibbonServiceDefinition extends Server implements ServiceDefinition { private String name; private ServiceHealth health; + private Map<String, String> metaData; public RibbonServiceDefinition(String name, String host, int port) { - this(name, host, port, DefaultServiceHealth.INSTANCE); + this(name, host, port, null, DefaultServiceHealth.INSTANCE); } public RibbonServiceDefinition(String name, String host, int port, ServiceHealth healt) { + this(name, host, port, null, healt); + } + + public RibbonServiceDefinition(String name, String host, int port, Map<String, String> meta) { + this(name, host, port, meta, DefaultServiceHealth.INSTANCE); + } + + public RibbonServiceDefinition(String name, String host, int port, Map<String, String> meta, ServiceHealth healt) { super(host, port); this.name = name; + this.metaData = meta; this.health = healt; } + public RibbonServiceDefinition(ServiceDefinition definition) { + this( + definition.getName(), + definition.getHost(), + definition.getPort(), + definition.getMetadata(), + definition.getHealth() + ); + } + @Override public String getName() { return name; @@ -63,7 +83,7 @@ public class RibbonServiceDefinition extends Server implements ServiceDefinition @Override public Map<String, String> getMetadata() { - Map<String, String> meta = new HashMap<>(); + Map<String, String> meta = metaData != null ? new HashMap<>(metaData) : new HashMap<>(); ObjectHelper.ifNotEmpty(super.getId(), val -> meta.put("id", val)); ObjectHelper.ifNotEmpty(super.getZone(), val -> meta.put("zone", val)); ObjectHelper.ifNotEmpty(super.isAlive(), val -> meta.put("is_alive", Boolean.toString(val))); http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml new file mode 100644 index 0000000..7dcf92d --- /dev/null +++ b/components/camel-spring-cloud-netflix/pom.xml @@ -0,0 +1,136 @@ +<?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/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.19.0-SNAPSHOT</version> + </parent> + + <name>Camel :: Spring Cloud Netflix</name> + <artifactId>camel-spring-cloud-netflix</artifactId> + <description>Camel Cloud integration with Spring Cloud Netflix</description> + + <properties> + <!-- use by camel-catalog --> + <firstVersion>2.19.0</firstVersion> + <label>spring,microservice</label> + + <camel.osgi.export.pkg/> + </properties> + + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-autoconfigure</artifactId> + <version>${spring-boot-version}</version> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-netflix-core</artifactId> + <version>${spring-cloud-netflix-version}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + <version>${spring-boot-version}</version> + </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-ribbon</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud</artifactId> + </dependency> + + <!-- Testing dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-http</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jetty</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>${spring-boot-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <version>${spring-boot-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-ribbon</artifactId> + <version>${spring-cloud-netflix-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring-boot-version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + </configuration> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc new file mode 100644 index 0000000..61c796f --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc @@ -0,0 +1,40 @@ +[[SpringCloud-SpringCloud]] +Spring Cloud +~~~~~~~~~~~ + +*Available as of Camel 2.19* + +Spring Cloud component + +Maven users will need to add the following dependency to their `pom.xml` +in order to use this component: + +[source,xml] +------------------------------------------------------------------------------------------------ +<dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud</artifactId> + <version>${camel.version}</version> <!-- use the same version as your Camel core version --> +</dependency> +------------------------------------------------------------------------------------------------ + +`camel-spring-cloud` jar comes with the `spring.factories` file, so as +soon as you add that dependency into your classpath, Spring Boot will +automatically auto-configure Camel for you. + +[[SpringCloud-CamelSpringCloudStarter]] +Camel Spring Cloud Starter +^^^^^^^^^^^^^^^^^^^^^^^^^ + +*Available as of Camel 2.19* + +To use the starter, add the following to your spring boot pom.xml file: + +[source,xml] +------------------------------------------------------ +<dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-starter</artifactId> + <version>${camel.version}</version> <!-- use the same version as your Camel core version --> +</dependency> +------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java new file mode 100644 index 0000000..3183597 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java @@ -0,0 +1,46 @@ +/** + * 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.spring.cloud.netflix; + +import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.spring.boot.util.GroupCondition; +import org.apache.camel.spring.cloud.CamelCloudAutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; +import org.springframework.context.annotation.Conditional; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnBean(CamelAutoConfiguration.class) +@AutoConfigureAfter({ CamelAutoConfiguration.class, CamelCloudAutoConfiguration.class, RibbonAutoConfiguration.class }) +@Conditional(CamelCloudNetflixAutoConfiguration.Condition.class) +public class CamelCloudNetflixAutoConfiguration { + + // ******************************* + // Condition + // ******************************* + + public static class Condition extends GroupCondition { + public Condition() { + super( + "camel.cloud", + "camel.cloud.netflix" + ); + } + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonAutoConfiguration.java b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonAutoConfiguration.java new file mode 100644 index 0000000..5631507 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonAutoConfiguration.java @@ -0,0 +1,49 @@ +/** + * 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.spring.cloud.netflix; + +import org.apache.camel.spring.boot.util.GroupCondition; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; +import org.springframework.cloud.netflix.ribbon.RibbonClients; +import org.springframework.cloud.netflix.ribbon.SpringClientFactory; +import org.springframework.context.annotation.Conditional; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties +@ConditionalOnBean(SpringClientFactory.class) +@Conditional(CamelCloudNetflixRibbonAutoConfiguration.Condition.class) +@AutoConfigureAfter({ CamelCloudNetflixAutoConfiguration.class, RibbonAutoConfiguration.class }) +@RibbonClients(defaultConfiguration = CamelCloudNetflixRibbonClientConfiguration.class) +public class CamelCloudNetflixRibbonAutoConfiguration { + + // ******************************* + // Condition + // ******************************* + + public static class Condition extends GroupCondition { + public Condition() { + super( + "camel.cloud.netflix", + "camel.cloud.netflix.ribbon" + ); + } + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonClientConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonClientConfiguration.java b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonClientConfiguration.java new file mode 100644 index 0000000..20c4014 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixRibbonClientConfiguration.java @@ -0,0 +1,47 @@ +/** + * 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.spring.cloud.netflix; + +import com.netflix.client.config.IClientConfig; +import com.netflix.loadbalancer.ServerList; +import org.apache.camel.spring.cloud.CamelCloudServiceDiscovery; +import org.apache.camel.spring.cloud.CamelCloudServiceFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class CamelCloudNetflixRibbonClientConfiguration { + @Autowired + private IClientConfig clientConfig; + @Autowired + private CamelCloudServiceDiscovery serviceDiscovery; + @Autowired + private CamelCloudServiceFilter serviceFilter; + + @Bean + @ConditionalOnMissingBean + public ServerList<?> ribbonServerList() { + CamelCloudNetflixServerList serverList = new CamelCloudNetflixServerList(); + serverList.setServiceDiscovery(serviceDiscovery); + serverList.setServiceFilter(serviceFilter); + serverList.initWithNiwsConfig(clientConfig); + + return serverList; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java new file mode 100644 index 0000000..2266bb4 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java @@ -0,0 +1,104 @@ +/** + * 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.spring.cloud.netflix; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import com.netflix.client.config.IClientConfig; +import com.netflix.loadbalancer.AbstractServerList; +import org.apache.camel.cloud.ServiceDefinition; +import org.apache.camel.cloud.ServiceDiscovery; +import org.apache.camel.cloud.ServiceFilter; +import org.apache.camel.component.ribbon.cloud.RibbonServiceDefinition; + +public class CamelCloudNetflixServerList extends AbstractServerList<RibbonServiceDefinition> { + private ServiceDiscovery serviceDiscovery; + private ServiceFilter serviceFilter; + private String serviceId; + + public CamelCloudNetflixServerList() { + this(null, list -> list); + } + + public CamelCloudNetflixServerList(ServiceDiscovery serviceDiscovery, ServiceFilter serviceFilter) { + this.serviceDiscovery = serviceDiscovery; + this.serviceFilter = serviceFilter; + } + + public ServiceDiscovery getServiceDiscovery() { + return serviceDiscovery; + } + + public void setServiceDiscovery(ServiceDiscovery serviceDiscovery) { + this.serviceDiscovery = serviceDiscovery; + } + + public ServiceFilter getServiceFilter() { + return serviceFilter; + } + + public void setServiceFilter(ServiceFilter serviceFilter) { + this.serviceFilter = serviceFilter; + } + + @Override + public void initWithNiwsConfig(IClientConfig clientConfig) { + this.serviceId = clientConfig.getClientName(); + } + + @Override + public List<RibbonServiceDefinition> getInitialListOfServers() { + if (serviceId == null) { + return Collections.emptyList(); + } + + List<ServiceDefinition> services = serviceDiscovery.getInitialListOfServices(serviceId); + if (serviceFilter != null) { + services = serviceFilter.apply(services); + } + + return convert(services); + } + + @Override + public List<RibbonServiceDefinition> getUpdatedListOfServers() { + if (serviceId == null) { + return Collections.emptyList(); + } + + List<ServiceDefinition> services = serviceDiscovery.getUpdatedListOfServices(serviceId); + if (serviceFilter != null) { + services = serviceFilter.apply(services); + } + + return convert(services); + } + + // ************************************************************************* + // Helpers + // ************************************************************************* + + private List<RibbonServiceDefinition> convert(List<? extends ServiceDefinition> definitions) { + if (definitions.isEmpty()) { + return Collections.emptyList(); + } + + return definitions.stream().map(RibbonServiceDefinition::new).collect(Collectors.toList()); + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/resources/META-INF/LICENSE.txt b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/resources/META-INF/NOTICE.txt b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == 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. http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..1926ceb --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories @@ -0,0 +1,20 @@ +# +# 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.spring.cloud.netflix.CamelCloudNetflixAutoConfiguration,\ +org.apache.camel.spring.cloud.netflix.CamelCloudNetflixRibbonAutoConfiguration \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallConfiguration.java b/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallConfiguration.java new file mode 100644 index 0000000..2854d3c --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallConfiguration.java @@ -0,0 +1,48 @@ +/** + * 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.spring.cloud.netflix; + +import org.apache.camel.builder.RouteBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class CamelCloudNetflixServiceCallConfiguration { + @Bean + public RouteBuilder myRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start") + .serviceCall() + .name("custom-svc-list/hello"); + + from("jetty:http://localhost:9090/hello";) + .transform() + .constant("9090"); + from("jetty:http://localhost:9091/hello";) + .transform() + .constant("9091"); + from("jetty:http://localhost:9092/hello";) + .transform() + .constant("9092"); + } + }; + } +} + + http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallTest.java b/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallTest.java new file mode 100644 index 0000000..e007e51 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallTest.java @@ -0,0 +1,61 @@ +/** + * 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.spring.cloud.netflix; + +import org.apache.camel.ProducerTemplate; +import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +@DirtiesContext +@RunWith(SpringRunner.class) +@SpringBootApplication +@SpringBootTest( + classes = { + CamelAutoConfiguration.class, + CamelCloudNetflixAutoConfiguration.class, + CamelCloudNetflixServiceCallConfiguration.class, + RibbonClientConfiguration.class, + }, + properties = { + "camel.cloud.load-balancer.enabled=true", + "camel.cloud.service-discovery.services[custom-svc-list]=localhost:9090,localhost:9091,localhost:9092", + "camel.cloud.service-filter.blacklist[custom-svc-list]=localhost:9091", + "ribbon.enabled=true", + "ribbon.client.name=custom-svc-list", + "ribbon.eureka.enabled=false", + "debug=false" + } +) +public class CamelCloudNetflixServiceCallTest { + @Autowired + private ProducerTemplate template; + + @Test + public void testServiceCall() throws Exception { + Assert.assertEquals("9090", template.requestBody("direct:start", null, String.class)); + Assert.assertEquals("9092", template.requestBody("direct:start", null, String.class)); + } +} + http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud-netflix/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/src/test/resources/logback.xml b/components/camel-spring-cloud-netflix/src/test/resources/logback.xml new file mode 100644 index 0000000..7338ea6 --- /dev/null +++ b/components/camel-spring-cloud-netflix/src/test/resources/logback.xml @@ -0,0 +1,39 @@ +<?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-spring-cloud-test.log</file> + </appender> + + <root level="INFO"> + <appender-ref ref="FILE"/> + </root> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudLoadBalancerAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudLoadBalancerAutoConfiguration.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudLoadBalancerAutoConfiguration.java index fb3e728..479e5f3 100644 --- a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudLoadBalancerAutoConfiguration.java +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudLoadBalancerAutoConfiguration.java @@ -28,8 +28,6 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; -import org.springframework.context.annotation.Scope; @Configuration @ConditionalOnBean({ CamelCloudAutoConfiguration.class, LoadBalancerClient.class }) http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscovery.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscovery.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscovery.java index 8029894..a787fc3 100644 --- a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscovery.java +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscovery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.spring.cloud; import java.util.List; http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java index aee96b3..c0324b4 100644 --- a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Lazy; @Configuration @EnableConfigurationProperties(CamelCloudConfigurationProperties.class) -@Conditional(CamelCloudServiceDiscoveryAutoConfiguration.ServiceDiscoveryCondition.class) +@Conditional(CamelCloudServiceDiscoveryAutoConfiguration.Condition.class) public class CamelCloudServiceDiscoveryAutoConfiguration { @Lazy @@ -68,8 +68,8 @@ public class CamelCloudServiceDiscoveryAutoConfiguration { // Condition // ******************************* - public static class ServiceDiscoveryCondition extends GroupCondition { - public ServiceDiscoveryCondition() { + public static class Condition extends GroupCondition { + public Condition() { super( "camel.cloud", "camel.cloud.service-discovery" http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilter.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilter.java new file mode 100644 index 0000000..5c5b8bf --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilter.java @@ -0,0 +1,36 @@ +/** + * 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.spring.cloud; + +import java.util.List; + +import org.apache.camel.cloud.ServiceDefinition; +import org.apache.camel.cloud.ServiceFilter; +import org.apache.camel.impl.cloud.ChainedServiceFilter; + +public class CamelCloudServiceFilter implements ServiceFilter { + private final ChainedServiceFilter serviceFilter; + + public CamelCloudServiceFilter(List<ServiceFilter> blacklistServiceFilter) { + this.serviceFilter = new ChainedServiceFilter(blacklistServiceFilter); + } + + @Override + public List<ServiceDefinition> apply(List<ServiceDefinition> serviceDefinitions) { + return this.serviceFilter.apply(serviceDefinitions); + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilterAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilterAutoConfiguration.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilterAutoConfiguration.java index bb687bd..c29e1a8 100644 --- a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilterAutoConfiguration.java +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudServiceFilterAutoConfiguration.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.spring.cloud; +import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.camel.cloud.ServiceFilter; import org.apache.camel.impl.cloud.BlacklistServiceFilter; -import org.apache.camel.impl.cloud.ChainedServiceFilter; import org.apache.camel.impl.cloud.HealthyServiceFilter; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.ObjectHelper; @@ -35,11 +33,11 @@ import org.springframework.context.annotation.Lazy; @Configuration @EnableConfigurationProperties(CamelCloudConfigurationProperties.class) -@Conditional(CamelCloudServiceFilterAutoConfiguration.ServiceFilterCondition.class) +@Conditional(CamelCloudServiceFilterAutoConfiguration.Condition.class) public class CamelCloudServiceFilterAutoConfiguration { @Lazy @Bean(name = "service-filter") - public ServiceFilter serviceFilter(CamelCloudConfigurationProperties properties) { + public CamelCloudServiceFilter serviceFilter(CamelCloudConfigurationProperties properties) { BlacklistServiceFilter blacklist = new BlacklistServiceFilter(); Map<String, List<String>> services = properties.getServiceFilter().getBlacklist(); @@ -54,15 +52,15 @@ public class CamelCloudServiceFilterAutoConfiguration { } } - return ChainedServiceFilter.wrap(new HealthyServiceFilter(), blacklist); + return new CamelCloudServiceFilter(Arrays.asList(new HealthyServiceFilter(), blacklist)); } // ******************************* // Condition // ******************************* - public static class ServiceFilterCondition extends GroupCondition { - public ServiceFilterCondition() { + public static class Condition extends GroupCondition { + public Condition() { super( "camel.cloud", "camel.cloud.service-filter" http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/camel-spring-cloud/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/resources/META-INF/spring.factories b/components/camel-spring-cloud/src/main/resources/META-INF/spring.factories index d9c7e21..a183cdd 100644 --- a/components/camel-spring-cloud/src/main/resources/META-INF/spring.factories +++ b/components/camel-spring-cloud/src/main/resources/META-INF/spring.factories @@ -17,6 +17,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.apache.camel.spring.cloud.CamelCloudAutoConfiguration,\ -org.apache.camel.spring.cloud.CamelCloudServiceChooserAutoConfiguration,\ org.apache.camel.spring.cloud.CamelCloudServiceDiscoveryAutoConfiguration,\ +org.apache.camel.spring.cloud.CamelCloudServiceFilterAutoConfiguration,\ +org.apache.camel.spring.cloud.CamelCloudServiceChooserAutoConfiguration,\ org.apache.camel.spring.cloud.CamelCloudLoadBalancerAutoConfiguration http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index b3f3864..d67c729 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -250,6 +250,7 @@ <module>camel-spring-batch</module> <module>camel-spring-boot</module> <module>camel-spring-cloud</module> + <module>camel-spring-cloud-netflix</module> <module>camel-spring-javaconfig</module> <module>camel-spring-integration</module> <module>camel-spring-ldap</module> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index c9a5a76..7e2d51b 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -840,7 +840,7 @@ Miscellaneous Components ^^^^^^^^^^^^^^^^^^^^^^^^ // others: START -Number of Miscellaneous Components: 34 +Number of Miscellaneous Components: 35 [width="100%",cols="4,1,5",options="header"] |======================================================================= @@ -888,6 +888,8 @@ Number of Miscellaneous Components: 34 | link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19 | Camel Cloud integration with Spring Cloud +| link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix + | link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL | link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 5ae2565..87a6600 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -347,6 +347,7 @@ * [Shiro](shiro.adoc) * [Spring Boot](spring-boot.adoc) * [Spring Cloud](spring-cloud.adoc) + * [Spring Cloud Netflix](spring-cloud-netflix.adoc) * [Spring DM](spring-dm.adoc) * [Spring Java Configuration](spring-javaconfig.adoc) * [Spring Security](spring-security.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4c4ae2e..958c39f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1805,6 +1805,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-integration</artifactId> <version>${project.version}</version> </dependency> @@ -3064,6 +3069,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix-starter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-dm-starter</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml new file mode 100644 index 0000000..fb67949 --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml @@ -0,0 +1,59 @@ +<?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</groupId> + <artifactId>components-starter</artifactId> + <version>2.19.0-SNAPSHOT</version> + </parent> + <artifactId>camel-spring-cloud-netflix-starter</artifactId> + <packaging>jar</packaging> + <name>Spring-Boot Starter :: Camel :: Spring Cloud Netflix</name> + <description>Spring-Boot Starter for Camel Cloud integration with Spring Cloud Netflix</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-spring-cloud-netflix</artifactId> + <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> + </dependency> + <!--START OF GENERATED CODE--> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core-starter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-starter</artifactId> + </dependency> + <!--END OF GENERATED CODE--> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == 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. http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/spring.provides ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/spring.provides new file mode 100644 index 0000000..6720fa2 --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/src/main/resources/META-INF/spring.provides @@ -0,0 +1,18 @@ +# +# 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-spring-cloud-netflix \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/components-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml index bf4ffbe..7c4c886 100644 --- a/platforms/spring-boot/components-starter/pom.xml +++ b/platforms/spring-boot/components-starter/pom.xml @@ -266,6 +266,7 @@ <module>camel-splunk-starter</module> <module>camel-spring-batch-starter</module> <module>camel-spring-boot-starter</module> + <module>camel-spring-cloud-netflix-starter</module> <module>camel-spring-cloud-starter</module> <module>camel-spring-dm-starter</module> <module>camel-spring-integration-starter</module> http://git-wip-us.apache.org/repos/asf/camel/blob/5dafecf9/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 827e982..0dbd013 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -472,6 +472,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-catalog-connector</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-catalog-lucene</artifactId> <version>${project.version}</version> </dependency> @@ -2289,6 +2294,16 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-netflix-starter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-cloud-starter</artifactId> <version>${project.version}</version> </dependency>
