CAMEL-10574: Create a camel-spring-cloud component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b206820 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b206820 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b206820 Branch: refs/heads/master Commit: 0b2068209e4b57c01b69bd5b8550732ea57f453c Parents: d33a7f6 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Mon Dec 19 14:49:26 2016 +0100 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Wed Dec 21 17:18:53 2016 +0100 ---------------------------------------------------------------------- apache-camel/pom.xml | 9 + .../src/main/descriptors/common-bin.xml | 3 + camel-core/readme-eip.adoc | 3 + .../AbstractServiceCallProcessorFactory.java | 42 ++++ .../DefaultServiceCallProcessorFactory.java | 40 ++-- .../ServiceCallConfigurationDefinition.java | 2 +- .../model/remote/ServiceCallDefinition.java | 23 ++- .../remote/ServiceCallProcessorFactory.java | 22 ++ .../support/ServiceCallExpressionSupport.java | 6 +- .../camel-spring-cloud-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 ++ components-starter/pom.xml | 1 + .../processor/RibbonProcessorFactory.java | 12 +- .../camel/spring/boot/util/GroupCondition.java | 60 ++++++ components/camel-spring-cloud/pom.xml | 124 +++++++++++ .../src/main/docs/spring-cloud.adoc | 40 ++++ .../cloud/CamelCloudAutoConfiguration.java | 30 +++ .../CamelCloudConfigurationProperties.java | 32 +++ .../CamelCloudServiceCallAutoConfiguration.java | 95 +++++++++ ...CloudServiceCallConfigurationProperties.java | 79 ++++++++ .../CamelCloudServiceCallProcessor.java | 200 ++++++++++++++++++ .../CamelCloudServiceCallProcessorFactory.java | 201 ++++++++++++++++++ ...CamelCloudServiceCallServerListStrategy.java | 52 +++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../apache/camel/model/ServiceCallDefinition | 18 ++ .../main/resources/META-INF/spring.factories | 20 ++ .../remote/CamelCloudDiscoveryClient.java | 71 +++++++ .../CamelCloudServiceCallConfigurationTest.java | 69 +++++++ .../remote/CamelCloudServiceCallRibbonTest.java | 83 ++++++++ .../remote/CamelCloudServiceCallTest.java | 99 +++++++++ .../src/test/resources/logback.xml | 39 ++++ components/pom.xml | 1 + components/readme.adoc | 1 + parent/pom.xml | 12 ++ .../camel-spring-boot-dependencies/pom.xml | 10 + 38 files changed, 1978 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 4db5135..835a2f0 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -854,6 +854,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-spring-dm</artifactId> </dependency> <dependency> @@ -1963,6 +1967,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-cloud-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/0b206820/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 6621c65..e9dd576 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -221,6 +221,8 @@ <include>org.apache.camel:camel-spring-batch</include> <include>org.apache.camel:camel-spring-boot</include> <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-dm</include> <include>org.apache.camel:camel-spring-integration</include> <include>org.apache.camel:camel-spring-javaconfig</include> @@ -480,6 +482,7 @@ <include>org.apache.camel:camel-splunk-starter</include> <include>org.apache.camel:camel-spring-batch-starter</include> <include>org.apache.camel:camel-spring-boot-starter</include> + <include>org.apache.camel:camel-spring-cloud-starter</include> <include>org.apache.camel:camel-spring-dm-starter</include> <include>org.apache.camel:camel-spring-integration-starter</include> <include>org.apache.camel:camel-spring-javaconfig-starter</include> http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/readme-eip.adoc ---------------------------------------------------------------------- diff --git a/camel-core/readme-eip.adoc b/camel-core/readme-eip.adoc index 28b9e32..1be6f05 100644 --- a/camel-core/readme-eip.adoc +++ b/camel-core/readme-eip.adoc @@ -141,6 +141,9 @@ Enterprise Integration Patterns | link:src/main/docs/eips/serviceCall-eip.adoc[Service Call] + `<serviceCall>` | Remote service call +| link:src/main/docs/eips/serviceCallConfiguration-eip.adoc[Service Call Configuration] + +`<serviceCallConfiguration>` | Remote service call configuration + | link:src/main/docs/eips/setBody-eip.adoc[Set Body] + `<setBody>` | Sets the contents of the message body http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/impl/remote/AbstractServiceCallProcessorFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/remote/AbstractServiceCallProcessorFactory.java b/camel-core/src/main/java/org/apache/camel/impl/remote/AbstractServiceCallProcessorFactory.java new file mode 100644 index 0000000..7f0a0af --- /dev/null +++ b/camel-core/src/main/java/org/apache/camel/impl/remote/AbstractServiceCallProcessorFactory.java @@ -0,0 +1,42 @@ +/** + * 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.impl.remote; + +import org.apache.camel.Processor; +import org.apache.camel.model.ProcessorDefinition; +import org.apache.camel.model.remote.ServiceCallDefinition; +import org.apache.camel.model.remote.ServiceCallProcessorFactory; +import org.apache.camel.spi.RouteContext; + +public abstract class AbstractServiceCallProcessorFactory implements ServiceCallProcessorFactory { + @Override + public Processor createChildProcessor(RouteContext routeContext, ProcessorDefinition<?> definition, boolean mandatory) throws Exception { + // not in use + return null; + } + + @Override + public Processor createProcessor(RouteContext routeContext, ProcessorDefinition<?> definition) throws Exception { + return definition instanceof ServiceCallDefinition + ? createProcessor(routeContext, (ServiceCallDefinition) definition) + : null; + } + + protected abstract Processor createProcessor(RouteContext routeContext, ServiceCallDefinition definition) throws Exception; + +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/impl/remote/DefaultServiceCallProcessorFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/remote/DefaultServiceCallProcessorFactory.java b/camel-core/src/main/java/org/apache/camel/impl/remote/DefaultServiceCallProcessorFactory.java index 1b7cd81..99a0844 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/remote/DefaultServiceCallProcessorFactory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/remote/DefaultServiceCallProcessorFactory.java @@ -24,11 +24,9 @@ import java.util.Set; import org.apache.camel.CamelContextAware; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; -import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.model.PropertyDefinition; import org.apache.camel.model.remote.ServiceCallConfigurationDefinition; import org.apache.camel.model.remote.ServiceCallDefinition; -import org.apache.camel.spi.ProcessorFactory; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.ServiceCallLoadBalancer; import org.apache.camel.spi.ServiceCallServer; @@ -37,18 +35,9 @@ import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; -public abstract class DefaultServiceCallProcessorFactory<C, S extends ServiceCallServer> implements ProcessorFactory { - @Override - public Processor createChildProcessor(RouteContext routeContext, ProcessorDefinition<?> definition, boolean mandatory) throws Exception { - // not in use - return null; - } - - @Override - public Processor createProcessor(RouteContext routeContext, ProcessorDefinition<?> definition) throws Exception { - return definition instanceof ServiceCallDefinition - ? createProcessor(routeContext, (ServiceCallDefinition) definition, createConfiguration(routeContext)) - : null; +public abstract class DefaultServiceCallProcessorFactory<C, S extends ServiceCallServer> extends AbstractServiceCallProcessorFactory { + protected Processor createProcessor(RouteContext routeContext, ServiceCallDefinition definition) throws Exception { + return createProcessor(routeContext, definition, createConfiguration(routeContext)); } protected Processor createProcessor(RouteContext routeContext, ServiceCallDefinition definition, C cfg) throws Exception { @@ -114,10 +103,14 @@ public abstract class DefaultServiceCallProcessorFactory<C, S extends ServiceCal sl = configureServerListStrategy(cfg, routeContext, configRef); } - // the component is used to configure what the default scheme to use (eg camel component name) - String component = config != null ? config.getComponent() : null; - if (component == null && configRef != null) { - component = configRef.getComponent(); + // The component is used to configure what the default scheme to use (eg camel component name). + // The component configured on EIP takes precedence vs configured on configuration. + String component = definition.getComponent(); + if (component == null) { + component = config != null ? config.getComponent() : null; + if (component == null && configRef != null) { + component = configRef.getComponent(); + } } if (ObjectHelper.isNotEmpty(lb) && lb instanceof CamelContextAware) { @@ -148,7 +141,13 @@ public abstract class DefaultServiceCallProcessorFactory<C, S extends ServiceCal return processor; } - protected Map<String, String> configureProperties(RouteContext routeContext, ServiceCallConfigurationDefinition config, ServiceCallConfigurationDefinition configRef) throws Exception { + // ************************************************************************* + // Helpers + // ************************************************************************* + + protected Map<String, String> configureProperties( + RouteContext routeContext, ServiceCallConfigurationDefinition config, ServiceCallConfigurationDefinition configRef) throws Exception { + Map<String, String> answer = new HashMap<>(); if (config != null && config.getProperties() != null) { for (PropertyDefinition prop : config.getProperties()) { @@ -276,6 +275,9 @@ public abstract class DefaultServiceCallProcessorFactory<C, S extends ServiceCal // TODO: rename protected abstract C createConfiguration(RouteContext routeContext) throws Exception; + // ************************************************************************* + // Defaults + // ************************************************************************* protected ServiceCallLoadBalancer<S> createDefaultLoadBalancer(C conf) throws Exception { return new RoundRobinServiceCallLoadBalancer<>(); http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallConfigurationDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallConfigurationDefinition.java index 9fe5ea9..359bcdb 100644 --- a/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallConfigurationDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallConfigurationDefinition.java @@ -42,7 +42,7 @@ import org.apache.camel.spi.ServiceCallServerListStrategy; @Metadata(label = "eip,routing,remote") @XmlRootElement(name = "serviceCallConfiguration") @XmlAccessorType(XmlAccessType.FIELD) -public abstract class ServiceCallConfigurationDefinition extends IdentifiedType implements OtherAttributesAware { +public class ServiceCallConfigurationDefinition extends IdentifiedType implements OtherAttributesAware { @XmlTransient private ServiceCallDefinition parent; http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallDefinition.java b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallDefinition.java index 7766250..d91aa5a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallDefinition.java @@ -41,9 +41,11 @@ public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinit @XmlAttribute @Metadata(required = "true") private String name; - @XmlAttribute @Metadata(required = "true") + @XmlAttribute private String uri; @XmlAttribute + private String component; + @XmlAttribute private ExchangePattern pattern; @XmlElement private ServiceCallConfigurationDefinition serviceCallConfiguration; @@ -105,6 +107,14 @@ public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinit } /** + * Sets the component to use + */ + public ServiceCallDefinition component(String component) { + setComponent(component); + return this; + } + + /** * Configures the Service Call EIP using Kubernetes * <p/> * Use <tt>end</tt> when configuration is complete, to return back to the Service Call EIP. @@ -252,6 +262,17 @@ public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinit this.uri = uri; } + public String getComponent() { + return component; + } + + /** + * The component to use. + */ + public void setComponent(String component) { + this.component = component; + } + public String getLoadBalancerRef() { return loadBalancerRef; } http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallProcessorFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallProcessorFactory.java b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallProcessorFactory.java new file mode 100644 index 0000000..8a07c8b --- /dev/null +++ b/camel-core/src/main/java/org/apache/camel/model/remote/ServiceCallProcessorFactory.java @@ -0,0 +1,22 @@ +/** + * 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.model.remote; + +import org.apache.camel.spi.ProcessorFactory; + +public interface ServiceCallProcessorFactory extends ProcessorFactory { +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/camel-core/src/main/java/org/apache/camel/support/ServiceCallExpressionSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/support/ServiceCallExpressionSupport.java b/camel-core/src/main/java/org/apache/camel/support/ServiceCallExpressionSupport.java index 9901038..1351d31 100644 --- a/camel-core/src/main/java/org/apache/camel/support/ServiceCallExpressionSupport.java +++ b/camel-core/src/main/java/org/apache/camel/support/ServiceCallExpressionSupport.java @@ -79,7 +79,11 @@ public abstract class ServiceCallExpressionSupport extends ExpressionAdapter { } answer = scheme + "://" + ip + ":" + port; if (contextPath != null) { - answer += "" + contextPath; + if (!contextPath.startsWith("/")) { + contextPath = "/" + contextPath; + } + + answer += contextPath; } } else { // we have existing uri, then replace the serviceName with ip:port http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components-starter/camel-spring-cloud-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml new file mode 100644 index 0000000..990c21c --- /dev/null +++ b/components-starter/camel-spring-cloud-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-starter</artifactId> + <packaging>jar</packaging> + <name>Spring-Boot Starter :: Camel :: Spring Cloud</name> + <description>Spring-Boot Starter for Camel :: Spring Cloud</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</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/0b206820/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components-starter/camel-spring-cloud-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/0b206820/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components-starter/camel-spring-cloud-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/0b206820/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/spring.provides ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-spring-cloud-starter/src/main/resources/META-INF/spring.provides new file mode 100644 index 0000000..e91251b --- /dev/null +++ b/components-starter/camel-spring-cloud-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 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 9fd5db3..8af07b8 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -261,6 +261,7 @@ <module>camel-splunk-starter</module> <module>camel-spring-batch-starter</module> <module>camel-spring-boot-starter</module> + <module>camel-spring-cloud-starter</module> <module>camel-spring-dm-starter</module> <module>camel-spring-integration-starter</module> <module>camel-spring-javaconfig-starter</module> http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonProcessorFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonProcessorFactory.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonProcessorFactory.java index a603a2f..00e9c52 100644 --- a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonProcessorFactory.java +++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonProcessorFactory.java @@ -108,10 +108,14 @@ public class RibbonProcessorFactory extends DefaultServiceCallProcessorFactory<R throw new IllegalArgumentException("Load balancer must be of type: " + IRule.class + " but is of type: " + lb.getClass().getName()); } - // the component is used to configure what the default scheme to use (eg camel component name) - String component = config != null ? config.getComponent() : null; - if (component == null && configRef != null) { - component = configRef.getComponent(); + // The component is used to configure what the default scheme to use (eg camel component name). + // The component configured on EIP takes precedence vs configured on configuration. + String component = definition.getComponent(); + if (component == null) { + component = config != null ? config.getComponent() : null; + if (component == null && configRef != null) { + component = configRef.getComponent(); + } } Map<String, String> properties = configureProperties(routeContext, config, configRef); http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java new file mode 100644 index 0000000..acfd832 --- /dev/null +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java @@ -0,0 +1,60 @@ +/** + * 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.boot.util; + +import org.springframework.boot.autoconfigure.condition.ConditionMessage; +import org.springframework.boot.autoconfigure.condition.ConditionOutcome; +import org.springframework.boot.autoconfigure.condition.SpringBootCondition; +import org.springframework.boot.bind.RelaxedPropertyResolver; +import org.springframework.context.annotation.ConditionContext; +import org.springframework.core.type.AnnotatedTypeMetadata; + +public class GroupCondition extends SpringBootCondition { + private final String group; + private final String single; + private final boolean groupDefault; + private final boolean singleDefault; + + public GroupCondition(String group, String single) { + this(group, true, single, true); + } + + public GroupCondition(String group, boolean groupDefault, String single, boolean singleDefault) { + this.group = group.endsWith(".") ? group : group + "."; + this.groupDefault = groupDefault; + + this.single = group.endsWith(".") ? single : single + "."; + this.singleDefault = singleDefault; + } + + @Override + public ConditionOutcome getMatchOutcome(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { + boolean groupEnabled = isEnabled(conditionContext, this.group, true); + ConditionMessage.Builder message = ConditionMessage.forCondition(this.single); + + if (isEnabled(conditionContext, this.single, groupEnabled)) { + return ConditionOutcome.match(message.because("enabled")); + } + + return ConditionOutcome.noMatch(message.because("not enabled")); + } + + public static boolean isEnabled(ConditionContext context, String prefix, boolean defaultValue) { + RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(context.getEnvironment(), prefix); + return resolver.getProperty("enabled", Boolean.class, defaultValue); + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml new file mode 100644 index 0000000..f51f5d1 --- /dev/null +++ b/components/camel-spring-cloud/pom.xml @@ -0,0 +1,124 @@ +<?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</name> + <artifactId>camel-spring-cloud</artifactId> + <description>Camel :: Spring Cloud</description> + + <properties> + <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-commons</artifactId> + <version>${spring-cloud-commons-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-spring-boot</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/0b206820/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc b/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc new file mode 100644 index 0000000..61c796f --- /dev/null +++ b/components/camel-spring-cloud/src/main/docs/spring-cloud.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/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudAutoConfiguration.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudAutoConfiguration.java new file mode 100644 index 0000000..0948436 --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudAutoConfiguration.java @@ -0,0 +1,30 @@ +/** + * 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 org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnBean(CamelAutoConfiguration.class) +@AutoConfigureAfter(CamelAutoConfiguration.class) +@ConditionalOnProperty(value = "camel.cloud.enabled", matchIfMissing = true) +public class CamelCloudAutoConfiguration { +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudConfigurationProperties.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudConfigurationProperties.java new file mode 100644 index 0000000..00f91d8 --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelCloudConfigurationProperties.java @@ -0,0 +1,32 @@ +/** + * 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 org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "camel.cloud") +public class CamelCloudConfigurationProperties { + private boolean enabled = true; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallAutoConfiguration.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallAutoConfiguration.java new file mode 100644 index 0000000..4f382e7 --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallAutoConfiguration.java @@ -0,0 +1,95 @@ +/** + * 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.servicecall; + +import java.util.List; + +import org.apache.camel.impl.remote.RoundRobinServiceCallLoadBalancer; +import org.apache.camel.spi.ServiceCallLoadBalancer; +import org.apache.camel.spi.ServiceCallServer; +import org.apache.camel.spi.ServiceCallServerListStrategy; +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.client.discovery.DiscoveryClient; +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; +import org.springframework.core.annotation.Order; + +@Configuration +@ConditionalOnBean(CamelCloudAutoConfiguration.class) +public class CamelCloudServiceCallAutoConfiguration { + + // ****************************************** + // ServiceCall - ServerListStrategy + // ****************************************** + + @Lazy + @Scope("prototype") + @Bean(name = "server-list-strategy") + @ConditionalOnBean(DiscoveryClient.class) + @Conditional(CamelCloudServiceCallAutoConfiguration.ServerListStrategyCondition.class) + public ServiceCallServerListStrategy serverListStrategy(List<DiscoveryClient> clients) { + return new CamelCloudServiceCallServerListStrategy(clients); + } + + public static class ServerListStrategyCondition extends GroupCondition { + public ServerListStrategyCondition() { + super( + "camel.cloud.servicecall", + "camel.cloud.servicecall.server-list-strategy" + ); + } + } + + // ****************************************** + // ServiceCall - Load Balancer + // ****************************************** + + @Lazy + @Scope("prototype") + @Order(1) + @Bean(name = "round-robin-load-balancer") + @Conditional(CamelCloudServiceCallAutoConfiguration.LoadBalancerCondition.class) + public ServiceCallLoadBalancer<ServiceCallServer> roundRobinLoadBalancer() { + return new RoundRobinServiceCallLoadBalancer<>(); + } + + @Lazy + @Scope("prototype") + @Order(2) + @Bean(name = "random-load-balancer") + @Conditional(CamelCloudServiceCallAutoConfiguration.LoadBalancerCondition.class) + public ServiceCallLoadBalancer<ServiceCallServer> randomLoadBalancer() { + return new RoundRobinServiceCallLoadBalancer<>(); + } + + public static class LoadBalancerCondition extends GroupCondition { + public LoadBalancerCondition() { + super( + "camel.cloud.servicecall", + "camel.cloud.servicecall.load-balancer" + ); + } + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallConfigurationProperties.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallConfigurationProperties.java new file mode 100644 index 0000000..548bcd7 --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallConfigurationProperties.java @@ -0,0 +1,79 @@ +/** + * 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.servicecall; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "camel.cloud.servicecall") +public class CamelCloudServiceCallConfigurationProperties { + private boolean enabled = true; + private LoadBalancer loadBalancer; + private ServerListStrategy serverListStrategy; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public LoadBalancer getLoadBalancer() { + return loadBalancer; + } + + public void setLoadBalancer(LoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + + public ServerListStrategy getServerListStrategy() { + return serverListStrategy; + } + + public void setServerListStrategy(ServerListStrategy serverListStrategy) { + this.serverListStrategy = serverListStrategy; + } + + // ***************************************** + // Nested configurations + // ***************************************** + + public static class LoadBalancer { + private boolean enabled = true; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + } + + public static class ServerListStrategy { + private boolean enabled = true; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessor.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessor.java new file mode 100644 index 0000000..bb965ab --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessor.java @@ -0,0 +1,200 @@ +/** + * 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.servicecall; + +import java.io.IOException; + +import org.apache.camel.AsyncCallback; +import org.apache.camel.AsyncProcessor; +import org.apache.camel.CamelContext; +import org.apache.camel.CamelContextAware; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Expression; +import org.apache.camel.RuntimeCamelException; +import org.apache.camel.Traceable; +import org.apache.camel.impl.remote.DefaultServiceCallExpression; +import org.apache.camel.impl.remote.ServiceCallConstants; +import org.apache.camel.processor.SendDynamicProcessor; +import org.apache.camel.spi.IdAware; +import org.apache.camel.support.ServiceSupport; +import org.apache.camel.util.AsyncProcessorHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.ServiceHelper; +import org.apache.camel.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; + +public class CamelCloudServiceCallProcessor extends ServiceSupport implements AsyncProcessor, CamelContextAware, Traceable, IdAware { + private static final Logger LOG = LoggerFactory.getLogger(CamelCloudServiceCallProcessor.class); + + private final ExchangePattern exchangePattern; + private final String name; + private final String scheme; + private final String uri; + private final String contextPath; + private final LoadBalancerClient loadBalancerClient; + private CamelContext camelContext; + private String id; + private Expression serviceCallExpression; + private SendDynamicProcessor processor; + + public CamelCloudServiceCallProcessor(String name, String scheme, String uri, ExchangePattern exchangePattern, LoadBalancerClient loadBalancerClient) { + this.uri = uri; + this.exchangePattern = exchangePattern; + this.loadBalancerClient = loadBalancerClient; + + // setup from the provided name which can contain scheme and context-path information as well + String serviceName; + if (name.contains("/")) { + serviceName = StringHelper.before(name, "/"); + this.contextPath = StringHelper.after(name, "/"); + } else if (name.contains("?")) { + serviceName = StringHelper.before(name, "?"); + this.contextPath = StringHelper.after(name, "?"); + } else { + serviceName = name; + this.contextPath = null; + } + if (serviceName.contains(":")) { + this.scheme = StringHelper.before(serviceName, ":"); + this.name = StringHelper.after(serviceName, ":"); + } else { + this.scheme = scheme; + this.name = serviceName; + } + + this.serviceCallExpression = new DefaultServiceCallExpression( + this.name, + this.scheme, + this.contextPath, + this.uri); + } + + @Override + public CamelContext getCamelContext() { + return camelContext; + } + + @Override + public void setCamelContext(CamelContext camelContext) { + this.camelContext = camelContext; + } + + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + @Override + public String getTraceLabel() { + return id; + } + + public String getName() { + return name; + } + + public String getScheme() { + return scheme; + } + + public String getContextPath() { + return contextPath; + } + + public String getUri() { + return uri; + } + + public ExchangePattern getExchangePattern() { + return exchangePattern; + } + + public void setServiceCallExpression(Expression serviceCallExpression) { + this.serviceCallExpression = serviceCallExpression; + } + + public Expression getServiceCallExpression() { + return serviceCallExpression; + } + + public CamelCloudServiceCallProcessor serviceCallExpression(Expression serviceCallExpression) { + setServiceCallExpression(serviceCallExpression); + return this; + } + + public AsyncProcessor getProcessor() { + return processor; + } + + @Override + protected void doStart() throws Exception { + StringHelper.notEmpty(getName(), "name", "serviceName"); + ObjectHelper.notNull(camelContext, "camelContext"); + ObjectHelper.notNull(serviceCallExpression, "serviceCallExpression"); + ObjectHelper.notNull(loadBalancerClient, "loadBalancerClient"); + + LOG.info("ServiceCall with service name: {}", name); + + processor = new SendDynamicProcessor(uri, serviceCallExpression); + processor.setCamelContext(getCamelContext()); + if (exchangePattern != null) { + processor.setPattern(exchangePattern); + } + + ServiceHelper.startServices(processor); + } + + @Override + protected void doStop() throws Exception { + } + + @Override + public void process(Exchange exchange) throws Exception { + AsyncProcessorHelper.process(this, exchange); + } + + @Override + public boolean process(final Exchange exchange, final AsyncCallback callback) { + if (exchange.getException() != null) { + callback.done(true); + return true; + } + + try { + return loadBalancerClient.execute( + exchange.getIn().getHeader(ServiceCallConstants.SERVICE_NAME, name, String.class), + instance -> { + exchange.getIn().setHeader(ServiceCallConstants.SERVER_IP, instance.getHost()); + exchange.getIn().setHeader(ServiceCallConstants.SERVER_PORT, instance.getPort()); + exchange.getIn().setHeader(ServiceCallConstants.SERVICE_NAME, instance.getServiceId()); + return processor.process(exchange, callback); + } + ); + } catch (IOException e) { + throw new RuntimeCamelException(e); + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessorFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessorFactory.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessorFactory.java new file mode 100644 index 0000000..2db3ffe --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallProcessorFactory.java @@ -0,0 +1,201 @@ +/** + * 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.servicecall; + +import java.util.Set; +import java.util.function.Supplier; + +import org.apache.camel.CamelContext; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Processor; +import org.apache.camel.impl.remote.AbstractServiceCallProcessorFactory; +import org.apache.camel.impl.remote.DefaultServiceCallProcessor; +import org.apache.camel.model.remote.ServiceCallConfigurationDefinition; +import org.apache.camel.model.remote.ServiceCallDefinition; +import org.apache.camel.spi.RouteContext; +import org.apache.camel.spi.ServiceCallLoadBalancer; +import org.apache.camel.spi.ServiceCallServer; +import org.apache.camel.spi.ServiceCallServerListStrategy; +import org.apache.camel.util.CamelContextHelper; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; + +public class CamelCloudServiceCallProcessorFactory extends AbstractServiceCallProcessorFactory { + @Override + protected Processor createProcessor(RouteContext routeContext, ServiceCallDefinition definition) throws Exception { + String name = definition.getName(); + String uri = definition.getUri(); + ExchangePattern mep = definition.getPattern(); + CamelContext camelContext = routeContext.getCamelContext(); + + ServiceCallConfigurationDefinition config = definition.getServiceCallConfiguration(); + ServiceCallConfigurationDefinition configRef = null; + if (definition.getServiceCallConfigurationRef() != null) { + // lookup in registry first + configRef = CamelContextHelper.lookup(camelContext, definition.getServiceCallConfigurationRef(), ServiceCallConfigurationDefinition.class); + if (configRef == null) { + // and fallback as service configuration + camelContext.getServiceCallConfiguration(definition.getServiceCallConfigurationRef(), ServiceCallConfigurationDefinition.class); + } + } + + // if no configuration explicit configured then use default + if (config == null && configRef == null) { + config = camelContext.getServiceCallConfiguration(null, ServiceCallConfigurationDefinition.class); + } + if (config == null) { + // if no default then try to find if there configuration in the registry of the given type + Set<ServiceCallConfigurationDefinition> set = camelContext.getRegistry().findByType(ServiceCallConfigurationDefinition.class); + if (set.size() == 1) { + config = set.iterator().next(); + } + } + + + //if (config == null && configRef == null) { + // throw new IllegalStateException("The ServiceCall: " + definition + " must be configured before it can be used."); + //} + + String component = definition.getComponent(); + if (component == null) { + component = config != null ? config.getComponent() : null; + if (component == null && configRef != null) { + component = configRef.getComponent(); + } + } + + // lookup the load balancer to use (configured on EIP takes precedence vs configured on configuration) + Object lb = retrieveLoadBalancer(camelContext, definition, config, configRef); + if (lb == null) { + throw new IllegalArgumentException("Load balancer must be provided"); + } + + if (lb instanceof LoadBalancerClient) { + return new CamelCloudServiceCallProcessor(name, uri, component, mep, (LoadBalancerClient) lb); + } else if (lb instanceof ServiceCallLoadBalancer) { + + ServiceCallServerListStrategy<ServiceCallServer> sl = retrieveServerListStrategy(camelContext, definition, config, configRef); + if (lb == null) { + throw new IllegalArgumentException("Server list strategy must be provided"); + } + + DefaultServiceCallProcessor<ServiceCallServer> processor = new DefaultServiceCallProcessor<>(name, component, uri, mep); + processor.setLoadBalancer((ServiceCallLoadBalancer<ServiceCallServer>)lb); + processor.setServerListStrategy(sl); + + return processor; + } else { + throw new IllegalStateException( + "Unable to configure ServiceCall: LoadBalancer should be an instance of LoadBalancerClient or ServiceCallLoadBalancer, got " + lb.getClass().getName() + ); + } + } + + // ************************************************************************* + // Load Balancer + // ************************************************************************* + + private Object retrieveLoadBalancer( + CamelContext camelContext, ServiceCallDefinition definition, ServiceCallConfigurationDefinition config, ServiceCallConfigurationDefinition configRef) { + + // lookup the load balancer to use (configured on EIP takes precedence vs configured on configuration) + Object lb = retrieveLoadBalancer(camelContext, definition::getLoadBalancer, definition::getLoadBalancerRef); + if (lb == null && config != null) { + lb = retrieveLoadBalancer(camelContext, config::getLoadBalancer, config::getLoadBalancerRef); + } + if (lb == null && configRef != null) { + lb = retrieveLoadBalancer(camelContext, configRef::getLoadBalancer, configRef::getLoadBalancerRef); + } + + if (lb == null) { + Set<LoadBalancerClient> set = camelContext.getRegistry().findByType(LoadBalancerClient.class); + if (set.size() == 1) { + lb = set.iterator().next(); + } + } + + return lb; + } + + private Object retrieveLoadBalancer( + CamelContext camelContext, Supplier<Object> loadBalancerSupplier, Supplier<String> loadBalancerRefSupplier) { + + Object lb = null; + + if (loadBalancerSupplier != null) { + lb = loadBalancerSupplier.get(); + } + + if (lb == null && loadBalancerRefSupplier != null) { + String ref = loadBalancerRefSupplier.get(); + if (ref != null) { + lb = CamelContextHelper.lookup(camelContext, ref, LoadBalancerClient.class); + } + if (ref != null && lb == null) { + lb = CamelContextHelper.lookup(camelContext, ref, ServiceCallLoadBalancer.class); + } + } + + return lb; + } + + // ************************************************************************* + // Server List + // ************************************************************************* + + + private ServiceCallServerListStrategy retrieveServerListStrategy( + CamelContext camelContext, ServiceCallDefinition definition, ServiceCallConfigurationDefinition config, ServiceCallConfigurationDefinition configRef) { + + // lookup the server list strategy to use (configured on EIP takes precedence vs configured on configuration) + ServiceCallServerListStrategy sl = retrieveServerListStrategy(camelContext, definition::getServerListStrategy, definition::getServerListStrategyRef); + if (sl == null && config != null) { + sl = retrieveServerListStrategy(camelContext, config::getServerListStrategy, config::getServerListStrategyRef); + } + if (sl == null && configRef != null) { + sl = retrieveServerListStrategy(camelContext, configRef::getServerListStrategy, configRef::getServerListStrategyRef); + } + + if (sl == null) { + Set<ServiceCallServerListStrategy> set = camelContext.getRegistry().findByType(ServiceCallServerListStrategy.class); + if (set.size() == 1) { + sl = set.iterator().next(); + } + } + + return sl; + } + + private ServiceCallServerListStrategy retrieveServerListStrategy( + CamelContext camelContext, Supplier<ServiceCallServerListStrategy> serverListSupplier, Supplier<String> serverListSupplierRef) { + + ServiceCallServerListStrategy sl = null; + + if (serverListSupplier != null) { + sl = serverListSupplier.get(); + } + + if (sl == null && serverListSupplierRef != null) { + String ref = serverListSupplierRef.get(); + if (ref != null) { + sl = CamelContextHelper.lookup(camelContext, ref, ServiceCallServerListStrategy.class); + } + } + + return sl; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/0b206820/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallServerListStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallServerListStrategy.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallServerListStrategy.java new file mode 100644 index 0000000..3f30b6c --- /dev/null +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/servicecall/CamelCloudServiceCallServerListStrategy.java @@ -0,0 +1,52 @@ +/** + * 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.servicecall; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.camel.impl.remote.DefaultServiceCallServer; +import org.apache.camel.impl.remote.DefaultServiceCallServerListStrategy; +import org.apache.camel.spi.ServiceCallServer; +import org.springframework.cloud.client.discovery.DiscoveryClient; + +public class CamelCloudServiceCallServerListStrategy extends DefaultServiceCallServerListStrategy<ServiceCallServer> { + private final List<DiscoveryClient> clients; + + public CamelCloudServiceCallServerListStrategy(List<DiscoveryClient> clients) { + this.clients = new ArrayList<>(clients); + } + + @Override + public List<ServiceCallServer> getInitialListOfServers(String name) { + return getServers(name); + } + + @Override + public List<ServiceCallServer> getUpdatedListOfServers(String name) { + return getServers(name); + } + + private List<ServiceCallServer> getServers(String name) { + return clients.stream() + .flatMap(c -> c.getInstances(name).stream()) + .map(s -> new DefaultServiceCallServer(s.getHost(), s.getPort(), s.getMetadata())) + .collect(Collectors.toList()); + } +}
