Revert "CAMEL-10197: Added plain get/set to components for spring-boot configuration"
This reverts commit bdab2fc632afa9270a7ca79ea55952887e56f644. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a04fb15b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a04fb15b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a04fb15b Branch: refs/heads/master Commit: a04fb15ba8cee420fda7692b0262b35af04749ea Parents: fa6ee0b Author: Dhiraj Bokde <dhira...@yahoo.com> Authored: Tue Sep 20 05:45:47 2016 -0700 Committer: Dhiraj Bokde <dhira...@yahoo.com> Committed: Tue Sep 20 07:31:14 2016 -0700 ---------------------------------------------------------------------- .../BraintreeComponentConfiguration.java | 136 +-- .../FacebookComponentConfiguration.java | 329 +------ .../GoogleCalendarComponentConfiguration.java | 145 +--- .../GoogleDriveComponentConfiguration.java | 106 +-- .../GoogleMailComponentConfiguration.java | 106 +-- .../KestrelComponentConfiguration.java | 36 - .../LuceneComponentConfiguration.java | 84 +- .../NagiosComponentConfiguration.java | 76 +- .../Olingo2ComponentConfiguration.java | 137 +-- .../XmlSignatureComponentConfiguration.java | 662 +-------------- .../camel/component/avro/AvroComponent.java | 147 +--- .../camel/component/box/BoxComponent.java | 214 +---- .../component/braintree/BraintreeComponent.java | 150 +--- .../camel/component/cache/CacheComponent.java | 153 +--- .../crypto/DigitalSignatureComponent.java | 344 +------- .../camel/component/docker/DockerComponent.java | 2 +- .../component/facebook/FacebookComponent.java | 326 +------ .../component/ganglia/GangliaComponent.java | 182 +--- .../calendar/GoogleCalendarComponent.java | 144 +--- .../google/drive/GoogleDriveComponent.java | 108 +-- .../google/mail/GoogleMailComponent.java | 108 +-- .../component/kestrel/KestrelComponent.java | 38 - .../component/kestrel/KestrelConfiguration.java | 9 - .../component/linkedin/LinkedInComponent.java | 155 +--- .../camel/component/lucene/LuceneComponent.java | 85 +- .../camel/component/mail/MailComponent.java | 486 +---------- .../camel/component/mina/MinaComponent.java | 271 +----- .../camel/component/mina2/Mina2Component.java | 336 +------- .../camel/component/nagios/NagiosComponent.java | 77 +- .../camel/component/netty/NettyComponent.java | 815 +----------------- .../camel/component/netty4/NettyComponent.java | 851 +------------------ .../component/olingo2/Olingo2Component.java | 130 +-- .../salesforce/SalesforceComponent.java | 517 +---------- .../camel/component/smpp/SmppComponent.java | 557 +----------- .../xmlsecurity/XmlSignatureComponent.java | 747 +--------------- .../component/zookeeper/ZooKeeperComponent.java | 121 +-- .../zookeeper/ZooKeeperConfiguration.java | 3 - 37 files changed, 61 insertions(+), 8832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java index 51dffbc..60f2b7f 100644 --- a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java +++ b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java @@ -17,7 +17,6 @@ package org.apache.camel.component.braintree.springboot; import org.apache.camel.component.braintree.BraintreeConfiguration; -import org.apache.camel.component.braintree.internal.BraintreeApiName; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -30,54 +29,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class BraintreeComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private BraintreeConfiguration configuration; - /** - * What kind of operation to perform - */ - private BraintreeApiName apiName; - /** - * What sub operation to use for the selected operation - */ - private String methodName; - /** - * The environment Either SANDBOX or PRODUCTION - */ - private String environment; - /** - * The merchant id provided by Braintree. - */ - private String merchantId; - /** - * The public key provided by Braintree. - */ - private String publicKey; - /** - * The private key provided by Braintree. - */ - private String privateKey; - /** - * The proxy host - */ - private String proxyHost; - /** - * The proxy port - */ - private Integer proxyPort; - /** - * Set logging level for http calls see java.util.logging.Level - */ - private String httpLogLevel; - /** - * Set log category to use to log http calls default Braintree - */ - private String httpLogName; - /** - * Set read timeout for http calls. - */ - private Integer httpReadTimeout; public BraintreeConfiguration getConfiguration() { return configuration; @@ -86,92 +40,4 @@ public class BraintreeComponentConfiguration { public void setConfiguration(BraintreeConfiguration configuration) { this.configuration = configuration; } - - public BraintreeApiName getApiName() { - return apiName; - } - - public void setApiName(BraintreeApiName apiName) { - this.apiName = apiName; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public String getEnvironment() { - return environment; - } - - public void setEnvironment(String environment) { - this.environment = environment; - } - - public String getMerchantId() { - return merchantId; - } - - public void setMerchantId(String merchantId) { - this.merchantId = merchantId; - } - - public String getPublicKey() { - return publicKey; - } - - public void setPublicKey(String publicKey) { - this.publicKey = publicKey; - } - - public String getPrivateKey() { - return privateKey; - } - - public void setPrivateKey(String privateKey) { - this.privateKey = privateKey; - } - - public String getProxyHost() { - return proxyHost; - } - - public void setProxyHost(String proxyHost) { - this.proxyHost = proxyHost; - } - - public Integer getProxyPort() { - return proxyPort; - } - - public void setProxyPort(Integer proxyPort) { - this.proxyPort = proxyPort; - } - - public String getHttpLogLevel() { - return httpLogLevel; - } - - public void setHttpLogLevel(String httpLogLevel) { - this.httpLogLevel = httpLogLevel; - } - - public String getHttpLogName() { - return httpLogName; - } - - public void setHttpLogName(String httpLogName) { - this.httpLogName = httpLogName; - } - - public Integer getHttpReadTimeout() { - return httpReadTimeout; - } - - public void setHttpReadTimeout(Integer httpReadTimeout) { - this.httpReadTimeout = httpReadTimeout; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConfiguration.java b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConfiguration.java index 8bfdb79..850b557 100644 --- a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConfiguration.java +++ b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConfiguration.java @@ -29,120 +29,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class FacebookComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private FacebookConfiguration configuration; - /** - * The user access token - */ - private String oAuthAccessToken; - /** - * OAuth access token URL - */ - private String oAuthAccessTokenURL; - /** - * The application Id - */ - private String oAuthAppId; - /** - * The application Secret - */ - private String oAuthAppSecret; - /** - * OAuth authorization URL - */ - private String oAuthAuthorizationURL; - /** - * Facebook4J API client URL - */ - private String clientURL; - /** - * Facebook4J client API version - */ - private String clientVersion; - /** - * Enables deubg output. Effective only with the embedded logger - */ - private Boolean debugEnabled; - /** - * Use Facebook GZIP encoding - */ - private Boolean gzipEnabled; - /** - * Http connection timeout in milliseconds - */ - private Integer httpConnectionTimeout; - /** - * HTTP maximum connections per route - */ - private Integer httpDefaultMaxPerRoute; - /** - * HTTP maximum total connections - */ - private Integer httpMaxTotalConnections; - /** - * HTTP proxy server host name - */ - private String httpProxyHost; - /** - * HTTP proxy server password - */ - private String httpProxyPassword; - /** - * HTTP proxy server port - */ - private Integer httpProxyPort; - /** - * HTTP proxy server user name - */ - private String httpProxyUser; - /** - * Http read timeout in milliseconds - */ - private Integer httpReadTimeout; - /** - * Number of HTTP retries - */ - private Integer httpRetryCount; - /** - * HTTP retry interval in seconds - */ - private Integer httpRetryIntervalSeconds; - /** - * HTTP streaming read timeout in milliseconds - */ - private Integer httpStreamingReadTimeout; - /** - * If set to true raw JSON forms will be stored in DataObjectFactory - */ - private Boolean jsonStoreEnabled; - /** - * If set to true Facebook4J mbean will be registerd - */ - private Boolean mbeanEnabled; - /** - * Default OAuth permissions. Comma separated permission names. See - * https://developers.facebook.com/docs/reference/login/permissions for the - * detail - */ - private String oAuthPermissions; - /** - * Prettify JSON debug output if set to true - */ - private Boolean prettyDebugEnabled; - /** - * API base URL - */ - private String restBaseURL; - /** - * Use SSL - */ - private Boolean useSSL; - /** - * Video API base URL - */ - private String videoBaseURL; public FacebookConfiguration getConfiguration() { return configuration; @@ -151,220 +40,4 @@ public class FacebookComponentConfiguration { public void setConfiguration(FacebookConfiguration configuration) { this.configuration = configuration; } - - public String getOAuthAccessToken() { - return oAuthAccessToken; - } - - public void setOAuthAccessToken(String oAuthAccessToken) { - this.oAuthAccessToken = oAuthAccessToken; - } - - public String getOAuthAccessTokenURL() { - return oAuthAccessTokenURL; - } - - public void setOAuthAccessTokenURL(String oAuthAccessTokenURL) { - this.oAuthAccessTokenURL = oAuthAccessTokenURL; - } - - public String getOAuthAppId() { - return oAuthAppId; - } - - public void setOAuthAppId(String oAuthAppId) { - this.oAuthAppId = oAuthAppId; - } - - public String getOAuthAppSecret() { - return oAuthAppSecret; - } - - public void setOAuthAppSecret(String oAuthAppSecret) { - this.oAuthAppSecret = oAuthAppSecret; - } - - public String getOAuthAuthorizationURL() { - return oAuthAuthorizationURL; - } - - public void setOAuthAuthorizationURL(String oAuthAuthorizationURL) { - this.oAuthAuthorizationURL = oAuthAuthorizationURL; - } - - public String getClientURL() { - return clientURL; - } - - public void setClientURL(String clientURL) { - this.clientURL = clientURL; - } - - public String getClientVersion() { - return clientVersion; - } - - public void setClientVersion(String clientVersion) { - this.clientVersion = clientVersion; - } - - public Boolean getDebugEnabled() { - return debugEnabled; - } - - public void setDebugEnabled(Boolean debugEnabled) { - this.debugEnabled = debugEnabled; - } - - public Boolean getGzipEnabled() { - return gzipEnabled; - } - - public void setGzipEnabled(Boolean gzipEnabled) { - this.gzipEnabled = gzipEnabled; - } - - public Integer getHttpConnectionTimeout() { - return httpConnectionTimeout; - } - - public void setHttpConnectionTimeout(Integer httpConnectionTimeout) { - this.httpConnectionTimeout = httpConnectionTimeout; - } - - public Integer getHttpDefaultMaxPerRoute() { - return httpDefaultMaxPerRoute; - } - - public void setHttpDefaultMaxPerRoute(Integer httpDefaultMaxPerRoute) { - this.httpDefaultMaxPerRoute = httpDefaultMaxPerRoute; - } - - public Integer getHttpMaxTotalConnections() { - return httpMaxTotalConnections; - } - - public void setHttpMaxTotalConnections(Integer httpMaxTotalConnections) { - this.httpMaxTotalConnections = httpMaxTotalConnections; - } - - public String getHttpProxyHost() { - return httpProxyHost; - } - - public void setHttpProxyHost(String httpProxyHost) { - this.httpProxyHost = httpProxyHost; - } - - public String getHttpProxyPassword() { - return httpProxyPassword; - } - - public void setHttpProxyPassword(String httpProxyPassword) { - this.httpProxyPassword = httpProxyPassword; - } - - public Integer getHttpProxyPort() { - return httpProxyPort; - } - - public void setHttpProxyPort(Integer httpProxyPort) { - this.httpProxyPort = httpProxyPort; - } - - public String getHttpProxyUser() { - return httpProxyUser; - } - - public void setHttpProxyUser(String httpProxyUser) { - this.httpProxyUser = httpProxyUser; - } - - public Integer getHttpReadTimeout() { - return httpReadTimeout; - } - - public void setHttpReadTimeout(Integer httpReadTimeout) { - this.httpReadTimeout = httpReadTimeout; - } - - public Integer getHttpRetryCount() { - return httpRetryCount; - } - - public void setHttpRetryCount(Integer httpRetryCount) { - this.httpRetryCount = httpRetryCount; - } - - public Integer getHttpRetryIntervalSeconds() { - return httpRetryIntervalSeconds; - } - - public void setHttpRetryIntervalSeconds(Integer httpRetryIntervalSeconds) { - this.httpRetryIntervalSeconds = httpRetryIntervalSeconds; - } - - public Integer getHttpStreamingReadTimeout() { - return httpStreamingReadTimeout; - } - - public void setHttpStreamingReadTimeout(Integer httpStreamingReadTimeout) { - this.httpStreamingReadTimeout = httpStreamingReadTimeout; - } - - public Boolean getJsonStoreEnabled() { - return jsonStoreEnabled; - } - - public void setJsonStoreEnabled(Boolean jsonStoreEnabled) { - this.jsonStoreEnabled = jsonStoreEnabled; - } - - public Boolean getMbeanEnabled() { - return mbeanEnabled; - } - - public void setMbeanEnabled(Boolean mbeanEnabled) { - this.mbeanEnabled = mbeanEnabled; - } - - public String getOAuthPermissions() { - return oAuthPermissions; - } - - public void setOAuthPermissions(String oAuthPermissions) { - this.oAuthPermissions = oAuthPermissions; - } - - public Boolean getPrettyDebugEnabled() { - return prettyDebugEnabled; - } - - public void setPrettyDebugEnabled(Boolean prettyDebugEnabled) { - this.prettyDebugEnabled = prettyDebugEnabled; - } - - public String getRestBaseURL() { - return restBaseURL; - } - - public void setRestBaseURL(String restBaseURL) { - this.restBaseURL = restBaseURL; - } - - public Boolean getUseSSL() { - return useSSL; - } - - public void setUseSSL(Boolean useSSL) { - this.useSSL = useSSL; - } - - public String getVideoBaseURL() { - return videoBaseURL; - } - - public void setVideoBaseURL(String videoBaseURL) { - this.videoBaseURL = videoBaseURL; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentConfiguration.java b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentConfiguration.java index e62f9ec..ebc6f52 100644 --- a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentConfiguration.java +++ b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentConfiguration.java @@ -16,10 +16,8 @@ */ package org.apache.camel.component.google.calendar.springboot; -import java.util.List; import org.apache.camel.component.google.calendar.GoogleCalendarClientFactory; import org.apache.camel.component.google.calendar.GoogleCalendarConfiguration; -import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -31,8 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class GoogleCalendarComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private GoogleCalendarConfiguration configuration; /** @@ -40,58 +37,6 @@ public class GoogleCalendarComponentConfiguration { * client. Will by default use BatchGoogleCalendarClientFactory */ private GoogleCalendarClientFactory clientFactory; - /** - * What kind of operation to perform - */ - private GoogleCalendarApiName apiName; - /** - * What sub operation to use for the selected operation - */ - private String methodName; - /** - * Client ID of the calendar application - */ - private String clientId; - /** - * The emailAddress of the Google Service Account. - */ - private String emailAddress; - /** - * Client secret of the calendar application - */ - private String clientSecret; - /** - * OAuth 2 access token. This typically expires after an hour so - * refreshToken is recommended for long term usage. - */ - private String accessToken; - /** - * OAuth 2 refresh token. Using this the Google Calendar component can - * obtain a new accessToken whenever the current one expires - a necessity - * if the application is long-lived. - */ - private String refreshToken; - /** - * Google calendar application name. Example would be - * camel-google-calendar/1.0 - */ - private String applicationName; - /** - * Specifies the level of permissions you want a calendar application to - * have to a user account. See - * https://developers.google.com/google-apps/calendar/auth for more info. - */ - private List<String> scopes; - /** - * The name of the p12 file which has the private key to use with the Google - * Service Account. - */ - private String p12FileName; - /** - * The email address of the user the application is trying to impersonate in - * the service account flow - */ - private String user; public GoogleCalendarConfiguration getConfiguration() { return configuration; @@ -108,92 +53,4 @@ public class GoogleCalendarComponentConfiguration { public void setClientFactory(GoogleCalendarClientFactory clientFactory) { this.clientFactory = clientFactory; } - - public GoogleCalendarApiName getApiName() { - return apiName; - } - - public void setApiName(GoogleCalendarApiName apiName) { - this.apiName = apiName; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public String getEmailAddress() { - return emailAddress; - } - - public void setEmailAddress(String emailAddress) { - this.emailAddress = emailAddress; - } - - public String getClientSecret() { - return clientSecret; - } - - public void setClientSecret(String clientSecret) { - this.clientSecret = clientSecret; - } - - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public String getRefreshToken() { - return refreshToken; - } - - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - public String getApplicationName() { - return applicationName; - } - - public void setApplicationName(String applicationName) { - this.applicationName = applicationName; - } - - public List<String> getScopes() { - return scopes; - } - - public void setScopes(List<String> scopes) { - this.scopes = scopes; - } - - public String getP12FileName() { - return p12FileName; - } - - public void setP12FileName(String p12FileName) { - this.p12FileName = p12FileName; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java index 0db879a..bad8424 100644 --- a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java +++ b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java @@ -16,10 +16,8 @@ */ package org.apache.camel.component.google.drive.springboot; -import java.util.List; import org.apache.camel.component.google.drive.GoogleDriveClientFactory; import org.apache.camel.component.google.drive.GoogleDriveConfiguration; -import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -32,8 +30,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class GoogleDriveComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private GoogleDriveConfiguration configuration; /** @@ -41,43 +38,6 @@ public class GoogleDriveComponentConfiguration { * client. Will by default use BatchGoogleDriveClientFactory */ private GoogleDriveClientFactory clientFactory; - /** - * What kind of operation to perform - */ - private GoogleDriveApiName apiName; - /** - * What sub operation to use for the selected operation - */ - private String methodName; - /** - * Client ID of the drive application - */ - private String clientId; - /** - * Client secret of the drive application - */ - private String clientSecret; - /** - * OAuth 2 access token. This typically expires after an hour so - * refreshToken is recommended for long term usage. - */ - private String accessToken; - /** - * OAuth 2 refresh token. Using this the Google Calendar component can - * obtain a new accessToken whenever the current one expires - a necessity - * if the application is long-lived. - */ - private String refreshToken; - /** - * Google drive application name. Example would be camel-google-drive/1.0 - */ - private String applicationName; - /** - * Specifies the level of permissions you want a drive application to have - * to a user account. See https://developers.google.com/drive/web/scopes for - * more info. - */ - private List<String> scopes; public GoogleDriveConfiguration getConfiguration() { return configuration; @@ -94,68 +54,4 @@ public class GoogleDriveComponentConfiguration { public void setClientFactory(GoogleDriveClientFactory clientFactory) { this.clientFactory = clientFactory; } - - public GoogleDriveApiName getApiName() { - return apiName; - } - - public void setApiName(GoogleDriveApiName apiName) { - this.apiName = apiName; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public String getClientSecret() { - return clientSecret; - } - - public void setClientSecret(String clientSecret) { - this.clientSecret = clientSecret; - } - - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public String getRefreshToken() { - return refreshToken; - } - - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - public String getApplicationName() { - return applicationName; - } - - public void setApplicationName(String applicationName) { - this.applicationName = applicationName; - } - - public List<String> getScopes() { - return scopes; - } - - public void setScopes(List<String> scopes) { - this.scopes = scopes; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentConfiguration.java b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentConfiguration.java index 7896172..06918ec 100644 --- a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentConfiguration.java +++ b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentConfiguration.java @@ -16,10 +16,8 @@ */ package org.apache.camel.component.google.mail.springboot; -import java.util.List; import org.apache.camel.component.google.mail.GoogleMailClientFactory; import org.apache.camel.component.google.mail.GoogleMailConfiguration; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -31,8 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class GoogleMailComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private GoogleMailConfiguration configuration; /** @@ -40,43 +37,6 @@ public class GoogleMailComponentConfiguration { * client. Will by default use BatchGoogleMailClientFactory */ private GoogleMailClientFactory clientFactory; - /** - * What kind of operation to perform - */ - private GoogleMailApiName apiName; - /** - * What sub operation to use for the selected operation - */ - private String methodName; - /** - * Client ID of the mail application - */ - private String clientId; - /** - * Client secret of the mail application - */ - private String clientSecret; - /** - * OAuth 2 access token. This typically expires after an hour so - * refreshToken is recommended for long term usage. - */ - private String accessToken; - /** - * OAuth 2 refresh token. Using this the Google Calendar component can - * obtain a new accessToken whenever the current one expires - a necessity - * if the application is long-lived. - */ - private String refreshToken; - /** - * Google mail application name. Example would be camel-google-mail/1.0 - */ - private String applicationName; - /** - * Specifies the level of permissions you want a mail application to have to - * a user account. See https://developers.google.com/gmail/api/auth/scopes - * for more info. - */ - private List<String> scopes; public GoogleMailConfiguration getConfiguration() { return configuration; @@ -93,68 +53,4 @@ public class GoogleMailComponentConfiguration { public void setClientFactory(GoogleMailClientFactory clientFactory) { this.clientFactory = clientFactory; } - - public GoogleMailApiName getApiName() { - return apiName; - } - - public void setApiName(GoogleMailApiName apiName) { - this.apiName = apiName; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public String getClientSecret() { - return clientSecret; - } - - public void setClientSecret(String clientSecret) { - this.clientSecret = clientSecret; - } - - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - public String getRefreshToken() { - return refreshToken; - } - - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - public String getApplicationName() { - return applicationName; - } - - public void setApplicationName(String applicationName) { - this.applicationName = applicationName; - } - - public List<String> getScopes() { - return scopes; - } - - public void setScopes(List<String> scopes) { - this.scopes = scopes; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentConfiguration.java b/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentConfiguration.java index bd8b802..8c0e311 100644 --- a/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentConfiguration.java +++ b/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentConfiguration.java @@ -33,18 +33,6 @@ public class KestrelComponentConfiguration { * endpoints. */ private KestrelConfiguration configuration; - /** - * The addresses - */ - private String[] addresses; - /** - * The wait time in milliseconds - */ - private Integer waitTimeMs; - /** - * The number of concurrent consumers - */ - private Integer concurrentConsumers; public KestrelConfiguration getConfiguration() { return configuration; @@ -53,28 +41,4 @@ public class KestrelComponentConfiguration { public void setConfiguration(KestrelConfiguration configuration) { this.configuration = configuration; } - - public String[] getAddresses() { - return addresses; - } - - public void setAddresses(String[] addresses) { - this.addresses = addresses; - } - - public Integer getWaitTimeMs() { - return waitTimeMs; - } - - public void setWaitTimeMs(Integer waitTimeMs) { - this.waitTimeMs = waitTimeMs; - } - - public Integer getConcurrentConsumers() { - return concurrentConsumers; - } - - public void setConcurrentConsumers(Integer concurrentConsumers) { - this.concurrentConsumers = concurrentConsumers; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java index 788a695..cd514f7 100644 --- a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java +++ b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java @@ -16,10 +16,7 @@ */ package org.apache.camel.component.lucene.springboot; -import java.io.File; import org.apache.camel.component.lucene.LuceneConfiguration; -import org.apache.camel.component.lucene.LuceneOperation; -import org.apache.lucene.analysis.Analyzer; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -31,40 +28,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class LuceneComponentConfiguration { /** - * To use a shared lucene configuration. Properties of the shared - * configuration can also be set individually. + * To use a shared lucene configuration */ private LuceneConfiguration config; - /** - * The URL to the lucene server - */ - private String host; - /** - * Operation to do such as insert or query. - */ - private LuceneOperation operation; - /** - * An optional directory containing files to be used to be analyzed and - * added to the index at producer startup. - */ - private File sourceDirectory; - /** - * A file system directory in which index files are created upon analysis of - * the document by the specified analyzer - */ - private File indexDirectory; - /** - * An Analyzer builds TokenStreams which analyze text. It thus represents a - * policy for extracting index terms from text. The value for analyzer can - * be any class that extends the abstract class - * org.apache.lucene.analysis.Analyzer. Lucene also offers a rich set of - * analyzers out of the box - */ - private Analyzer analyzer; - /** - * An integer value that limits the result set of the search operation - */ - private Integer maxHits; public LuceneConfiguration getConfig() { return config; @@ -73,52 +39,4 @@ public class LuceneComponentConfiguration { public void setConfig(LuceneConfiguration config) { this.config = config; } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public LuceneOperation getOperation() { - return operation; - } - - public void setOperation(LuceneOperation operation) { - this.operation = operation; - } - - public File getSourceDirectory() { - return sourceDirectory; - } - - public void setSourceDirectory(File sourceDirectory) { - this.sourceDirectory = sourceDirectory; - } - - public File getIndexDirectory() { - return indexDirectory; - } - - public void setIndexDirectory(File indexDirectory) { - this.indexDirectory = indexDirectory; - } - - public Analyzer getAnalyzer() { - return analyzer; - } - - public void setAnalyzer(Analyzer analyzer) { - this.analyzer = analyzer; - } - - public Integer getMaxHits() { - return maxHits; - } - - public void setMaxHits(Integer maxHits) { - this.maxHits = maxHits; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java index 6f33834..afc8604 100644 --- a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java +++ b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java @@ -17,7 +17,6 @@ package org.apache.camel.component.nagios.springboot; import org.apache.camel.component.nagios.NagiosConfiguration; -import org.apache.camel.component.nagios.NagiosEncryptionMethod; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -29,34 +28,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class NagiosComponentConfiguration { /** - * To use a shared configuraiton. Properties of the shared configuration can - * also be set individually. + * To use a shared NagiosConfiguration */ private NagiosConfiguration configuration; - /** - * This is the address of the Nagios host where checks should be send. - */ - private String host; - /** - * The port number of the host. - */ - private Integer port; - /** - * Connection timeout in millis. - */ - private Integer connectionTimeout; - /** - * Sending timeout in millis. - */ - private Integer timeout; - /** - * Password to be authenticated when sending checks to Nagios. - */ - private String password; - /** - * To specify an encryption method. - */ - private NagiosEncryptionMethod encryptionMethod; public NagiosConfiguration getConfiguration() { return configuration; @@ -65,52 +39,4 @@ public class NagiosComponentConfiguration { public void setConfiguration(NagiosConfiguration configuration) { this.configuration = configuration; } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public Integer getConnectionTimeout() { - return connectionTimeout; - } - - public void setConnectionTimeout(Integer connectionTimeout) { - this.connectionTimeout = connectionTimeout; - } - - public Integer getTimeout() { - return timeout; - } - - public void setTimeout(Integer timeout) { - this.timeout = timeout; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public NagiosEncryptionMethod getEncryptionMethod() { - return encryptionMethod; - } - - public void setEncryptionMethod(NagiosEncryptionMethod encryptionMethod) { - this.encryptionMethod = encryptionMethod; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java index 733892e..037baa4 100644 --- a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java +++ b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java @@ -16,12 +16,7 @@ */ package org.apache.camel.component.olingo2.springboot; -import java.util.Map; import org.apache.camel.component.olingo2.Olingo2Configuration; -import org.apache.camel.component.olingo2.internal.Olingo2ApiName; -import org.apache.camel.util.jsse.SSLContextParameters; -import org.apache.http.HttpHost; -import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -33,57 +28,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class Olingo2ComponentConfiguration { /** - * To use the shared configuration. Properties of the shared configuration - * can also be set individually. + * To use the shared configuration */ private Olingo2Configuration configuration; - /** - * What kind of operation to perform - */ - private Olingo2ApiName apiName; - /** - * What sub operation to use for the selected operation - */ - private String methodName; - /** - * Target OData service base URI e.g. - * http://services.odata.org/OData/OData.svc - */ - private String serviceUri; - /** - * Content-Type header value can be used to specify JSON or XML message - * format defaults to application/json;charset=utf-8 - */ - private String contentType; - /** - * Custom HTTP headers to inject into every request this could include OAuth - * tokens etc. - */ - private Map<String, String> httpHeaders; - /** - * HTTP connection creation timeout in milliseconds defaults to 30000 (30 - * seconds) - */ - private Integer connectTimeout; - /** - * HTTP request timeout in milliseconds defaults to 30000 (30 seconds) - */ - private Integer socketTimeout; - /** - * HTTP proxy server configuration - */ - private HttpHost proxy; - /** - * To configure security using SSLContextParameters - */ - private SSLContextParameters sslContextParameters; - /** - * Custom HTTP async client builder for more complex HTTP client - * configuration overrides connectionTimeout socketTimeout proxy and - * sslContext. Note that a socketTimeout MUST be specified in the builder - * otherwise OData requests could block indefinitely - */ - private HttpAsyncClientBuilder httpAsyncClientBuilder; public Olingo2Configuration getConfiguration() { return configuration; @@ -92,86 +39,4 @@ public class Olingo2ComponentConfiguration { public void setConfiguration(Olingo2Configuration configuration) { this.configuration = configuration; } - - public Olingo2ApiName getApiName() { - return apiName; - } - - public void setApiName(Olingo2ApiName apiName) { - this.apiName = apiName; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public String getServiceUri() { - return serviceUri; - } - - public void setServiceUri(String serviceUri) { - this.serviceUri = serviceUri; - } - - public String getContentType() { - return contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } - - public Map<String, String> getHttpHeaders() { - return httpHeaders; - } - - public void setHttpHeaders(Map<String, String> httpHeaders) { - this.httpHeaders = httpHeaders; - } - - public Integer getConnectTimeout() { - return connectTimeout; - } - - public void setConnectTimeout(Integer connectTimeout) { - this.connectTimeout = connectTimeout; - } - - public Integer getSocketTimeout() { - return socketTimeout; - } - - public void setSocketTimeout(Integer socketTimeout) { - this.socketTimeout = socketTimeout; - } - - public HttpHost getProxy() { - return proxy; - } - - public void setProxy(HttpHost proxy) { - this.proxy = proxy; - } - - public SSLContextParameters getSslContextParameters() { - return sslContextParameters; - } - - public void setSslContextParameters( - SSLContextParameters sslContextParameters) { - this.sslContextParameters = sslContextParameters; - } - - public HttpAsyncClientBuilder getHttpAsyncClientBuilder() { - return httpAsyncClientBuilder; - } - - public void setHttpAsyncClientBuilder( - HttpAsyncClientBuilder httpAsyncClientBuilder) { - this.httpAsyncClientBuilder = httpAsyncClientBuilder; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java index f6d4e31..0a34deb 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java @@ -16,16 +16,6 @@ */ package org.apache.camel.component.xmlsecurity.springboot; -import java.util.List; -import javax.xml.crypto.AlgorithmMethod; -import javax.xml.crypto.KeySelector; -import javax.xml.crypto.URIDereferencer; -import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec; -import org.apache.camel.component.xmlsecurity.api.KeyAccessor; -import org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler; -import org.apache.camel.component.xmlsecurity.api.XmlSignature2Message; -import org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker; -import org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties; import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration; import org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -40,322 +30,14 @@ public class XmlSignatureComponentConfiguration { /** * To use a shared XmlSignerConfiguration configuration to use as base for - * configuring endpoints. Properties of the shared configuration can also be - * set individually. + * configuring endpoints. */ private XmlSignerConfiguration signerConfiguration; /** * To use a shared XmlVerifierConfiguration configuration to use as base for - * configuring endpoints. Properties of the shared configuration can also be - * set individually. + * configuring endpoints. */ private XmlVerifierConfiguration verifierConfiguration; - /** - * If you want to restrict the remote access via reference URIs you can - * setSigner an own dereferencer. Optional parameter. If not setSigner the - * provider default dereferencer is used which can resolve URI fragments - * HTTP file and XPpointer URIs. Attention: The implementation is provider - * dependent! - */ - private URIDereferencer signerUriDereferencer; - /** - * You can setSigner a base URI which is used in the URI dereferencing. - * Relative URIs are then concatenated with the base URI. - */ - private String signerBaseUri; - /** - * Disallows that the incoming XML document contains DTD DOCTYPE - * declaration. The default value is link BooleanTRUE. - */ - private Boolean signerDisallowDoctypeDecl; - /** - * For the signing process a private key is necessary. You specify a key - * accessor bean which provides this private key. The key accessor bean must - * implement the KeyAccessor interface. The package - * org.apache.camel.component.xmlsecurity.api contains the default - * implementation class DefaultKeyAccessor which reads the private key from - * a Java keystore. - */ - private KeyAccessor signerKeyAccessor; - /** - * Indicator whether the XML declaration in the outgoing message body should - * be omitted. Default value is false. Can be overwritten by the header link - * XmlSignatureConstantsHEADER_OMIT_XML_DECLARATION. - */ - private Boolean signerOmitXmlDeclaration; - /** - * Determines if the XML signature specific headers be cleared after signing - * and verification. Defaults to true. - */ - private Boolean signerClearHeaders; - /** - * Canonicalization method used to canonicalize the SignedInfo element - * before the digest is calculated. You can use the helper methods - * XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or - * getSignerCanonicalizationMethod(String algorithm List - * inclusiveNamespacePrefixes) to create a canonicalization method. - */ - private AlgorithmMethod signerCanonicalizationMethod; - /** - * Classpath to the XML Schema. Must be specified in the detached XML - * Signature case for determining the ID attributes might be setSigner in - * the enveloped and enveloping case. If setSigner then the XML document is - * validated with the specified XML schema. The schema resource URI can be - * overwritten by the header link - * XmlSignatureConstantsHEADER_SCHEMA_RESOURCE_URI. - */ - private String signerSchemaResourceUri; - /** - * The character encoding of the resulting signed XML document. If null then - * the encoding of the original XML document is used. - */ - private String signerOutputXmlEncoding; - /** - * Transforms which are executed on the message body before the digest is - * calculated. By default C14n is added and in the case of enveloped - * signature (see option parentLocalName) also - * http://www.w3.org/2000/09/xmldsigenveloped-signature is added at position - * 0 of the list. Use methods in XmlSignatureHelper to create the transform - * methods. - */ - private List<AlgorithmMethod> signerTransformMethods; - /** - * Signature algorithm. Default value is - * http://www.w3.org/2000/09/xmldsigrsa-sha1. - */ - private String signerSignatureAlgorithm; - /** - * Digest algorithm URI. Optional parameter. This digest algorithm is used - * for calculating the digest of the input message. If this digest algorithm - * is not specified then the digest algorithm is calculated from the - * signature algorithm. Example: http://www.w3.org/2001/04/xmlencsha256 - */ - private String signerDigestAlgorithm; - /** - * In order to protect the KeyInfo element from tampering you can add a - * reference to the signed info element so that it is protected via the - * signature value. The default value is true. Only relevant when a KeyInfo - * is returned by KeyAccessor. and link KeyInfogetId() is not null. - */ - private Boolean signerAddKeyInfoReference; - /** - * Namespace prefix for the XML signature namespace - * http://www.w3.org/2000/09/xmldsig. Default value is ds. If null or an - * empty value is setSigner then no prefix is used for the XML signature - * namespace. See best practice - * http://www.w3.org/TR/xmldsig-bestpractices/signing-xml- - * without-namespaces - */ - private String signerPrefixForXmlSignatureNamespace; - /** - * Local name of the parent element to which the XML signature element will - * be added. Only relevant for enveloped XML signature. Alternatively you - * can also use link setParentXpath(XPathFilterParameterSpec). Default value - * is null. The value must be null for enveloping and detached XML - * signature. This parameter or the parameter link - * setParentXpath(XPathFilterParameterSpec) for enveloped signature and the - * parameter link setXpathsToIdAttributes(List) for detached signature must - * not be setSigner in the same configuration. If the parameters parentXpath - * and parentLocalName are specified in the same configuration then an - * exception is thrown. - */ - private String signerParentLocalName; - /** - * Namespace of the parent element to which the XML signature element will - * be added. - */ - private String signerParentNamespace; - /** - * setSigners the content object Id attribute value. By default a UUID is - * generated. If you setSigner the null value then a new UUID will be - * generated. Only used in the enveloping case. - */ - private String signerContentObjectId; - /** - * setSigners the signature Id. If this parameter is not setSigner (null - * value) then a unique ID is generated for the signature ID (default). If - * this parameter is setSigner to (empty string) then no Id attribute is - * created in the signature element. - */ - private String signerSignatureId; - /** - * Reference URI for the content to be signed. Only used in the enveloped - * case. If the reference URI contains an ID attribute value then the - * resource schema URI ( link setSchemaResourceUri(String)) must also be - * setSigner because the schema validator will then find out which - * attributes are ID attributes. Will be ignored in the enveloping or - * detached case. - */ - private String signerContentReferenceUri; - /** - * Type of the content reference. The default value is null. This value can - * be overwritten by the header link - * XmlSignatureConstantsHEADER_CONTENT_REFERENCE_TYPE. - */ - private String signerContentReferenceType; - /** - * Indicator whether the message body contains plain text. The default value - * is false indicating that the message body contains XML. The value can be - * overwritten by the header link - * XmlSignatureConstantsHEADER_MESSAGE_IS_PLAIN_TEXT. - */ - private Boolean signerPlainText; - /** - * Encoding of the plain text. Only relevant if the message body is plain - * text (see parameter link plainText. Default value is UTF-8. - */ - private String signerPlainTextEncoding; - /** - * For adding additional References and Objects to the XML signature which - * contain additional properties you can provide a bean which implements the - * XmlSignatureProperties interface. - */ - private XmlSignatureProperties signerProperties; - /** - * Define the elements which are signed in the detached case via XPATH - * expressions to ID attributes (attributes of type ID). For each element - * found via the XPATH expression a detached signature is created whose - * reference URI contains the corresponding attribute value (preceded by - * ''). The signature becomes the last sibling of the signed element. - * Elements with deeper hierarchy level are signed first. You can also - * setSigner the XPATH list dynamically via the header link - * XmlSignatureConstantsHEADER_XPATHS_TO_ID_ATTRIBUTES. The parameter link - * setParentLocalName(String) or link - * setParentXpath(XPathFilterParameterSpec) for enveloped signature and this - * parameter for detached signature must not be setSigner in the same - * configuration. - */ - private List<XPathFilterParameterSpec> signerXpathsToIdAttributes; - /** - * setSigners the XPath to find the parent node in the enveloped case. - * Either you specify the parent node via this method or the local name and - * namespace of the parent with the methods link setParentLocalName(String) - * and link setParentNamespace(String). Default value is null. The value - * must be null for enveloping and detached XML signature. If the parameters - * parentXpath and parentLocalName are specified in the same configuration - * then an exception is thrown. - */ - private XPathFilterParameterSpec signerParentXpath; - /** - * If you want to restrict the remote access via reference URIs you can - * setVerifier an own dereferencer. Optional parameter. If not setVerifier - * the provider default dereferencer is used which can resolve URI fragments - * HTTP file and XPpointer URIs. Attention: The implementation is provider - * dependent! - */ - private URIDereferencer verifierUriDereferencer; - /** - * You can setVerifier a base URI which is used in the URI dereferencing. - * Relative URIs are then concatenated with the base URI. - */ - private String verifierBaseUri; - /** - * Provides the key for validating the XML signature. - */ - private KeySelector verifierKeySelector; - /** - * This interface allows the application to check the XML signature before - * the validation is executed. This step is recommended in - * http://www.w3.org/TR/xmldsig-bestpractices/check-what-is-signed - */ - private XmlSignatureChecker verifierXmlSignatureChecker; - /** - * Disallows that the incoming XML document contains DTD DOCTYPE - * declaration. The default value is link BooleanTRUE. - */ - private Boolean verifierDisallowDoctypeDecl; - /** - * Indicator whether the XML declaration in the outgoing message body should - * be omitted. Default value is false. Can be overwritten by the header link - * XmlSignatureConstantsHEADER_OMIT_XML_DECLARATION. - */ - private Boolean verifierOmitXmlDeclaration; - /** - * Determines if the XML signature specific headers be cleared after signing - * and verification. Defaults to true. - */ - private Boolean verifierClearHeaders; - /** - * Classpath to the XML Schema. Must be specified in the detached XML - * Signature case for determining the ID attributes might be setVerifier in - * the enveloped and enveloping case. If setVerifier then the XML document - * is validated with the specified XML schema. The schema resource URI can - * be overwritten by the header link - * XmlSignatureConstantsHEADER_SCHEMA_RESOURCE_URI. - */ - private String verifierSchemaResourceUri; - /** - * The character encoding of the resulting signed XML document. If null then - * the encoding of the original XML document is used. - */ - private String verifierOutputXmlEncoding; - /** - * Bean which maps the XML signature to the output-message after the - * validation. How this mapping should be done can be configured by the - * options outputNodeSearchType outputNodeSearch and - * removeSignatureElements. The default implementation offers three - * possibilities which are related to the three output node search types - * Default ElementName and XPath. The default implementation determines a - * node which is then serialized and setVerifier to the body of the output - * message If the search type is ElementName then the output node (which - * must be in this case an element) is determined by the local name and - * namespace defined in the search value (see option outputNodeSearch). If - * the search type is XPath then the output node is determined by the XPath - * specified in the search value (in this case the output node can be of - * type Element TextNode or Document). If the output node search type is - * Default then the following rules apply: In the enveloped XML signature - * case (there is a reference with URI= and transform - * http://www.w3.org/2000/09/xmldsigenveloped-signature) the incoming XML - * document without the Signature element is setVerifier to the output - * message body. In the non-enveloped XML signature case the message body is - * determined from a referenced Object; this is explained in more detail in - * chapter Output Node Determination in Enveloping XML Signature Case. - */ - private XmlSignature2Message verifierXmlSignature2Message; - /** - * Handles the different validation failed situations. The default - * implementation throws specific exceptions for the different situations - * (All exceptions have the package name - * org.apache.camel.component.xmlsecurity.api and are a sub-class of - * XmlSignatureInvalidException. If the signature value validation fails a - * XmlSignatureInvalidValueException is thrown. If a reference validation - * fails a XmlSignatureInvalidContentHashException is thrown. For more - * detailed information see the JavaDoc. - */ - private ValidationFailedHandler verifierValidationFailedHandler; - /** - * setVerifiers the output node search value for determining the node from - * the XML signature document which shall be setVerifier to the output - * message body. The class of the value depends on the type of the output - * node search. The output node search is forwarded to XmlSignature2Message. - */ - private Object verifierOutputNodeSearch; - /** - * Determines the search type for determining the output node which is - * serialized into the output message bodyF. See link - * setOutputNodeSearch(Object). The supported default search types you can - * find in DefaultXmlSignature2Message. - */ - private String verifierOutputNodeSearchType; - /** - * Indicator whether the XML signature elements (elements with local name - * Signature and namesapce http://www.w3.org/2000/09/xmldsig) shall be - * removed from the document setVerifier to the output message. Normally - * this is only necessary if the XML signature is enveloped. The default - * value is link BooleanFALSE. This parameter is forwarded to - * XmlSignature2Message. This indicator has no effect if the output node - * search is of type link - * DefaultXmlSignature2MessageOUTPUT_NODE_SEARCH_TYPE_DEFAULT.F - */ - private Boolean verifierRemoveSignatureElements; - /** - * Enables secure validation. If true then secure validation is enabled. - */ - private Boolean verifierSecureValidation; - /** - * Name of handler to - */ - private String verifierValidationFailedHandlerName; public XmlSignerConfiguration getSignerConfiguration() { return signerConfiguration; @@ -374,344 +56,4 @@ public class XmlSignatureComponentConfiguration { XmlVerifierConfiguration verifierConfiguration) { this.verifierConfiguration = verifierConfiguration; } - - public URIDereferencer getSignerUriDereferencer() { - return signerUriDereferencer; - } - - public void setSignerUriDereferencer(URIDereferencer signerUriDereferencer) { - this.signerUriDereferencer = signerUriDereferencer; - } - - public String getSignerBaseUri() { - return signerBaseUri; - } - - public void setSignerBaseUri(String signerBaseUri) { - this.signerBaseUri = signerBaseUri; - } - - public Boolean getSignerDisallowDoctypeDecl() { - return signerDisallowDoctypeDecl; - } - - public void setSignerDisallowDoctypeDecl(Boolean signerDisallowDoctypeDecl) { - this.signerDisallowDoctypeDecl = signerDisallowDoctypeDecl; - } - - public KeyAccessor getSignerKeyAccessor() { - return signerKeyAccessor; - } - - public void setSignerKeyAccessor(KeyAccessor signerKeyAccessor) { - this.signerKeyAccessor = signerKeyAccessor; - } - - public Boolean getSignerOmitXmlDeclaration() { - return signerOmitXmlDeclaration; - } - - public void setSignerOmitXmlDeclaration(Boolean signerOmitXmlDeclaration) { - this.signerOmitXmlDeclaration = signerOmitXmlDeclaration; - } - - public Boolean getSignerClearHeaders() { - return signerClearHeaders; - } - - public void setSignerClearHeaders(Boolean signerClearHeaders) { - this.signerClearHeaders = signerClearHeaders; - } - - public AlgorithmMethod getSignerCanonicalizationMethod() { - return signerCanonicalizationMethod; - } - - public void setSignerCanonicalizationMethod( - AlgorithmMethod signerCanonicalizationMethod) { - this.signerCanonicalizationMethod = signerCanonicalizationMethod; - } - - public String getSignerSchemaResourceUri() { - return signerSchemaResourceUri; - } - - public void setSignerSchemaResourceUri(String signerSchemaResourceUri) { - this.signerSchemaResourceUri = signerSchemaResourceUri; - } - - public String getSignerOutputXmlEncoding() { - return signerOutputXmlEncoding; - } - - public void setSignerOutputXmlEncoding(String signerOutputXmlEncoding) { - this.signerOutputXmlEncoding = signerOutputXmlEncoding; - } - - public List<AlgorithmMethod> getSignerTransformMethods() { - return signerTransformMethods; - } - - public void setSignerTransformMethods( - List<AlgorithmMethod> signerTransformMethods) { - this.signerTransformMethods = signerTransformMethods; - } - - public String getSignerSignatureAlgorithm() { - return signerSignatureAlgorithm; - } - - public void setSignerSignatureAlgorithm(String signerSignatureAlgorithm) { - this.signerSignatureAlgorithm = signerSignatureAlgorithm; - } - - public String getSignerDigestAlgorithm() { - return signerDigestAlgorithm; - } - - public void setSignerDigestAlgorithm(String signerDigestAlgorithm) { - this.signerDigestAlgorithm = signerDigestAlgorithm; - } - - public Boolean getSignerAddKeyInfoReference() { - return signerAddKeyInfoReference; - } - - public void setSignerAddKeyInfoReference(Boolean signerAddKeyInfoReference) { - this.signerAddKeyInfoReference = signerAddKeyInfoReference; - } - - public String getSignerPrefixForXmlSignatureNamespace() { - return signerPrefixForXmlSignatureNamespace; - } - - public void setSignerPrefixForXmlSignatureNamespace( - String signerPrefixForXmlSignatureNamespace) { - this.signerPrefixForXmlSignatureNamespace = signerPrefixForXmlSignatureNamespace; - } - - public String getSignerParentLocalName() { - return signerParentLocalName; - } - - public void setSignerParentLocalName(String signerParentLocalName) { - this.signerParentLocalName = signerParentLocalName; - } - - public String getSignerParentNamespace() { - return signerParentNamespace; - } - - public void setSignerParentNamespace(String signerParentNamespace) { - this.signerParentNamespace = signerParentNamespace; - } - - public String getSignerContentObjectId() { - return signerContentObjectId; - } - - public void setSignerContentObjectId(String signerContentObjectId) { - this.signerContentObjectId = signerContentObjectId; - } - - public String getSignerSignatureId() { - return signerSignatureId; - } - - public void setSignerSignatureId(String signerSignatureId) { - this.signerSignatureId = signerSignatureId; - } - - public String getSignerContentReferenceUri() { - return signerContentReferenceUri; - } - - public void setSignerContentReferenceUri(String signerContentReferenceUri) { - this.signerContentReferenceUri = signerContentReferenceUri; - } - - public String getSignerContentReferenceType() { - return signerContentReferenceType; - } - - public void setSignerContentReferenceType(String signerContentReferenceType) { - this.signerContentReferenceType = signerContentReferenceType; - } - - public Boolean getSignerPlainText() { - return signerPlainText; - } - - public void setSignerPlainText(Boolean signerPlainText) { - this.signerPlainText = signerPlainText; - } - - public String getSignerPlainTextEncoding() { - return signerPlainTextEncoding; - } - - public void setSignerPlainTextEncoding(String signerPlainTextEncoding) { - this.signerPlainTextEncoding = signerPlainTextEncoding; - } - - public XmlSignatureProperties getSignerProperties() { - return signerProperties; - } - - public void setSignerProperties(XmlSignatureProperties signerProperties) { - this.signerProperties = signerProperties; - } - - public List<XPathFilterParameterSpec> getSignerXpathsToIdAttributes() { - return signerXpathsToIdAttributes; - } - - public void setSignerXpathsToIdAttributes( - List<XPathFilterParameterSpec> signerXpathsToIdAttributes) { - this.signerXpathsToIdAttributes = signerXpathsToIdAttributes; - } - - public XPathFilterParameterSpec getSignerParentXpath() { - return signerParentXpath; - } - - public void setSignerParentXpath(XPathFilterParameterSpec signerParentXpath) { - this.signerParentXpath = signerParentXpath; - } - - public URIDereferencer getVerifierUriDereferencer() { - return verifierUriDereferencer; - } - - public void setVerifierUriDereferencer( - URIDereferencer verifierUriDereferencer) { - this.verifierUriDereferencer = verifierUriDereferencer; - } - - public String getVerifierBaseUri() { - return verifierBaseUri; - } - - public void setVerifierBaseUri(String verifierBaseUri) { - this.verifierBaseUri = verifierBaseUri; - } - - public KeySelector getVerifierKeySelector() { - return verifierKeySelector; - } - - public void setVerifierKeySelector(KeySelector verifierKeySelector) { - this.verifierKeySelector = verifierKeySelector; - } - - public XmlSignatureChecker getVerifierXmlSignatureChecker() { - return verifierXmlSignatureChecker; - } - - public void setVerifierXmlSignatureChecker( - XmlSignatureChecker verifierXmlSignatureChecker) { - this.verifierXmlSignatureChecker = verifierXmlSignatureChecker; - } - - public Boolean getVerifierDisallowDoctypeDecl() { - return verifierDisallowDoctypeDecl; - } - - public void setVerifierDisallowDoctypeDecl( - Boolean verifierDisallowDoctypeDecl) { - this.verifierDisallowDoctypeDecl = verifierDisallowDoctypeDecl; - } - - public Boolean getVerifierOmitXmlDeclaration() { - return verifierOmitXmlDeclaration; - } - - public void setVerifierOmitXmlDeclaration(Boolean verifierOmitXmlDeclaration) { - this.verifierOmitXmlDeclaration = verifierOmitXmlDeclaration; - } - - public Boolean getVerifierClearHeaders() { - return verifierClearHeaders; - } - - public void setVerifierClearHeaders(Boolean verifierClearHeaders) { - this.verifierClearHeaders = verifierClearHeaders; - } - - public String getVerifierSchemaResourceUri() { - return verifierSchemaResourceUri; - } - - public void setVerifierSchemaResourceUri(String verifierSchemaResourceUri) { - this.verifierSchemaResourceUri = verifierSchemaResourceUri; - } - - public String getVerifierOutputXmlEncoding() { - return verifierOutputXmlEncoding; - } - - public void setVerifierOutputXmlEncoding(String verifierOutputXmlEncoding) { - this.verifierOutputXmlEncoding = verifierOutputXmlEncoding; - } - - public XmlSignature2Message getVerifierXmlSignature2Message() { - return verifierXmlSignature2Message; - } - - public void setVerifierXmlSignature2Message( - XmlSignature2Message verifierXmlSignature2Message) { - this.verifierXmlSignature2Message = verifierXmlSignature2Message; - } - - public ValidationFailedHandler getVerifierValidationFailedHandler() { - return verifierValidationFailedHandler; - } - - public void setVerifierValidationFailedHandler( - ValidationFailedHandler verifierValidationFailedHandler) { - this.verifierValidationFailedHandler = verifierValidationFailedHandler; - } - - public Object getVerifierOutputNodeSearch() { - return verifierOutputNodeSearch; - } - - public void setVerifierOutputNodeSearch(Object verifierOutputNodeSearch) { - this.verifierOutputNodeSearch = verifierOutputNodeSearch; - } - - public String getVerifierOutputNodeSearchType() { - return verifierOutputNodeSearchType; - } - - public void setVerifierOutputNodeSearchType( - String verifierOutputNodeSearchType) { - this.verifierOutputNodeSearchType = verifierOutputNodeSearchType; - } - - public Boolean getVerifierRemoveSignatureElements() { - return verifierRemoveSignatureElements; - } - - public void setVerifierRemoveSignatureElements( - Boolean verifierRemoveSignatureElements) { - this.verifierRemoveSignatureElements = verifierRemoveSignatureElements; - } - - public Boolean getVerifierSecureValidation() { - return verifierSecureValidation; - } - - public void setVerifierSecureValidation(Boolean verifierSecureValidation) { - this.verifierSecureValidation = verifierSecureValidation; - } - - public String getVerifierValidationFailedHandlerName() { - return verifierValidationFailedHandlerName; - } - - public void setVerifierValidationFailedHandlerName( - String verifierValidationFailedHandlerName) { - this.verifierValidationFailedHandlerName = verifierValidationFailedHandlerName; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a04fb15b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java index c541107..108348b 100644 --- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java +++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java @@ -89,7 +89,7 @@ public class AvroComponent extends UriEndpointComponent { try { Field f = protocolClass.getField("PROTOCOL"); if (f != null) { - Protocol protocol = (Protocol) f.get(null); + Protocol protocol = (Protocol)f.get(null); config.setProtocol(protocol); } } catch (NoSuchFieldException e) { @@ -110,9 +110,9 @@ public class AvroComponent extends UriEndpointComponent { if (config.isSingleParameter()) { Map<String, Protocol.Message> messageMap = config.getProtocol().getMessages(); - Iterable<Protocol.Message> messagesToCheck = config.getMessageName() == null - ? messageMap.values() - : Collections.singleton(messageMap.get(config.getMessageName())); + Iterable<Protocol.Message> messagesToCheck = config.getMessageName() == null + ? messageMap.values() + : Collections.singleton(messageMap.get(config.getMessageName())); for (Protocol.Message message : messagesToCheck) { if (message.getRequest().getFields().size() != 1) { throw new IllegalArgumentException("Single parameter option can't be used with message " @@ -123,12 +123,12 @@ public class AvroComponent extends UriEndpointComponent { } } } - + /** * Registers new responder with uri as key. Registers consumer in responder. * In case if responder is already registered by this uri then just * registers consumer. - * + * * @param uri URI of the endpoint without message name * @param messageName message name * @param consumer consumer that will be registered in providers` registry @@ -142,7 +142,7 @@ public class AvroComponent extends UriEndpointComponent { } listener.register(messageName, consumer); } - + /** * Calls unregister of consumer by appropriate message name. * In case if all consumers are unregistered then it removes responder from the registry. @@ -161,140 +161,9 @@ public class AvroComponent extends UriEndpointComponent { } /** - * To use a shared {@link AvroConfiguration} to configure options once. Properties of the shared configuration can also be set individually. + * To use a shared {@link AvroConfiguration} to configure options once */ public void setConfiguration(AvroConfiguration configuration) { this.configuration = configuration; } - - private AvroConfiguration getConfigurationOrCreate() { - if (this.getConfiguration() == null) { - this.setConfiguration(new AvroConfiguration()); - } - return this.getConfiguration(); - } - - public String getHost() { - return getConfigurationOrCreate().getHost(); - } - - /** - * Hostname to use - * @param host - */ - public void setHost(String host) { - getConfigurationOrCreate().setHost(host); - } - - public int getPort() { - return getConfigurationOrCreate().getPort(); - } - - /** - * Port number to use - * @param port - */ - public void setPort(int port) { - getConfigurationOrCreate().setPort(port); - } - - public Protocol getProtocol() { - return getConfigurationOrCreate().getProtocol(); - } - - /** - * Avro protocol to use - * @param protocol - */ - public void setProtocol(Protocol protocol) { - getConfigurationOrCreate().setProtocol(protocol); - } - - public AvroTransport getTransport() { - return getConfigurationOrCreate().getTransport(); - } - - /** - * Transport to use - * @param transport - */ - public void setTransport(String transport) { - getConfigurationOrCreate().setTransport(transport); - } - - public void setTransport(AvroTransport transport) { - getConfigurationOrCreate().setTransport(transport); - } - - public String getProtocolLocation() { - return getConfigurationOrCreate().getProtocolLocation(); - } - - /** - * Avro protocol location - * @param protocolLocation - */ - public void setProtocolLocation(String protocolLocation) { - getConfigurationOrCreate().setProtocolLocation(protocolLocation); - } - - public String getProtocolClassName() { - return getConfigurationOrCreate().getProtocolClassName(); - } - - /** - * Avro protocol to use defined by the FQN class name - * @param protocolClassName - */ - public void setProtocolClassName(String protocolClassName) { - getConfigurationOrCreate().setProtocolClassName(protocolClassName); - } - - public String getMessageName() { - return getConfigurationOrCreate().getMessageName(); - } - - /** - * The name of the message to send. - * @param messageName - */ - public void setMessageName(String messageName) { - getConfigurationOrCreate().setMessageName(messageName); - } - - public String getUriAuthority() { - return getConfigurationOrCreate().getUriAuthority(); - } - - /** - * Authority to use (username and password) - * @param uriAuthority - */ - public void setUriAuthority(String uriAuthority) { - getConfigurationOrCreate().setUriAuthority(uriAuthority); - } - - public boolean isReflectionProtocol() { - return getConfigurationOrCreate().isReflectionProtocol(); - } - - /** - * If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected - * @param isReflectionProtocol - */ - public void setReflectionProtocol(boolean isReflectionProtocol) { - getConfigurationOrCreate().setReflectionProtocol(isReflectionProtocol); - } - - public boolean isSingleParameter() { - return getConfigurationOrCreate().isSingleParameter(); - } - - /** - * If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message - * @param singleParameter - */ - public void setSingleParameter(boolean singleParameter) { - getConfigurationOrCreate().setSingleParameter(singleParameter); - } }
