Repository: camel Updated Branches: refs/heads/master 2399ff797 -> 99fa4687e
Fix build Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99fa4687 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99fa4687 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99fa4687 Branch: refs/heads/master Commit: 99fa4687e6e8c13b6ec7b236209ce960e34a1b5d Parents: 2399ff7 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Tue Mar 21 11:08:59 2017 +0100 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Tue Mar 21 11:09:07 2017 +0100 ---------------------------------------------------------------------- .../CamelCloudNetflixAutoConfiguration.java | 2 +- ...elCloudNetflixRibbonClientConfiguration.java | 4 +- ...melCloudNetflixServiceCallConfiguration.java | 48 -------------------- .../CamelCloudNetflixServiceCallTest.java | 34 +++++++++++++- 4 files changed, 36 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/99fa4687/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 index 3183597..544051c 100644 --- 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 @@ -17,8 +17,8 @@ package org.apache.camel.spring.cloud.netflix; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.spring.boot.cloud.CamelCloudAutoConfiguration; 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; http://git-wip-us.apache.org/repos/asf/camel/blob/99fa4687/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 index 20c4014..1b492a8 100644 --- 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 @@ -18,8 +18,8 @@ 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.apache.camel.spring.boot.cloud.CamelCloudServiceDiscovery; +import org.apache.camel.spring.boot.cloud.CamelCloudServiceFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; http://git-wip-us.apache.org/repos/asf/camel/blob/99fa4687/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 deleted file mode 100644 index 2854d3c..0000000 --- a/components/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceCallConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.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/99fa4687/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 index e007e51..0cd76bb 100644 --- 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 @@ -17,6 +17,7 @@ package org.apache.camel.spring.cloud.netflix; import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.junit.Assert; import org.junit.Test; @@ -25,6 +26,8 @@ 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.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -35,7 +38,7 @@ import org.springframework.test.context.junit4.SpringRunner; classes = { CamelAutoConfiguration.class, CamelCloudNetflixAutoConfiguration.class, - CamelCloudNetflixServiceCallConfiguration.class, + CamelCloudNetflixServiceCallTest.TestConfiguration.class, RibbonClientConfiguration.class, }, properties = { @@ -57,5 +60,34 @@ public class CamelCloudNetflixServiceCallTest { Assert.assertEquals("9090", template.requestBody("direct:start", null, String.class)); Assert.assertEquals("9092", template.requestBody("direct:start", null, String.class)); } + + // *********************************************** + // Configuration + // *********************************************** + + @Configuration + public static class TestConfiguration { + @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"); + } + }; + } + } }
