CAMEL-10186: Update the core-starter and removed grape
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a9cba93 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a9cba93 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a9cba93 Branch: refs/heads/master Commit: 2a9cba936078a037988e7a308d8cbdb1d09ee45d Parents: 00f86ec Author: Nicola Ferraro <[email protected]> Authored: Tue Nov 8 12:51:48 2016 +0100 Committer: Nicola Ferraro <[email protected]> Committed: Tue Nov 8 13:50:18 2016 +0100 ---------------------------------------------------------------------- .../BeanComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../ClassComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../BindingNameComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../BrowseComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../ControlBusComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../DataFormatComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../DataSetComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../FileComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../LanguageComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../MockComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../RefComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../RestApiComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../TestComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../TimerComponentAutoConfiguration.java | 43 ++++++++++++++++++++ .../main/resources/META-INF/spring.factories | 40 +++++++----------- .../grape/springboot/GrapeEndpoint.java | 43 -------------------- .../main/resources/META-INF/spring.factories | 19 --------- .../SpringBootAutoConfigurationMojo.java | 18 +++++--- 18 files changed, 630 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java new file mode 100644 index 0000000..3df9ef6 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.bean.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.bean.BeanComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class BeanComponentAutoConfiguration { + + @Bean(name = "bean-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(BeanComponent.class) + public BeanComponent configureBeanComponent(CamelContext camelContext) + throws Exception { + BeanComponent component = new BeanComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java new file mode 100644 index 0000000..4489916 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.beanclass.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.beanclass.ClassComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class ClassComponentAutoConfiguration { + + @Bean(name = "class-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(ClassComponent.class) + public ClassComponent configureClassComponent(CamelContext camelContext) + throws Exception { + ClassComponent component = new ClassComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/binding/springboot/BindingNameComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/binding/springboot/BindingNameComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/binding/springboot/BindingNameComponentAutoConfiguration.java new file mode 100644 index 0000000..f72bb24 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/binding/springboot/BindingNameComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.binding.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.binding.BindingNameComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class BindingNameComponentAutoConfiguration { + + @Bean(name = "binding-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(BindingNameComponent.class) + public BindingNameComponent configureBindingNameComponent( + CamelContext camelContext) throws Exception { + BindingNameComponent component = new BindingNameComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java new file mode 100644 index 0000000..d5d7110 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.browse.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.browse.BrowseComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class BrowseComponentAutoConfiguration { + + @Bean(name = "browse-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(BrowseComponent.class) + public BrowseComponent configureBrowseComponent(CamelContext camelContext) + throws Exception { + BrowseComponent component = new BrowseComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java new file mode 100644 index 0000000..a542c5c --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.controlbus.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.controlbus.ControlBusComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class ControlBusComponentAutoConfiguration { + + @Bean(name = "controlbus-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(ControlBusComponent.class) + public ControlBusComponent configureControlBusComponent( + CamelContext camelContext) throws Exception { + ControlBusComponent component = new ControlBusComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java new file mode 100644 index 0000000..7eb9dcb --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.dataformat.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.dataformat.DataFormatComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class DataFormatComponentAutoConfiguration { + + @Bean(name = "dataformat-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(DataFormatComponent.class) + public DataFormatComponent configureDataFormatComponent( + CamelContext camelContext) throws Exception { + DataFormatComponent component = new DataFormatComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java new file mode 100644 index 0000000..4cc1e21 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.dataset.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.dataset.DataSetComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class DataSetComponentAutoConfiguration { + + @Bean(name = "dataset-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(DataSetComponent.class) + public DataSetComponent configureDataSetComponent(CamelContext camelContext) + throws Exception { + DataSetComponent component = new DataSetComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java new file mode 100644 index 0000000..22c68c8 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.file.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.file.FileComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class FileComponentAutoConfiguration { + + @Bean(name = "file-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(FileComponent.class) + public FileComponent configureFileComponent(CamelContext camelContext) + throws Exception { + FileComponent component = new FileComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java new file mode 100644 index 0000000..147fc86 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.language.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.language.LanguageComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class LanguageComponentAutoConfiguration { + + @Bean(name = "language-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(LanguageComponent.class) + public LanguageComponent configureLanguageComponent( + CamelContext camelContext) throws Exception { + LanguageComponent component = new LanguageComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java new file mode 100644 index 0000000..59e446c --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.mock.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.mock.MockComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class MockComponentAutoConfiguration { + + @Bean(name = "mock-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(MockComponent.class) + public MockComponent configureMockComponent(CamelContext camelContext) + throws Exception { + MockComponent component = new MockComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java new file mode 100644 index 0000000..b5bac96 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.ref.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.ref.RefComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class RefComponentAutoConfiguration { + + @Bean(name = "ref-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(RefComponent.class) + public RefComponent configureRefComponent(CamelContext camelContext) + throws Exception { + RefComponent component = new RefComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java new file mode 100644 index 0000000..8501654 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.rest.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.rest.RestApiComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class RestApiComponentAutoConfiguration { + + @Bean(name = "rest-api-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(RestApiComponent.class) + public RestApiComponent configureRestApiComponent(CamelContext camelContext) + throws Exception { + RestApiComponent component = new RestApiComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/test/springboot/TestComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/test/springboot/TestComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/test/springboot/TestComponentAutoConfiguration.java new file mode 100644 index 0000000..5088f26 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/test/springboot/TestComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.test.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.test.TestComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class TestComponentAutoConfiguration { + + @Bean(name = "test-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(TestComponent.class) + public TestComponent configureTestComponent(CamelContext camelContext) + throws Exception { + TestComponent component = new TestComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java new file mode 100644 index 0000000..ef0c248 --- /dev/null +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.timer.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.timer.TimerComponent; +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; +import org.springframework.context.annotation.Configuration; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") +public class TimerComponentAutoConfiguration { + + @Bean(name = "timer-component") + @ConditionalOnClass(CamelContext.class) + @ConditionalOnMissingBean(TimerComponent.class) + public TimerComponent configureTimerComponent(CamelContext camelContext) + throws Exception { + TimerComponent component = new TimerComponent(); + component.setCamelContext(camelContext); + return component; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories index 563f83b..a42ae0c 100644 --- a/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories +++ b/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories @@ -40,28 +40,18 @@ org.apache.camel.language.simple.springboot.FileLanguageAutoConfiguration,\ org.apache.camel.language.property.springboot.ExchangePropertyLanguageAutoConfiguration,\ org.apache.camel.language.tokenizer.springboot.TokenizeLanguageAutoConfiguration,\ org.apache.camel.language.tokenizer.springboot.XMLTokenizeLanguageAutoConfiguration,\ -org.apache.camel.component.rest.springboot.RestComponentAutoConfiguration - - - - - - - - - - - - - - - - - - - - - - - - +org.apache.camel.component.rest.springboot.RestComponentAutoConfiguration,\ +org.apache.camel.component.ref.springboot.RefComponentAutoConfiguration,\ +org.apache.camel.component.controlbus.springboot.ControlBusComponentAutoConfiguration,\ +org.apache.camel.component.mock.springboot.MockComponentAutoConfiguration,\ +org.apache.camel.component.browse.springboot.BrowseComponentAutoConfiguration,\ +org.apache.camel.component.language.springboot.LanguageComponentAutoConfiguration,\ +org.apache.camel.component.file.springboot.FileComponentAutoConfiguration,\ +org.apache.camel.component.timer.springboot.TimerComponentAutoConfiguration,\ +org.apache.camel.component.test.springboot.TestComponentAutoConfiguration,\ +org.apache.camel.component.beanclass.springboot.ClassComponentAutoConfiguration,\ +org.apache.camel.component.dataset.springboot.DataSetComponentAutoConfiguration,\ +org.apache.camel.component.binding.springboot.BindingNameComponentAutoConfiguration,\ +org.apache.camel.component.bean.springboot.BeanComponentAutoConfiguration,\ +org.apache.camel.component.dataformat.springboot.DataFormatComponentAutoConfiguration,\ +org.apache.camel.component.rest.springboot.RestApiComponentAutoConfiguration http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeEndpoint.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeEndpoint.java b/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeEndpoint.java deleted file mode 100644 index e8e4416..0000000 --- a/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeEndpoint.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.grape.springboot; - -import org.apache.camel.CamelContext; -import org.apache.camel.component.grape.GrapeEndpoint; -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; -import org.springframework.context.annotation.Configuration; - -/** - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@Configuration -@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") -public class GrapeEndpoint { - - @Bean(name = "grape-component") - @ConditionalOnClass(CamelContext.class) - @ConditionalOnMissingBean(GrapeEndpoint.class) - public GrapeEndpoint configureGrapeEndpoint(CamelContext camelContext) - throws Exception { - GrapeEndpoint component = new GrapeEndpoint(); - component.setCamelContext(camelContext); - return component; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/components-starter/camel-grape-starter/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/components-starter/camel-grape-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-grape-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f8c8601..0000000 --- a/components-starter/camel-grape-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.camel.component.grape.springboot.GrapeEndpoint http://git-wip-us.apache.org/repos/asf/camel/blob/2a9cba93/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index def3966..beff764 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -26,6 +26,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -116,6 +117,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { PRIMITIVEMAP.put("float", "java.lang.Float"); } + private static final String[] IGNORE_MODULES = { /* Non-standard -> */ "camel-grape"}; + /** * The maven project. * @@ -141,8 +144,13 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { - // Spring-boot configuration has been moved on starters + // Do not generate code for ignored module + if (Arrays.asList(IGNORE_MODULES).contains(project.getArtifactId())) { + getLog().info("Component auto-configuration will not be created: component contained in the ignore list"); + return; + } + // Spring-boot configuration has been moved on starters File starterDir = SpringBootHelper.starterDir(baseDir, project.getArtifactId()); if (!starterDir.exists() || !(new File(starterDir, "pom.xml").exists())) { // If the starter does not exist, no configuration can be created @@ -226,11 +234,11 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { } // Group the models by implementing classes - Map<String, List<DataFormatModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType())); + Map<String, List<DataFormatModel>> grModels = allModels.stream().collect(Collectors.groupingBy(DataFormatModel::getJavaType)); for (String dataFormatClass : grModels.keySet()) { List<DataFormatModel> dfModels = grModels.get(dataFormatClass); DataFormatModel model = dfModels.get(0); // They should be equivalent - List<String> aliases = dfModels.stream().map(m -> m.getName()).sorted().collect(Collectors.toList()); + List<String> aliases = dfModels.stream().map(DataFormatModel::getName).sorted().collect(Collectors.toList()); boolean hasOptions = !model.getDataFormatOptions().isEmpty(); @@ -276,11 +284,11 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { } // Group the models by implementing classes - Map<String, List<LanguageModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType())); + Map<String, List<LanguageModel>> grModels = allModels.stream().collect(Collectors.groupingBy(LanguageModel::getJavaType)); for (String languageClass : grModels.keySet()) { List<LanguageModel> dfModels = grModels.get(languageClass); LanguageModel model = dfModels.get(0); // They should be equivalent - List<String> aliases = dfModels.stream().map(m -> m.getName()).sorted().collect(Collectors.toList()); + List<String> aliases = dfModels.stream().map(LanguageModel::getName).sorted().collect(Collectors.toList()); boolean hasOptions = !model.getLanguageOptions().isEmpty();
