You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/11/26 08:46:11 UTC
[camel-spring-boot] 01/03: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ffae772cf34d9d73af01a1bc30f7b854149a65db
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Nov 26 09:15:37 2020 +0100
Regen
---
components-starter/camel-corda-starter/pom.xml | 8 ---
.../src/main/docs/core-starter.adoc | 4 +-
.../CSimpleLanguageAutoConfiguration.java | 80 ++++++++++++++++++++++
.../springboot/CSimpleLanguageConfiguration.java | 52 ++++++++++++++
.../src/main/resources/META-INF/spring.factories | 4 +-
components-starter/camel-iota-starter/pom.xml | 12 ----
docs/modules/ROOT/pages/core-starter.adoc | 4 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 ++
8 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index 252daab..5ad677a 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,14 +41,6 @@
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-core-starter/src/main/docs/core-starter.adoc b/components-starter/camel-core-starter/src/main/docs/core-starter.adoc
index 35e2782..afa6a40 100644
--- a/components-starter/camel-core-starter/src/main/docs/core-starter.adoc
+++ b/components-starter/camel-core-starter/src/main/docs/core-starter.adoc
@@ -17,7 +17,7 @@ When using core with Spring Boot make sure to use the following Maven dependency
----
-The component supports 145 options, which are listed below.
+The component supports 147 options, which are listed below.
@@ -114,6 +114,8 @@ The component supports 145 options, which are listed below.
| *camel.hystrix.thread-pool-rolling-number-statistical-window-in-milliseconds* | Duration of statistical rolling window in milliseconds. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance. | 10000 | Integer
| *camel.language.constant.enabled* | Whether to enable auto configuration of the constant language. This is enabled by default. | | Boolean
| *camel.language.constant.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
+| *camel.language.csimple.enabled* | Whether to enable auto configuration of the csimple language. This is enabled by default. | | Boolean
+| *camel.language.csimple.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
| *camel.language.exchangeproperty.enabled* | Whether to enable auto configuration of the exchangeProperty language. This is enabled by default. | | Boolean
| *camel.language.exchangeproperty.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
| *camel.language.file.enabled* | Whether to enable auto configuration of the file language. This is enabled by default. | | Boolean
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java
new file mode 100644
index 0000000..490a400
--- /dev/null
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java
@@ -0,0 +1,80 @@
+/*
+ * 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.language.csimple.springboot;
+
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.language.csimple.CSimpleLanguage;
+import org.apache.camel.spi.Language;
+import org.apache.camel.spi.LanguageCustomizer;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.LanguageConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.convert.ApplicationConversionService;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
+@Configuration(proxyBeanMethods = false)
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
+@EnableConfigurationProperties({LanguageConfigurationProperties.class,CSimpleLanguageConfiguration.class})
+@ConditionalOnHierarchicalProperties({"camel.language", "camel.language.csimple"})
+public class CSimpleLanguageAutoConfiguration {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+ private final CamelContext camelContext;
+ @Autowired
+ private CSimpleLanguageConfiguration configuration;
+
+ public CSimpleLanguageAutoConfiguration(
+ org.apache.camel.CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Lazy
+ @Bean
+ public org.apache.camel.spi.LanguageCustomizer configureCSimpleLanguage() {
+ return new LanguageCustomizer() {
+ @Override
+ public void configure(String name, Language target) {
+ CamelPropertiesHelper.copyProperties(camelContext, configuration, target);
+ }
+ @Override
+ public boolean isEnabled(String name, Language target) {
+ return HierarchicalPropertiesEvaluator.evaluate(
+ applicationContext,
+ "camel.language.customizer",
+ "camel.language.csimple.customizer")
+ && target instanceof CSimpleLanguage;
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageConfiguration.java
new file mode 100644
index 0000000..887727d
--- /dev/null
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageConfiguration.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.language.csimple.springboot;
+
+import javax.annotation.Generated;
+import org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Evaluate a compile simple expression language.
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.language.csimple")
+public class CSimpleLanguageConfiguration
+ extends
+ LanguageConfigurationPropertiesCommon {
+
+ /**
+ * Whether to enable auto configuration of the csimple language. This is
+ * enabled by default.
+ */
+ private Boolean enabled;
+ /**
+ * Whether to trim the value to remove leading and trailing whitespaces and
+ * line breaks
+ */
+ private Boolean trim = true;
+
+ public Boolean getTrim() {
+ return trim;
+ }
+
+ public void setTrim(Boolean trim) {
+ this.trim = trim;
+ }
+}
\ No newline at end of file
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 c1c2bbc..4a6b869 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
@@ -22,4 +22,6 @@ org.apache.camel.language.ref.springboot.RefLanguageAutoConfiguration,\
org.apache.camel.language.simple.springboot.FileLanguageAutoConfiguration,\
org.apache.camel.language.simple.springboot.SimpleLanguageAutoConfiguration,\
org.apache.camel.language.tokenizer.springboot.TokenizeLanguageAutoConfiguration,\
-org.apache.camel.model.rest.springboot.RestConfigurationDefinitionAutoConfiguration
+org.apache.camel.model.rest.springboot.RestConfigurationDefinitionAutoConfiguration,\
+org.apache.camel.language.csimple.springboot.CSimpleLanguageAutoConfiguration
+
diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml
index 0f60048..a8484cc 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/core-starter.adoc b/docs/modules/ROOT/pages/core-starter.adoc
index 35e2782..afa6a40 100644
--- a/docs/modules/ROOT/pages/core-starter.adoc
+++ b/docs/modules/ROOT/pages/core-starter.adoc
@@ -17,7 +17,7 @@ When using core with Spring Boot make sure to use the following Maven dependency
----
-The component supports 145 options, which are listed below.
+The component supports 147 options, which are listed below.
@@ -114,6 +114,8 @@ The component supports 145 options, which are listed below.
| *camel.hystrix.thread-pool-rolling-number-statistical-window-in-milliseconds* | Duration of statistical rolling window in milliseconds. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance. | 10000 | Integer
| *camel.language.constant.enabled* | Whether to enable auto configuration of the constant language. This is enabled by default. | | Boolean
| *camel.language.constant.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
+| *camel.language.csimple.enabled* | Whether to enable auto configuration of the csimple language. This is enabled by default. | | Boolean
+| *camel.language.csimple.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
| *camel.language.exchangeproperty.enabled* | Whether to enable auto configuration of the exchangeProperty language. This is enabled by default. | | Boolean
| *camel.language.exchangeproperty.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
| *camel.language.file.enabled* | Whether to enable auto configuration of the file language. This is enabled by default. | | Boolean
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 3cf8900..8d3867c 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2509,6 +2509,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-csimple-joor</artifactId>
+ <version>3.7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-csv</artifactId>
<version>3.7.0-SNAPSHOT</version>
</dependency>