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/09/21 19:01:16 UTC

[camel] 02/02: CAMEL-15553: Source code generator for configurer classes should support multiple configuration classes when end users extend out of the box components. Thanks to Vladimir Dobos for reporting and reproducer.

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

commit 63d34b72c99061496e16ec5238e60b295d55d98d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 21 20:59:33 2020 +0200

    CAMEL-15553: Source code generator for configurer classes should support multiple configuration classes when end users extend out of the box components. Thanks to Vladimir Dobos for reporting and reproducer.
---
 .../lucene/LuceneComponentConfigurer.java          |  18 +--
 .../salesforce/SalesforceComponentConfigurer.java  | 154 ++++++++++-----------
 .../xmlsecurity/XmlSignerComponentConfigurer.java  | 106 +++++++-------
 .../XmlVerifierComponentConfigurer.java            |  66 ++++-----
 4 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneComponentConfigurer.java b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneComponentConfigurer.java
index 605b658..ce7b28d 100644
--- a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneComponentConfigurer.java
+++ b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneComponentConfigurer.java
@@ -15,7 +15,7 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class LuceneComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private org.apache.camel.component.lucene.LuceneConfiguration getOrCreateConfiguration(LuceneComponent target) {
+    private org.apache.camel.component.lucene.LuceneConfiguration getOrCreateConfig(LuceneComponent target) {
         if (target.getConfig() == null) {
             target.setConfig(new org.apache.camel.component.lucene.LuceneConfiguration());
         }
@@ -26,18 +26,18 @@ public class LuceneComponentConfigurer extends PropertyConfigurerSupport impleme
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         LuceneComponent target = (LuceneComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "analyzer": getOrCreateConfiguration(target).setAnalyzer(property(camelContext, org.apache.lucene.analysis.Analyzer.class, value)); return true;
+        case "analyzer": getOrCreateConfig(target).setAnalyzer(property(camelContext, org.apache.lucene.analysis.Analyzer.class, value)); return true;
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "config": target.setConfig(property(camelContext, org.apache.camel.component.lucene.LuceneConfiguration.class, value)); return true;
         case "indexdir":
-        case "indexDir": getOrCreateConfiguration(target).setIndexDir(property(camelContext, java.io.File.class, value)); return true;
+        case "indexDir": getOrCreateConfig(target).setIndexDir(property(camelContext, java.io.File.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "maxhits":
-        case "maxHits": getOrCreateConfiguration(target).setMaxHits(property(camelContext, int.class, value)); return true;
+        case "maxHits": getOrCreateConfig(target).setMaxHits(property(camelContext, int.class, value)); return true;
         case "srcdir":
-        case "srcDir": getOrCreateConfiguration(target).setSrcDir(property(camelContext, java.io.File.class, value)); return true;
+        case "srcDir": getOrCreateConfig(target).setSrcDir(property(camelContext, java.io.File.class, value)); return true;
         default: return false;
         }
     }
@@ -59,18 +59,18 @@ public class LuceneComponentConfigurer extends PropertyConfigurerSupport impleme
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         LuceneComponent target = (LuceneComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "analyzer": return getOrCreateConfiguration(target).getAnalyzer();
+        case "analyzer": return getOrCreateConfig(target).getAnalyzer();
         case "basicpropertybinding":
         case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "config": return target.getConfig();
         case "indexdir":
-        case "indexDir": return getOrCreateConfiguration(target).getIndexDir();
+        case "indexDir": return getOrCreateConfig(target).getIndexDir();
         case "lazystartproducer":
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "maxhits":
-        case "maxHits": return getOrCreateConfiguration(target).getMaxHits();
+        case "maxHits": return getOrCreateConfig(target).getMaxHits();
         case "srcdir":
-        case "srcDir": return getOrCreateConfiguration(target).getSrcDir();
+        case "srcDir": return getOrCreateConfig(target).getSrcDir();
         default: return null;
         }
     }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java
index d239777..3b718c8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java
@@ -15,7 +15,7 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SalesforceComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private org.apache.camel.component.salesforce.SalesforceEndpointConfig getOrCreateConfiguration(SalesforceComponent target) {
+    private org.apache.camel.component.salesforce.SalesforceEndpointConfig getOrCreateConfig(SalesforceComponent target) {
         if (target.getConfig() == null) {
             target.setConfig(new org.apache.camel.component.salesforce.SalesforceEndpointConfig());
         }
@@ -27,21 +27,21 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         SalesforceComponent target = (SalesforceComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apexmethod":
-        case "apexMethod": getOrCreateConfiguration(target).setApexMethod(property(camelContext, java.lang.String.class, value)); return true;
+        case "apexMethod": getOrCreateConfig(target).setApexMethod(property(camelContext, java.lang.String.class, value)); return true;
         case "apexqueryparams":
-        case "apexQueryParams": getOrCreateConfiguration(target).setApexQueryParams(property(camelContext, java.util.Map.class, value)); return true;
+        case "apexQueryParams": getOrCreateConfig(target).setApexQueryParams(property(camelContext, java.util.Map.class, value)); return true;
         case "apexurl":
-        case "apexUrl": getOrCreateConfiguration(target).setApexUrl(property(camelContext, java.lang.String.class, value)); return true;
+        case "apexUrl": getOrCreateConfig(target).setApexUrl(property(camelContext, java.lang.String.class, value)); return true;
         case "apiversion":
-        case "apiVersion": getOrCreateConfiguration(target).setApiVersion(property(camelContext, java.lang.String.class, value)); return true;
+        case "apiVersion": getOrCreateConfig(target).setApiVersion(property(camelContext, java.lang.String.class, value)); return true;
         case "authenticationtype":
         case "authenticationType": target.setAuthenticationType(property(camelContext, org.apache.camel.component.salesforce.AuthenticationType.class, value)); return true;
         case "backoffincrement":
-        case "backoffIncrement": getOrCreateConfiguration(target).setBackoffIncrement(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
+        case "backoffIncrement": getOrCreateConfig(target).setBackoffIncrement(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "batchid":
-        case "batchId": getOrCreateConfiguration(target).setBatchId(property(camelContext, java.lang.String.class, value)); return true;
+        case "batchId": getOrCreateConfig(target).setBatchId(property(camelContext, java.lang.String.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "clientid":
@@ -50,12 +50,12 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "clientSecret": target.setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
         case "config": target.setConfig(property(camelContext, org.apache.camel.component.salesforce.SalesforceEndpointConfig.class, value)); return true;
         case "contenttype":
-        case "contentType": getOrCreateConfiguration(target).setContentType(property(camelContext, org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class, value)); return true;
+        case "contentType": getOrCreateConfig(target).setContentType(property(camelContext, org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class, value)); return true;
         case "defaultreplayid":
-        case "defaultReplayId": getOrCreateConfiguration(target).setDefaultReplayId(property(camelContext, java.lang.Long.class, value)); return true;
-        case "format": getOrCreateConfiguration(target).setFormat(property(camelContext, org.apache.camel.component.salesforce.internal.PayloadFormat.class, value)); return true;
+        case "defaultReplayId": getOrCreateConfig(target).setDefaultReplayId(property(camelContext, java.lang.Long.class, value)); return true;
+        case "format": getOrCreateConfig(target).setFormat(property(camelContext, org.apache.camel.component.salesforce.internal.PayloadFormat.class, value)); return true;
         case "httpclient":
-        case "httpClient": getOrCreateConfiguration(target).setHttpClient(property(camelContext, org.apache.camel.component.salesforce.SalesforceHttpClient.class, value)); return true;
+        case "httpClient": getOrCreateConfig(target).setHttpClient(property(camelContext, org.apache.camel.component.salesforce.SalesforceHttpClient.class, value)); return true;
         case "httpclientconnectiontimeout":
         case "httpClientConnectionTimeout": target.setHttpClientConnectionTimeout(property(camelContext, long.class, value)); return true;
         case "httpclientidletimeout":
@@ -87,21 +87,21 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "httpproxyusername":
         case "httpProxyUsername": target.setHttpProxyUsername(property(camelContext, java.lang.String.class, value)); return true;
         case "includedetails":
-        case "includeDetails": getOrCreateConfiguration(target).setIncludeDetails(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "includeDetails": getOrCreateConfig(target).setIncludeDetails(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "initialreplayidmap":
-        case "initialReplayIdMap": getOrCreateConfiguration(target).setInitialReplayIdMap(property(camelContext, java.util.Map.class, value)); return true;
+        case "initialReplayIdMap": getOrCreateConfig(target).setInitialReplayIdMap(property(camelContext, java.util.Map.class, value)); return true;
         case "instanceid":
-        case "instanceId": getOrCreateConfiguration(target).setInstanceId(property(camelContext, java.lang.String.class, value)); return true;
+        case "instanceId": getOrCreateConfig(target).setInstanceId(property(camelContext, java.lang.String.class, value)); return true;
         case "instanceurl":
         case "instanceUrl": target.setInstanceUrl(property(camelContext, java.lang.String.class, value)); return true;
         case "jobid":
-        case "jobId": getOrCreateConfiguration(target).setJobId(property(camelContext, java.lang.String.class, value)); return true;
+        case "jobId": getOrCreateConfig(target).setJobId(property(camelContext, java.lang.String.class, value)); return true;
         case "keystore": target.setKeystore(property(camelContext, org.apache.camel.support.jsse.KeyStoreParameters.class, value)); return true;
         case "lazylogin":
         case "lazyLogin": target.setLazyLogin(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "limit": getOrCreateConfiguration(target).setLimit(property(camelContext, java.lang.Integer.class, value)); return true;
+        case "limit": getOrCreateConfig(target).setLimit(property(camelContext, java.lang.Integer.class, value)); return true;
         case "loginconfig":
         case "loginConfig": target.setLoginConfig(property(camelContext, org.apache.camel.component.salesforce.SalesforceLoginConfig.class, value)); return true;
         case "loginurl":
@@ -109,57 +109,57 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "longpollingtransportproperties":
         case "longPollingTransportProperties": target.setLongPollingTransportProperties(property(camelContext, java.util.Map.class, value)); return true;
         case "maxbackoff":
-        case "maxBackoff": getOrCreateConfiguration(target).setMaxBackoff(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
+        case "maxBackoff": getOrCreateConfig(target).setMaxBackoff(property(camelContext, java.time.Duration.class, value).toMillis()); return true;
         case "notfoundbehaviour":
-        case "notFoundBehaviour": getOrCreateConfiguration(target).setNotFoundBehaviour(property(camelContext, org.apache.camel.component.salesforce.NotFoundBehaviour.class, value)); return true;
+        case "notFoundBehaviour": getOrCreateConfig(target).setNotFoundBehaviour(property(camelContext, org.apache.camel.component.salesforce.NotFoundBehaviour.class, value)); return true;
         case "notifyforfields":
-        case "notifyForFields": getOrCreateConfiguration(target).setNotifyForFields(property(camelContext, org.apache.camel.component.salesforce.internal.dto.NotifyForFieldsEnum.class, value)); return true;
+        case "notifyForFields": getOrCreateConfig(target).setNotifyForFields(property(camelContext, org.apache.camel.component.salesforce.internal.dto.NotifyForFieldsEnum.class, value)); return true;
         case "notifyforoperationcreate":
-        case "notifyForOperationCreate": getOrCreateConfiguration(target).setNotifyForOperationCreate(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "notifyForOperationCreate": getOrCreateConfig(target).setNotifyForOperationCreate(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "notifyforoperationdelete":
-        case "notifyForOperationDelete": getOrCreateConfiguration(target).setNotifyForOperationDelete(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "notifyForOperationDelete": getOrCreateConfig(target).setNotifyForOperationDelete(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "notifyforoperationundelete":
-        case "notifyForOperationUndelete": getOrCreateConfiguration(target).setNotifyForOperationUndelete(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "notifyForOperationUndelete": getOrCreateConfig(target).setNotifyForOperationUndelete(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "notifyforoperationupdate":
-        case "notifyForOperationUpdate": getOrCreateConfiguration(target).setNotifyForOperationUpdate(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "notifyForOperationUpdate": getOrCreateConfig(target).setNotifyForOperationUpdate(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "notifyforoperations":
-        case "notifyForOperations": getOrCreateConfiguration(target).setNotifyForOperations(property(camelContext, org.apache.camel.component.salesforce.internal.dto.NotifyForOperationsEnum.class, value)); return true;
+        case "notifyForOperations": getOrCreateConfig(target).setNotifyForOperations(property(camelContext, org.apache.camel.component.salesforce.internal.dto.NotifyForOperationsEnum.class, value)); return true;
         case "objectmapper":
-        case "objectMapper": getOrCreateConfiguration(target).setObjectMapper(property(camelContext, com.fasterxml.jackson.databind.ObjectMapper.class, value)); return true;
+        case "objectMapper": getOrCreateConfig(target).setObjectMapper(property(camelContext, com.fasterxml.jackson.databind.ObjectMapper.class, value)); return true;
         case "packages": target.setPackages(property(camelContext, java.lang.String.class, value)); return true;
         case "password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true;
         case "rawpayload":
-        case "rawPayload": getOrCreateConfiguration(target).setRawPayload(property(camelContext, boolean.class, value)); return true;
+        case "rawPayload": getOrCreateConfig(target).setRawPayload(property(camelContext, boolean.class, value)); return true;
         case "refreshtoken":
         case "refreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
         case "reportid":
-        case "reportId": getOrCreateConfiguration(target).setReportId(property(camelContext, java.lang.String.class, value)); return true;
+        case "reportId": getOrCreateConfig(target).setReportId(property(camelContext, java.lang.String.class, value)); return true;
         case "reportmetadata":
-        case "reportMetadata": getOrCreateConfiguration(target).setReportMetadata(property(camelContext, org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata.class, value)); return true;
+        case "reportMetadata": getOrCreateConfig(target).setReportMetadata(property(camelContext, org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata.class, value)); return true;
         case "resultid":
-        case "resultId": getOrCreateConfiguration(target).setResultId(property(camelContext, java.lang.String.class, value)); return true;
+        case "resultId": getOrCreateConfig(target).setResultId(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectblobfieldname":
-        case "sObjectBlobFieldName": getOrCreateConfiguration(target).setSObjectBlobFieldName(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectBlobFieldName": getOrCreateConfig(target).setSObjectBlobFieldName(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectclass":
-        case "sObjectClass": getOrCreateConfiguration(target).setSObjectClass(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectClass": getOrCreateConfig(target).setSObjectClass(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectfields":
-        case "sObjectFields": getOrCreateConfiguration(target).setSObjectFields(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectFields": getOrCreateConfig(target).setSObjectFields(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectid":
-        case "sObjectId": getOrCreateConfiguration(target).setSObjectId(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectId": getOrCreateConfig(target).setSObjectId(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectidname":
-        case "sObjectIdName": getOrCreateConfiguration(target).setSObjectIdName(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectIdName": getOrCreateConfig(target).setSObjectIdName(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectidvalue":
-        case "sObjectIdValue": getOrCreateConfiguration(target).setSObjectIdValue(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectIdValue": getOrCreateConfig(target).setSObjectIdValue(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectname":
-        case "sObjectName": getOrCreateConfiguration(target).setSObjectName(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectName": getOrCreateConfig(target).setSObjectName(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectquery":
-        case "sObjectQuery": getOrCreateConfiguration(target).setSObjectQuery(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectQuery": getOrCreateConfig(target).setSObjectQuery(property(camelContext, java.lang.String.class, value)); return true;
         case "sobjectsearch":
-        case "sObjectSearch": getOrCreateConfiguration(target).setSObjectSearch(property(camelContext, java.lang.String.class, value)); return true;
+        case "sObjectSearch": getOrCreateConfig(target).setSObjectSearch(property(camelContext, java.lang.String.class, value)); return true;
         case "sslcontextparameters":
         case "sslContextParameters": target.setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
         case "updatetopic":
-        case "updateTopic": getOrCreateConfiguration(target).setUpdateTopic(property(camelContext, boolean.class, value)); return true;
+        case "updateTopic": getOrCreateConfig(target).setUpdateTopic(property(camelContext, boolean.class, value)); return true;
         case "useglobalsslcontextparameters":
         case "useGlobalSslContextParameters": target.setUseGlobalSslContextParameters(property(camelContext, boolean.class, value)); return true;
         case "username":
@@ -251,21 +251,21 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         SalesforceComponent target = (SalesforceComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apexmethod":
-        case "apexMethod": return getOrCreateConfiguration(target).getApexMethod();
+        case "apexMethod": return getOrCreateConfig(target).getApexMethod();
         case "apexqueryparams":
-        case "apexQueryParams": return getOrCreateConfiguration(target).getApexQueryParams();
+        case "apexQueryParams": return getOrCreateConfig(target).getApexQueryParams();
         case "apexurl":
-        case "apexUrl": return getOrCreateConfiguration(target).getApexUrl();
+        case "apexUrl": return getOrCreateConfig(target).getApexUrl();
         case "apiversion":
-        case "apiVersion": return getOrCreateConfiguration(target).getApiVersion();
+        case "apiVersion": return getOrCreateConfig(target).getApiVersion();
         case "authenticationtype":
         case "authenticationType": return target.getAuthenticationType();
         case "backoffincrement":
-        case "backoffIncrement": return getOrCreateConfiguration(target).getBackoffIncrement();
+        case "backoffIncrement": return getOrCreateConfig(target).getBackoffIncrement();
         case "basicpropertybinding":
         case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "batchid":
-        case "batchId": return getOrCreateConfiguration(target).getBatchId();
+        case "batchId": return getOrCreateConfig(target).getBatchId();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "clientid":
@@ -274,12 +274,12 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "clientSecret": return target.getClientSecret();
         case "config": return target.getConfig();
         case "contenttype":
-        case "contentType": return getOrCreateConfiguration(target).getContentType();
+        case "contentType": return getOrCreateConfig(target).getContentType();
         case "defaultreplayid":
-        case "defaultReplayId": return getOrCreateConfiguration(target).getDefaultReplayId();
-        case "format": return getOrCreateConfiguration(target).getFormat();
+        case "defaultReplayId": return getOrCreateConfig(target).getDefaultReplayId();
+        case "format": return getOrCreateConfig(target).getFormat();
         case "httpclient":
-        case "httpClient": return getOrCreateConfiguration(target).getHttpClient();
+        case "httpClient": return getOrCreateConfig(target).getHttpClient();
         case "httpclientconnectiontimeout":
         case "httpClientConnectionTimeout": return target.getHttpClientConnectionTimeout();
         case "httpclientidletimeout":
@@ -311,21 +311,21 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "httpproxyusername":
         case "httpProxyUsername": return target.getHttpProxyUsername();
         case "includedetails":
-        case "includeDetails": return getOrCreateConfiguration(target).getIncludeDetails();
+        case "includeDetails": return getOrCreateConfig(target).getIncludeDetails();
         case "initialreplayidmap":
-        case "initialReplayIdMap": return getOrCreateConfiguration(target).getInitialReplayIdMap();
+        case "initialReplayIdMap": return getOrCreateConfig(target).getInitialReplayIdMap();
         case "instanceid":
-        case "instanceId": return getOrCreateConfiguration(target).getInstanceId();
+        case "instanceId": return getOrCreateConfig(target).getInstanceId();
         case "instanceurl":
         case "instanceUrl": return target.getInstanceUrl();
         case "jobid":
-        case "jobId": return getOrCreateConfiguration(target).getJobId();
+        case "jobId": return getOrCreateConfig(target).getJobId();
         case "keystore": return target.getKeystore();
         case "lazylogin":
         case "lazyLogin": return target.isLazyLogin();
         case "lazystartproducer":
         case "lazyStartProducer": return target.isLazyStartProducer();
-        case "limit": return getOrCreateConfiguration(target).getLimit();
+        case "limit": return getOrCreateConfig(target).getLimit();
         case "loginconfig":
         case "loginConfig": return target.getLoginConfig();
         case "loginurl":
@@ -333,57 +333,57 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp
         case "longpollingtransportproperties":
         case "longPollingTransportProperties": return target.getLongPollingTransportProperties();
         case "maxbackoff":
-        case "maxBackoff": return getOrCreateConfiguration(target).getMaxBackoff();
+        case "maxBackoff": return getOrCreateConfig(target).getMaxBackoff();
         case "notfoundbehaviour":
-        case "notFoundBehaviour": return getOrCreateConfiguration(target).getNotFoundBehaviour();
+        case "notFoundBehaviour": return getOrCreateConfig(target).getNotFoundBehaviour();
         case "notifyforfields":
-        case "notifyForFields": return getOrCreateConfiguration(target).getNotifyForFields();
+        case "notifyForFields": return getOrCreateConfig(target).getNotifyForFields();
         case "notifyforoperationcreate":
-        case "notifyForOperationCreate": return getOrCreateConfiguration(target).getNotifyForOperationCreate();
+        case "notifyForOperationCreate": return getOrCreateConfig(target).getNotifyForOperationCreate();
         case "notifyforoperationdelete":
-        case "notifyForOperationDelete": return getOrCreateConfiguration(target).getNotifyForOperationDelete();
+        case "notifyForOperationDelete": return getOrCreateConfig(target).getNotifyForOperationDelete();
         case "notifyforoperationundelete":
-        case "notifyForOperationUndelete": return getOrCreateConfiguration(target).getNotifyForOperationUndelete();
+        case "notifyForOperationUndelete": return getOrCreateConfig(target).getNotifyForOperationUndelete();
         case "notifyforoperationupdate":
-        case "notifyForOperationUpdate": return getOrCreateConfiguration(target).getNotifyForOperationUpdate();
+        case "notifyForOperationUpdate": return getOrCreateConfig(target).getNotifyForOperationUpdate();
         case "notifyforoperations":
-        case "notifyForOperations": return getOrCreateConfiguration(target).getNotifyForOperations();
+        case "notifyForOperations": return getOrCreateConfig(target).getNotifyForOperations();
         case "objectmapper":
-        case "objectMapper": return getOrCreateConfiguration(target).getObjectMapper();
+        case "objectMapper": return getOrCreateConfig(target).getObjectMapper();
         case "packages": return target.getPackages();
         case "password": return target.getPassword();
         case "rawpayload":
-        case "rawPayload": return getOrCreateConfiguration(target).isRawPayload();
+        case "rawPayload": return getOrCreateConfig(target).isRawPayload();
         case "refreshtoken":
         case "refreshToken": return target.getRefreshToken();
         case "reportid":
-        case "reportId": return getOrCreateConfiguration(target).getReportId();
+        case "reportId": return getOrCreateConfig(target).getReportId();
         case "reportmetadata":
-        case "reportMetadata": return getOrCreateConfiguration(target).getReportMetadata();
+        case "reportMetadata": return getOrCreateConfig(target).getReportMetadata();
         case "resultid":
-        case "resultId": return getOrCreateConfiguration(target).getResultId();
+        case "resultId": return getOrCreateConfig(target).getResultId();
         case "sobjectblobfieldname":
-        case "sObjectBlobFieldName": return getOrCreateConfiguration(target).getSObjectBlobFieldName();
+        case "sObjectBlobFieldName": return getOrCreateConfig(target).getSObjectBlobFieldName();
         case "sobjectclass":
-        case "sObjectClass": return getOrCreateConfiguration(target).getSObjectClass();
+        case "sObjectClass": return getOrCreateConfig(target).getSObjectClass();
         case "sobjectfields":
-        case "sObjectFields": return getOrCreateConfiguration(target).getSObjectFields();
+        case "sObjectFields": return getOrCreateConfig(target).getSObjectFields();
         case "sobjectid":
-        case "sObjectId": return getOrCreateConfiguration(target).getSObjectId();
+        case "sObjectId": return getOrCreateConfig(target).getSObjectId();
         case "sobjectidname":
-        case "sObjectIdName": return getOrCreateConfiguration(target).getSObjectIdName();
+        case "sObjectIdName": return getOrCreateConfig(target).getSObjectIdName();
         case "sobjectidvalue":
-        case "sObjectIdValue": return getOrCreateConfiguration(target).getSObjectIdValue();
+        case "sObjectIdValue": return getOrCreateConfig(target).getSObjectIdValue();
         case "sobjectname":
-        case "sObjectName": return getOrCreateConfiguration(target).getSObjectName();
+        case "sObjectName": return getOrCreateConfig(target).getSObjectName();
         case "sobjectquery":
-        case "sObjectQuery": return getOrCreateConfiguration(target).getSObjectQuery();
+        case "sObjectQuery": return getOrCreateConfig(target).getSObjectQuery();
         case "sobjectsearch":
-        case "sObjectSearch": return getOrCreateConfiguration(target).getSObjectSearch();
+        case "sObjectSearch": return getOrCreateConfig(target).getSObjectSearch();
         case "sslcontextparameters":
         case "sslContextParameters": return target.getSslContextParameters();
         case "updatetopic":
-        case "updateTopic": return getOrCreateConfiguration(target).isUpdateTopic();
+        case "updateTopic": return getOrCreateConfig(target).isUpdateTopic();
         case "useglobalsslcontextparameters":
         case "useGlobalSslContextParameters": return target.isUseGlobalSslContextParameters();
         case "username":
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
index afd6cac..eb5c7bc 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
@@ -15,7 +15,7 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class XmlSignerComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(XmlSignerComponent target) {
+    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateSignerConfiguration(XmlSignerComponent target) {
         if (target.getSignerConfiguration() == null) {
             target.setSignerConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration());
         }
@@ -27,62 +27,62 @@ public class XmlSignerComponentConfigurer extends PropertyConfigurerSupport impl
         XmlSignerComponent target = (XmlSignerComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "addkeyinforeference":
-        case "addKeyInfoReference": getOrCreateConfiguration(target).setAddKeyInfoReference(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "addKeyInfoReference": getOrCreateSignerConfiguration(target).setAddKeyInfoReference(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "baseuri":
-        case "baseUri": getOrCreateConfiguration(target).setBaseUri(property(camelContext, java.lang.String.class, value)); return true;
+        case "baseUri": getOrCreateSignerConfiguration(target).setBaseUri(property(camelContext, java.lang.String.class, value)); return true;
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "canonicalizationmethod":
-        case "canonicalizationMethod": getOrCreateConfiguration(target).setCanonicalizationMethod(property(camelContext, javax.xml.crypto.AlgorithmMethod.class, value)); return true;
+        case "canonicalizationMethod": getOrCreateSignerConfiguration(target).setCanonicalizationMethod(property(camelContext, javax.xml.crypto.AlgorithmMethod.class, value)); return true;
         case "clearheaders":
-        case "clearHeaders": getOrCreateConfiguration(target).setClearHeaders(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "clearHeaders": getOrCreateSignerConfiguration(target).setClearHeaders(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "contentobjectid":
-        case "contentObjectId": getOrCreateConfiguration(target).setContentObjectId(property(camelContext, java.lang.String.class, value)); return true;
+        case "contentObjectId": getOrCreateSignerConfiguration(target).setContentObjectId(property(camelContext, java.lang.String.class, value)); return true;
         case "contentreferencetype":
-        case "contentReferenceType": getOrCreateConfiguration(target).setContentReferenceType(property(camelContext, java.lang.String.class, value)); return true;
+        case "contentReferenceType": getOrCreateSignerConfiguration(target).setContentReferenceType(property(camelContext, java.lang.String.class, value)); return true;
         case "contentreferenceuri":
-        case "contentReferenceUri": getOrCreateConfiguration(target).setContentReferenceUri(property(camelContext, java.lang.String.class, value)); return true;
+        case "contentReferenceUri": getOrCreateSignerConfiguration(target).setContentReferenceUri(property(camelContext, java.lang.String.class, value)); return true;
         case "cryptocontextproperties":
-        case "cryptoContextProperties": getOrCreateConfiguration(target).setCryptoContextProperties(property(camelContext, java.util.Map.class, value)); return true;
+        case "cryptoContextProperties": getOrCreateSignerConfiguration(target).setCryptoContextProperties(property(camelContext, java.util.Map.class, value)); return true;
         case "digestalgorithm":
-        case "digestAlgorithm": getOrCreateConfiguration(target).setDigestAlgorithm(property(camelContext, java.lang.String.class, value)); return true;
+        case "digestAlgorithm": getOrCreateSignerConfiguration(target).setDigestAlgorithm(property(camelContext, java.lang.String.class, value)); return true;
         case "disallowdoctypedecl":
-        case "disallowDoctypeDecl": getOrCreateConfiguration(target).setDisallowDoctypeDecl(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "disallowDoctypeDecl": getOrCreateSignerConfiguration(target).setDisallowDoctypeDecl(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "keyaccessor":
-        case "keyAccessor": getOrCreateConfiguration(target).setKeyAccessor(property(camelContext, org.apache.camel.component.xmlsecurity.api.KeyAccessor.class, value)); return true;
+        case "keyAccessor": getOrCreateSignerConfiguration(target).setKeyAccessor(property(camelContext, org.apache.camel.component.xmlsecurity.api.KeyAccessor.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "omitxmldeclaration":
-        case "omitXmlDeclaration": getOrCreateConfiguration(target).setOmitXmlDeclaration(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "omitXmlDeclaration": getOrCreateSignerConfiguration(target).setOmitXmlDeclaration(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "outputxmlencoding":
-        case "outputXmlEncoding": getOrCreateConfiguration(target).setOutputXmlEncoding(property(camelContext, java.lang.String.class, value)); return true;
+        case "outputXmlEncoding": getOrCreateSignerConfiguration(target).setOutputXmlEncoding(property(camelContext, java.lang.String.class, value)); return true;
         case "parentlocalname":
-        case "parentLocalName": getOrCreateConfiguration(target).setParentLocalName(property(camelContext, java.lang.String.class, value)); return true;
+        case "parentLocalName": getOrCreateSignerConfiguration(target).setParentLocalName(property(camelContext, java.lang.String.class, value)); return true;
         case "parentnamespace":
-        case "parentNamespace": getOrCreateConfiguration(target).setParentNamespace(property(camelContext, java.lang.String.class, value)); return true;
+        case "parentNamespace": getOrCreateSignerConfiguration(target).setParentNamespace(property(camelContext, java.lang.String.class, value)); return true;
         case "parentxpath":
-        case "parentXpath": getOrCreateConfiguration(target).setParentXpath(property(camelContext, javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.class, value)); return true;
+        case "parentXpath": getOrCreateSignerConfiguration(target).setParentXpath(property(camelContext, javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.class, value)); return true;
         case "plaintext":
-        case "plainText": getOrCreateConfiguration(target).setPlainText(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "plainText": getOrCreateSignerConfiguration(target).setPlainText(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "plaintextencoding":
-        case "plainTextEncoding": getOrCreateConfiguration(target).setPlainTextEncoding(property(camelContext, java.lang.String.class, value)); return true;
+        case "plainTextEncoding": getOrCreateSignerConfiguration(target).setPlainTextEncoding(property(camelContext, java.lang.String.class, value)); return true;
         case "prefixforxmlsignaturenamespace":
-        case "prefixForXmlSignatureNamespace": getOrCreateConfiguration(target).setPrefixForXmlSignatureNamespace(property(camelContext, java.lang.String.class, value)); return true;
-        case "properties": getOrCreateConfiguration(target).setProperties(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties.class, value)); return true;
+        case "prefixForXmlSignatureNamespace": getOrCreateSignerConfiguration(target).setPrefixForXmlSignatureNamespace(property(camelContext, java.lang.String.class, value)); return true;
+        case "properties": getOrCreateSignerConfiguration(target).setProperties(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties.class, value)); return true;
         case "schemaresourceuri":
-        case "schemaResourceUri": getOrCreateConfiguration(target).setSchemaResourceUri(property(camelContext, java.lang.String.class, value)); return true;
+        case "schemaResourceUri": getOrCreateSignerConfiguration(target).setSchemaResourceUri(property(camelContext, java.lang.String.class, value)); return true;
         case "signaturealgorithm":
-        case "signatureAlgorithm": getOrCreateConfiguration(target).setSignatureAlgorithm(property(camelContext, java.lang.String.class, value)); return true;
+        case "signatureAlgorithm": getOrCreateSignerConfiguration(target).setSignatureAlgorithm(property(camelContext, java.lang.String.class, value)); return true;
         case "signatureid":
-        case "signatureId": getOrCreateConfiguration(target).setSignatureId(property(camelContext, java.lang.String.class, value)); return true;
+        case "signatureId": getOrCreateSignerConfiguration(target).setSignatureId(property(camelContext, java.lang.String.class, value)); return true;
         case "signerconfiguration":
         case "signerConfiguration": target.setSignerConfiguration(property(camelContext, org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration.class, value)); return true;
         case "transformmethods":
-        case "transformMethods": getOrCreateConfiguration(target).setTransformMethods(property(camelContext, java.util.List.class, value)); return true;
+        case "transformMethods": getOrCreateSignerConfiguration(target).setTransformMethods(property(camelContext, java.util.List.class, value)); return true;
         case "uridereferencer":
-        case "uriDereferencer": getOrCreateConfiguration(target).setUriDereferencer(property(camelContext, javax.xml.crypto.URIDereferencer.class, value)); return true;
+        case "uriDereferencer": getOrCreateSignerConfiguration(target).setUriDereferencer(property(camelContext, javax.xml.crypto.URIDereferencer.class, value)); return true;
         case "xpathstoidattributes":
-        case "xpathsToIdAttributes": getOrCreateConfiguration(target).setXpathsToIdAttributes(property(camelContext, java.util.List.class, value)); return true;
+        case "xpathsToIdAttributes": getOrCreateSignerConfiguration(target).setXpathsToIdAttributes(property(camelContext, java.util.List.class, value)); return true;
         default: return false;
         }
     }
@@ -127,62 +127,62 @@ public class XmlSignerComponentConfigurer extends PropertyConfigurerSupport impl
         XmlSignerComponent target = (XmlSignerComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "addkeyinforeference":
-        case "addKeyInfoReference": return getOrCreateConfiguration(target).getAddKeyInfoReference();
+        case "addKeyInfoReference": return getOrCreateSignerConfiguration(target).getAddKeyInfoReference();
         case "baseuri":
-        case "baseUri": return getOrCreateConfiguration(target).getBaseUri();
+        case "baseUri": return getOrCreateSignerConfiguration(target).getBaseUri();
         case "basicpropertybinding":
         case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "canonicalizationmethod":
-        case "canonicalizationMethod": return getOrCreateConfiguration(target).getCanonicalizationMethod();
+        case "canonicalizationMethod": return getOrCreateSignerConfiguration(target).getCanonicalizationMethod();
         case "clearheaders":
-        case "clearHeaders": return getOrCreateConfiguration(target).getClearHeaders();
+        case "clearHeaders": return getOrCreateSignerConfiguration(target).getClearHeaders();
         case "contentobjectid":
-        case "contentObjectId": return getOrCreateConfiguration(target).getContentObjectId();
+        case "contentObjectId": return getOrCreateSignerConfiguration(target).getContentObjectId();
         case "contentreferencetype":
-        case "contentReferenceType": return getOrCreateConfiguration(target).getContentReferenceType();
+        case "contentReferenceType": return getOrCreateSignerConfiguration(target).getContentReferenceType();
         case "contentreferenceuri":
-        case "contentReferenceUri": return getOrCreateConfiguration(target).getContentReferenceUri();
+        case "contentReferenceUri": return getOrCreateSignerConfiguration(target).getContentReferenceUri();
         case "cryptocontextproperties":
-        case "cryptoContextProperties": return getOrCreateConfiguration(target).getCryptoContextProperties();
+        case "cryptoContextProperties": return getOrCreateSignerConfiguration(target).getCryptoContextProperties();
         case "digestalgorithm":
-        case "digestAlgorithm": return getOrCreateConfiguration(target).getDigestAlgorithm();
+        case "digestAlgorithm": return getOrCreateSignerConfiguration(target).getDigestAlgorithm();
         case "disallowdoctypedecl":
-        case "disallowDoctypeDecl": return getOrCreateConfiguration(target).getDisallowDoctypeDecl();
+        case "disallowDoctypeDecl": return getOrCreateSignerConfiguration(target).getDisallowDoctypeDecl();
         case "keyaccessor":
-        case "keyAccessor": return getOrCreateConfiguration(target).getKeyAccessor();
+        case "keyAccessor": return getOrCreateSignerConfiguration(target).getKeyAccessor();
         case "lazystartproducer":
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "omitxmldeclaration":
-        case "omitXmlDeclaration": return getOrCreateConfiguration(target).getOmitXmlDeclaration();
+        case "omitXmlDeclaration": return getOrCreateSignerConfiguration(target).getOmitXmlDeclaration();
         case "outputxmlencoding":
-        case "outputXmlEncoding": return getOrCreateConfiguration(target).getOutputXmlEncoding();
+        case "outputXmlEncoding": return getOrCreateSignerConfiguration(target).getOutputXmlEncoding();
         case "parentlocalname":
-        case "parentLocalName": return getOrCreateConfiguration(target).getParentLocalName();
+        case "parentLocalName": return getOrCreateSignerConfiguration(target).getParentLocalName();
         case "parentnamespace":
-        case "parentNamespace": return getOrCreateConfiguration(target).getParentNamespace();
+        case "parentNamespace": return getOrCreateSignerConfiguration(target).getParentNamespace();
         case "parentxpath":
-        case "parentXpath": return getOrCreateConfiguration(target).getParentXpath();
+        case "parentXpath": return getOrCreateSignerConfiguration(target).getParentXpath();
         case "plaintext":
-        case "plainText": return getOrCreateConfiguration(target).getPlainText();
+        case "plainText": return getOrCreateSignerConfiguration(target).getPlainText();
         case "plaintextencoding":
-        case "plainTextEncoding": return getOrCreateConfiguration(target).getPlainTextEncoding();
+        case "plainTextEncoding": return getOrCreateSignerConfiguration(target).getPlainTextEncoding();
         case "prefixforxmlsignaturenamespace":
-        case "prefixForXmlSignatureNamespace": return getOrCreateConfiguration(target).getPrefixForXmlSignatureNamespace();
-        case "properties": return getOrCreateConfiguration(target).getProperties();
+        case "prefixForXmlSignatureNamespace": return getOrCreateSignerConfiguration(target).getPrefixForXmlSignatureNamespace();
+        case "properties": return getOrCreateSignerConfiguration(target).getProperties();
         case "schemaresourceuri":
-        case "schemaResourceUri": return getOrCreateConfiguration(target).getSchemaResourceUri();
+        case "schemaResourceUri": return getOrCreateSignerConfiguration(target).getSchemaResourceUri();
         case "signaturealgorithm":
-        case "signatureAlgorithm": return getOrCreateConfiguration(target).getSignatureAlgorithm();
+        case "signatureAlgorithm": return getOrCreateSignerConfiguration(target).getSignatureAlgorithm();
         case "signatureid":
-        case "signatureId": return getOrCreateConfiguration(target).getSignatureId();
+        case "signatureId": return getOrCreateSignerConfiguration(target).getSignatureId();
         case "signerconfiguration":
         case "signerConfiguration": return target.getSignerConfiguration();
         case "transformmethods":
-        case "transformMethods": return getOrCreateConfiguration(target).getTransformMethods();
+        case "transformMethods": return getOrCreateSignerConfiguration(target).getTransformMethods();
         case "uridereferencer":
-        case "uriDereferencer": return getOrCreateConfiguration(target).getUriDereferencer();
+        case "uriDereferencer": return getOrCreateSignerConfiguration(target).getUriDereferencer();
         case "xpathstoidattributes":
-        case "xpathsToIdAttributes": return getOrCreateConfiguration(target).getXpathsToIdAttributes();
+        case "xpathsToIdAttributes": return getOrCreateSignerConfiguration(target).getXpathsToIdAttributes();
         default: return null;
         }
     }
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierComponentConfigurer.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierComponentConfigurer.java
index f3bf2ee..32a5d1e 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierComponentConfigurer.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierComponentConfigurer.java
@@ -15,7 +15,7 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class XmlVerifierComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration getOrCreateConfiguration(XmlVerifierComponent target) {
+    private org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration getOrCreateVerifierConfiguration(XmlVerifierComponent target) {
         if (target.getVerifierConfiguration() == null) {
             target.setVerifierConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration());
         }
@@ -27,43 +27,43 @@ public class XmlVerifierComponentConfigurer extends PropertyConfigurerSupport im
         XmlVerifierComponent target = (XmlVerifierComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "baseuri":
-        case "baseUri": getOrCreateConfiguration(target).setBaseUri(property(camelContext, java.lang.String.class, value)); return true;
+        case "baseUri": getOrCreateVerifierConfiguration(target).setBaseUri(property(camelContext, java.lang.String.class, value)); return true;
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "clearheaders":
-        case "clearHeaders": getOrCreateConfiguration(target).setClearHeaders(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "clearHeaders": getOrCreateVerifierConfiguration(target).setClearHeaders(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "cryptocontextproperties":
-        case "cryptoContextProperties": getOrCreateConfiguration(target).setCryptoContextProperties(property(camelContext, java.util.Map.class, value)); return true;
+        case "cryptoContextProperties": getOrCreateVerifierConfiguration(target).setCryptoContextProperties(property(camelContext, java.util.Map.class, value)); return true;
         case "disallowdoctypedecl":
-        case "disallowDoctypeDecl": getOrCreateConfiguration(target).setDisallowDoctypeDecl(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "disallowDoctypeDecl": getOrCreateVerifierConfiguration(target).setDisallowDoctypeDecl(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "keyselector":
-        case "keySelector": getOrCreateConfiguration(target).setKeySelector(property(camelContext, javax.xml.crypto.KeySelector.class, value)); return true;
+        case "keySelector": getOrCreateVerifierConfiguration(target).setKeySelector(property(camelContext, javax.xml.crypto.KeySelector.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "omitxmldeclaration":
-        case "omitXmlDeclaration": getOrCreateConfiguration(target).setOmitXmlDeclaration(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "omitXmlDeclaration": getOrCreateVerifierConfiguration(target).setOmitXmlDeclaration(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "outputnodesearch":
-        case "outputNodeSearch": getOrCreateConfiguration(target).setOutputNodeSearch(property(camelContext, java.lang.Object.class, value)); return true;
+        case "outputNodeSearch": getOrCreateVerifierConfiguration(target).setOutputNodeSearch(property(camelContext, java.lang.Object.class, value)); return true;
         case "outputnodesearchtype":
-        case "outputNodeSearchType": getOrCreateConfiguration(target).setOutputNodeSearchType(property(camelContext, java.lang.String.class, value)); return true;
+        case "outputNodeSearchType": getOrCreateVerifierConfiguration(target).setOutputNodeSearchType(property(camelContext, java.lang.String.class, value)); return true;
         case "outputxmlencoding":
-        case "outputXmlEncoding": getOrCreateConfiguration(target).setOutputXmlEncoding(property(camelContext, java.lang.String.class, value)); return true;
+        case "outputXmlEncoding": getOrCreateVerifierConfiguration(target).setOutputXmlEncoding(property(camelContext, java.lang.String.class, value)); return true;
         case "removesignatureelements":
-        case "removeSignatureElements": getOrCreateConfiguration(target).setRemoveSignatureElements(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "removeSignatureElements": getOrCreateVerifierConfiguration(target).setRemoveSignatureElements(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "schemaresourceuri":
-        case "schemaResourceUri": getOrCreateConfiguration(target).setSchemaResourceUri(property(camelContext, java.lang.String.class, value)); return true;
+        case "schemaResourceUri": getOrCreateVerifierConfiguration(target).setSchemaResourceUri(property(camelContext, java.lang.String.class, value)); return true;
         case "securevalidation":
-        case "secureValidation": getOrCreateConfiguration(target).setSecureValidation(property(camelContext, java.lang.Boolean.class, value)); return true;
+        case "secureValidation": getOrCreateVerifierConfiguration(target).setSecureValidation(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "uridereferencer":
-        case "uriDereferencer": getOrCreateConfiguration(target).setUriDereferencer(property(camelContext, javax.xml.crypto.URIDereferencer.class, value)); return true;
+        case "uriDereferencer": getOrCreateVerifierConfiguration(target).setUriDereferencer(property(camelContext, javax.xml.crypto.URIDereferencer.class, value)); return true;
         case "validationfailedhandler":
-        case "validationFailedHandler": getOrCreateConfiguration(target).setValidationFailedHandler(property(camelContext, org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler.class, value)); return true;
+        case "validationFailedHandler": getOrCreateVerifierConfiguration(target).setValidationFailedHandler(property(camelContext, org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler.class, value)); return true;
         case "verifierconfiguration":
         case "verifierConfiguration": target.setVerifierConfiguration(property(camelContext, org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration.class, value)); return true;
         case "xmlsignature2message":
-        case "xmlSignature2Message": getOrCreateConfiguration(target).setXmlSignature2Message(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignature2Message.class, value)); return true;
+        case "xmlSignature2Message": getOrCreateVerifierConfiguration(target).setXmlSignature2Message(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignature2Message.class, value)); return true;
         case "xmlsignaturechecker":
-        case "xmlSignatureChecker": getOrCreateConfiguration(target).setXmlSignatureChecker(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker.class, value)); return true;
+        case "xmlSignatureChecker": getOrCreateVerifierConfiguration(target).setXmlSignatureChecker(property(camelContext, org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker.class, value)); return true;
         default: return false;
         }
     }
@@ -98,43 +98,43 @@ public class XmlVerifierComponentConfigurer extends PropertyConfigurerSupport im
         XmlVerifierComponent target = (XmlVerifierComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "baseuri":
-        case "baseUri": return getOrCreateConfiguration(target).getBaseUri();
+        case "baseUri": return getOrCreateVerifierConfiguration(target).getBaseUri();
         case "basicpropertybinding":
         case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "clearheaders":
-        case "clearHeaders": return getOrCreateConfiguration(target).getClearHeaders();
+        case "clearHeaders": return getOrCreateVerifierConfiguration(target).getClearHeaders();
         case "cryptocontextproperties":
-        case "cryptoContextProperties": return getOrCreateConfiguration(target).getCryptoContextProperties();
+        case "cryptoContextProperties": return getOrCreateVerifierConfiguration(target).getCryptoContextProperties();
         case "disallowdoctypedecl":
-        case "disallowDoctypeDecl": return getOrCreateConfiguration(target).getDisallowDoctypeDecl();
+        case "disallowDoctypeDecl": return getOrCreateVerifierConfiguration(target).getDisallowDoctypeDecl();
         case "keyselector":
-        case "keySelector": return getOrCreateConfiguration(target).getKeySelector();
+        case "keySelector": return getOrCreateVerifierConfiguration(target).getKeySelector();
         case "lazystartproducer":
         case "lazyStartProducer": return target.isLazyStartProducer();
         case "omitxmldeclaration":
-        case "omitXmlDeclaration": return getOrCreateConfiguration(target).getOmitXmlDeclaration();
+        case "omitXmlDeclaration": return getOrCreateVerifierConfiguration(target).getOmitXmlDeclaration();
         case "outputnodesearch":
-        case "outputNodeSearch": return getOrCreateConfiguration(target).getOutputNodeSearch();
+        case "outputNodeSearch": return getOrCreateVerifierConfiguration(target).getOutputNodeSearch();
         case "outputnodesearchtype":
-        case "outputNodeSearchType": return getOrCreateConfiguration(target).getOutputNodeSearchType();
+        case "outputNodeSearchType": return getOrCreateVerifierConfiguration(target).getOutputNodeSearchType();
         case "outputxmlencoding":
-        case "outputXmlEncoding": return getOrCreateConfiguration(target).getOutputXmlEncoding();
+        case "outputXmlEncoding": return getOrCreateVerifierConfiguration(target).getOutputXmlEncoding();
         case "removesignatureelements":
-        case "removeSignatureElements": return getOrCreateConfiguration(target).getRemoveSignatureElements();
+        case "removeSignatureElements": return getOrCreateVerifierConfiguration(target).getRemoveSignatureElements();
         case "schemaresourceuri":
-        case "schemaResourceUri": return getOrCreateConfiguration(target).getSchemaResourceUri();
+        case "schemaResourceUri": return getOrCreateVerifierConfiguration(target).getSchemaResourceUri();
         case "securevalidation":
-        case "secureValidation": return getOrCreateConfiguration(target).getSecureValidation();
+        case "secureValidation": return getOrCreateVerifierConfiguration(target).getSecureValidation();
         case "uridereferencer":
-        case "uriDereferencer": return getOrCreateConfiguration(target).getUriDereferencer();
+        case "uriDereferencer": return getOrCreateVerifierConfiguration(target).getUriDereferencer();
         case "validationfailedhandler":
-        case "validationFailedHandler": return getOrCreateConfiguration(target).getValidationFailedHandler();
+        case "validationFailedHandler": return getOrCreateVerifierConfiguration(target).getValidationFailedHandler();
         case "verifierconfiguration":
         case "verifierConfiguration": return target.getVerifierConfiguration();
         case "xmlsignature2message":
-        case "xmlSignature2Message": return getOrCreateConfiguration(target).getXmlSignature2Message();
+        case "xmlSignature2Message": return getOrCreateVerifierConfiguration(target).getXmlSignature2Message();
         case "xmlsignaturechecker":
-        case "xmlSignatureChecker": return getOrCreateConfiguration(target).getXmlSignatureChecker();
+        case "xmlSignatureChecker": return getOrCreateVerifierConfiguration(target).getXmlSignatureChecker();
         default: return null;
         }
     }