CAMEL-10412: Camel Spring Boot auto configuration depends on bean CamelAutoConfiguration which makes it easier to turn Camel autoconfiguration off when writing tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70f29ced Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70f29ced Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70f29ced Branch: refs/heads/master Commit: 70f29ced5d57d672d761796e3871564c7eaffe23 Parents: d8edc02 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Oct 29 21:41:47 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Oct 29 21:41:47 2016 +0200 ---------------------------------------------------------------------- .../health/CamelHealthAutoConfiguration.java | 2 + .../org/apache/camel/spring/boot/PlainTest.java | 52 ++++++++++++++++++++ 2 files changed, 54 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/70f29ced/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/CamelHealthAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/CamelHealthAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/CamelHealthAutoConfiguration.java index 2c96626..3f691c3 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/CamelHealthAutoConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/CamelHealthAutoConfiguration.java @@ -20,6 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -27,6 +28,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionalOnClass({HealthIndicator.class}) +@ConditionalOnBean(CamelAutoConfiguration.class) @AutoConfigureAfter(CamelAutoConfiguration.class) public class CamelHealthAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/70f29ced/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java new file mode 100644 index 0000000..d138398 --- /dev/null +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.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.boot; + +import org.apache.camel.CamelContext; +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.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PlainTest { + + @Autowired + ApplicationContext applicationContext; + + @Autowired(required = false) + CamelContext camelContext; + + // turn off Camel auto configuration which should not inject a CamelContext + @Configuration + @EnableAutoConfiguration(exclude = CamelAutoConfiguration.class) + public static class MyConfiguration { + // empty + } + + @Test + public void testPlain() { + Assert.assertNull("Should not auto configure CamelContext", camelContext); + Assert.assertEquals("Should not auto configure CamelAutoConfiguration", 0, applicationContext.getBeanNamesForType(CamelAutoConfiguration.class).length); + } +}
