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 2018/07/19 13:06:09 UTC
[camel] branch master updated: CAMEL-12667: spring boot starters -
Turn of options with @NestedConfigurationProperty in generated auto
configuration source.
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.git
The following commit(s) were added to refs/heads/master by this push:
new a979ced CAMEL-12667: spring boot starters - Turn of options with @NestedConfigurationProperty in generated auto configuration source.
a979ced is described below
commit a979ced575d94841f196ce47a153d07f307269fb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 19 15:05:29 2018 +0200
CAMEL-12667: spring boot starters - Turn of options with @NestedConfigurationProperty in generated auto configuration source.
---
.../box/springboot/BoxComponentConfiguration.java | 2 --
.../springboot/CacheComponentConfiguration.java | 3 --
.../springboot/ConsulComponentConfiguration.java | 2 --
.../DigitalSignatureComponentConfiguration.java | 2 --
.../springboot/EtcdComponentConfiguration.java | 2 --
.../jms/springboot/JmsComponentConfiguration.java | 2 --
.../springboot/KafkaComponentConfiguration.java | 2 --
.../springboot/MailComponentConfiguration.java | 2 --
.../springboot/Mina2ComponentConfiguration.java | 2 --
.../springboot/NettyComponentConfiguration.java | 2 --
.../springboot/NettyComponentConfiguration.java | 2 --
.../springboot/Olingo2ComponentConfiguration.java | 2 --
.../springboot/Olingo4ComponentConfiguration.java | 2 --
.../SalesforceComponentConfiguration.java | 5 ---
.../ServiceNowComponentConfiguration.java | 2 --
.../springboot/StompComponentConfiguration.java | 2 --
.../WordpressComponentConfiguration.java | 2 --
.../packaging/SpringBootAutoConfigurationMojo.java | 41 ++++++++++++++--------
18 files changed, 26 insertions(+), 53 deletions(-)
diff --git a/platforms/spring-boot/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConfiguration.java
index fc839cf..4c10922 100644
--- a/platforms/spring-boot/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConfiguration.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* For uploading downloading and managing files folders groups collaborations
@@ -131,7 +130,6 @@ public class BoxComponentConfiguration
/**
* To configure security using SSLContextParameters.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Custom Access Token Cache for storing and retrieving access tokens.
diff --git a/platforms/spring-boot/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentConfiguration.java
index 226da4f..4e187e3 100644
--- a/platforms/spring-boot/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentConfiguration.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.cache.CacheLoaderRegistry;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The cache component enables you to perform caching operations using EHCache
@@ -151,12 +150,10 @@ public class CacheComponentConfiguration
/**
* To configure event listeners using the CacheEventListenerRegistry
*/
- @NestedConfigurationProperty
private CacheEventListenerRegistry eventListenerRegistry;
/**
* To configure cache loader using the CacheLoaderRegistry
*/
- @NestedConfigurationProperty
private CacheLoaderRegistry cacheLoaderRegistry;
/**
* Whether to turn on allowing to store non serializable objects in the
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
index c06791a..65196ec 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
@@ -26,7 +26,6 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The camel consul component allows you to work with Consul, a distributed,
@@ -216,7 +215,6 @@ public class ConsulComponentConfiguration
* SSL configuration using an
* org.apache.camel.util.jsse.SSLContextParameters instance.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Sets the ACL token to be used with Consul
diff --git a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
index 932a61e..f5d9bee 100644
--- a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.crypto.CryptoOperation;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The crypto component is used for signing and verifying exchanges using the
@@ -149,7 +148,6 @@ public class DigitalSignatureComponentConfiguration
* and there is only a single entry in the Keystore, then this single
* entry will be used.
*/
- @NestedConfigurationProperty
private KeyStoreParameters keyStoreParameters;
/**
* Set the SecureRandom used to initialize the Signature service
diff --git a/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
index aea1d75..c7e7062 100644
--- a/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
@@ -20,7 +20,6 @@ import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The camel etcd component allows you to work with Etcd, a distributed reliable
@@ -139,7 +138,6 @@ public class EtcdComponentConfiguration
/**
* To configure security using SSLContextParameters.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* The user name to use for basic authentication.
diff --git a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index c75206b..45836ec 100644
--- a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -32,7 +32,6 @@ import org.apache.camel.component.jms.ReplyToType;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.support.converter.MessageConverter;
@@ -1631,7 +1630,6 @@ public class JmsComponentConfiguration
* this is not required and Camel will auto-detect the provider metadata
* from the underlying provider.
*/
- @NestedConfigurationProperty
private JmsProviderMetadata providerMetadata;
/**
* Sets the {@link JmsOperations} used to deduce the
diff --git a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index d01f829..3419d1b 100644
--- a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.camel.spi.StateRepository;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The kafka component allows messages to be sent to (or consumed from) Apache
@@ -450,7 +449,6 @@ public class KafkaComponentConfiguration
* SSL configuration using a Camel SSLContextParameters object. If
* configured it's applied before the other SSL endpoint parameters.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* The password of the private key in the key store file. This is
diff --git a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
index 16b60fd..cb4f540 100644
--- a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.mail.JavaMailSender;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* To send or receive emails using imap/pop3 or smtp protocols.
@@ -265,7 +264,6 @@ public class MailComponentConfiguration
/**
* To configure security using SSLContextParameters.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* After processing a mail message, it can be copied to a mail folder
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
index d30f139..5090bab 100644
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Socket level networking using TCP or UDP with the Apache Mina 2.x library.
@@ -198,7 +197,6 @@ public class Mina2ComponentConfiguration
/**
* To configure SSL security.
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Whether to auto start SSL handshake.
diff --git a/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index 405a4caa..53f5af4 100644
--- a/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -35,7 +35,6 @@ import org.jboss.netty.channel.socket.nio.WorkerPool;
import org.jboss.netty.handler.ssl.SslHandler;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Socket level networking using TCP or UDP with the Netty 3.x library.
@@ -377,7 +376,6 @@ public class NettyComponentConfiguration
/**
* To configure security using SSLContextParameters
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Configures whether the server needs client authentication when using
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
index 10f8799..7917d64 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
@@ -35,7 +35,6 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Socket level networking using TCP or UDP with the Netty 4.x library.
@@ -426,7 +425,6 @@ public class NettyComponentConfiguration
/**
* To configure security using SSLContextParameters
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Configures whether the server needs client authentication when using
diff --git a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
index 556bd3d..39063e3 100644
--- a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.http.HttpHost;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Communicates with OData 2.0 services using Apache Olingo.
@@ -126,7 +125,6 @@ public class Olingo2ComponentConfiguration
/**
* To configure security using SSLContextParameters
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Custom HTTP async client builder for more complex HTTP client
diff --git a/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
index 510643c..61356c5 100644
--- a/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.http.HttpHost;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Communicates with OData 4.0 services using Apache Olingo OData API.
@@ -126,7 +125,6 @@ public class Olingo4ComponentConfiguration
/**
* To configure security using SSLContextParameters
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* Custom HTTP async client builder for more complex HTTP client
diff --git a/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 6aa02b2..21fe358 100644
--- a/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -33,7 +33,6 @@ import org.apache.camel.component.salesforce.internal.dto.NotifyForOperationsEnu
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The salesforce component is used for integrating Camel with the massive
@@ -473,7 +472,6 @@ public class SalesforceComponentConfiguration
* Keystore parameters for keystore containing certificate and private
* key needed for OAuth 2.0 JWT Bearer Token Flow.
*/
- @NestedConfigurationProperty
private KeyStoreParameters keystore;
/**
* Salesforce connected application Consumer token
@@ -652,7 +650,6 @@ public class SalesforceComponentConfiguration
*
* @param approval
*/
- @NestedConfigurationProperty
private ApprovalRequest approval;
/**
* Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV
@@ -712,7 +709,6 @@ public class SalesforceComponentConfiguration
/**
* Salesforce1 Analytics report metadata for filtering
*/
- @NestedConfigurationProperty
private ReportMetadata reportMetadata;
/**
* Salesforce1 Analytics report execution instance ID
@@ -721,7 +717,6 @@ public class SalesforceComponentConfiguration
/**
* Custom Jetty Http Client to use to connect to Salesforce.
*/
- @NestedConfigurationProperty
private SalesforceHttpClient httpClient;
/**
* Custom Jackson ObjectMapper to use when serializing/deserializing
diff --git a/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
index 832eabb..0088f02 100644
--- a/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
@@ -26,7 +26,6 @@ import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The servicenow component is used to integrate Camel with ServiceNow cloud
@@ -378,7 +377,6 @@ public class ServiceNowComponentConfiguration
* To configure security using SSLContextParameters. See
* http://camel.apache.org/camel-configuration-utilities.html
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
* To configure http-client
diff --git a/platforms/spring-boot/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
index c512628..fa51b8f 100644
--- a/platforms/spring-boot/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
@@ -20,7 +20,6 @@ import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* The stomp component is used for communicating with Stomp compliant message
@@ -164,7 +163,6 @@ public class StompComponentConfiguration
/**
* To configure security using SSLContextParameters
*/
- @NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
public String getBrokerURL() {
diff --git a/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
index ad44dd4..b14b35e 100644
--- a/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
@@ -21,7 +21,6 @@ import javax.annotation.Generated;
import org.apache.camel.component.wordpress.api.model.SearchCriteria;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Integrates Camel with Wordpress.
@@ -94,7 +93,6 @@ public class WordpressComponentConfiguration
* Whether to bypass trash and force deletion.
*/
private Boolean force = false;
- @NestedConfigurationProperty
private SearchCriteria searchCriteria;
private Map criteriaProperties;
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 89b701a..d409a87 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
@@ -119,6 +119,13 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
*/
private static final Pattern INCLUDE_INNER_PATTERN = Pattern.compile("org\\.apache\\.camel\\..*");
+ /**
+ * Whether to enable adding @NestedConfigurationProperty annotations to options.
+ * This is disabled as the generated options likely is not configurable as plain POJOs
+ * and there is also no documentation for each of the generated options.
+ */
+ private static final boolean ADD_NESTED_CONFIGURATION_PROPERTY = false;
+
private static final Map<String, String> PRIMITIVEMAP;
static {
@@ -746,13 +753,15 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
PropertySource<JavaClassSource> prop = javaClass.addProperty(type, option.getName());
- if (!type.endsWith(INNER_TYPE_SUFFIX)
- && type.indexOf('[') == -1
- && INCLUDE_INNER_PATTERN.matcher(type).matches()
- && Strings.isBlank(option.getEnums())
- && (javaClassSource == null || (javaClassSource.isClass() && !javaClassSource.isAbstract()))) {
- // add nested configuration annotation for complex properties
- prop.getField().addAnnotation(NestedConfigurationProperty.class);
+ if (ADD_NESTED_CONFIGURATION_PROPERTY) {
+ if (!type.endsWith(INNER_TYPE_SUFFIX)
+ && type.indexOf('[') == -1
+ && INCLUDE_INNER_PATTERN.matcher(type).matches()
+ && Strings.isBlank(option.getEnums())
+ && (javaClassSource == null || (javaClassSource.isClass() && !javaClassSource.isAbstract()))) {
+ // add nested configuration annotation for complex properties
+ prop.getField().addAnnotation(NestedConfigurationProperty.class);
+ }
}
if ("true".equals(option.getDeprecated())) {
prop.getField().addAnnotation(Deprecated.class);
@@ -827,14 +836,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
// add nested configuration annotation for complex properties
- if (INCLUDE_INNER_PATTERN.matcher(optionType).matches()
- && !propType.isArray()
- && !anEnum
- && optionClass != null
- && !optionClass.isInterface()
- && !optionClass.isAnnotation()
- && !Modifier.isAbstract(optionClass.getModifiers())) {
- prop.getField().addAnnotation(NestedConfigurationProperty.class);
+ if (ADD_NESTED_CONFIGURATION_PROPERTY) {
+ if (INCLUDE_INNER_PATTERN.matcher(optionType).matches()
+ && !propType.isArray()
+ && !anEnum
+ && optionClass != null
+ && !optionClass.isInterface()
+ && !optionClass.isAnnotation()
+ && !Modifier.isAbstract(optionClass.getModifiers())) {
+ prop.getField().addAnnotation(NestedConfigurationProperty.class);
+ }
}
if (sourceProp.hasAnnotation(Deprecated.class)) {
prop.getField().addAnnotation(Deprecated.class);