This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 2b0e517 Fixed CS for Camel-salesforce 2b0e517 is described below commit 2b0e517bac84ede940fa3a0825d5696c969f6486 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Jan 24 09:42:16 2019 +0100 Fixed CS for Camel-salesforce --- .../apache/camel/component/salesforce/SalesforceComponent.java | 8 ++++---- .../org/apache/camel/component/salesforce/SalesforceConsumer.java | 2 +- .../org/apache/camel/component/salesforce/SalesforceEndpoint.java | 2 +- .../apache/camel/component/salesforce/SalesforceLoginConfig.java | 4 ++-- .../camel/component/salesforce/internal/SalesforceSession.java | 2 +- .../org/apache/camel/component/salesforce/LoginConfigHelper.java | 2 +- .../main/java/org/apache/camel/maven/AbstractSalesforceMojo.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java index d0efbe0..a1e74e0 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java @@ -37,15 +37,15 @@ import org.apache.camel.component.salesforce.internal.SalesforceSession; import org.apache.camel.component.salesforce.internal.client.DefaultRestClient; import org.apache.camel.component.salesforce.internal.client.RestClient; import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.spi.Metadata; import org.apache.camel.support.IntrospectionSupport; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.StringHelper; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; +import org.apache.camel.support.service.ServiceHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.StringHelper; import org.eclipse.jetty.client.HttpProxy; import org.eclipse.jetty.client.Origin; import org.eclipse.jetty.client.ProxyConfiguration; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java index 1956792..f1e63bf 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java @@ -32,8 +32,8 @@ import org.apache.camel.component.salesforce.internal.client.RestClient; import org.apache.camel.component.salesforce.internal.streaming.PushTopicHelper; import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper; import org.apache.camel.support.DefaultConsumer; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.service.ServiceHelper; +import org.apache.camel.util.ObjectHelper; import org.cometd.bayeux.Message; import org.cometd.bayeux.client.ClientSessionChannel; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java index c0a6feb..b8b94bd 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java @@ -21,11 +21,11 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.salesforce.internal.OperationName; import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.impl.SynchronousDelegateProducer; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; import org.eclipse.jetty.client.HttpClient; /** diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java index 60d142e..1f7106e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java @@ -16,8 +16,8 @@ */ package org.apache.camel.component.salesforce; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.jsse.KeyStoreParameters; +import org.apache.camel.util.ObjectHelper; /** * Configuration object for Salesforce login properties @@ -242,4 +242,4 @@ public class SalesforceLoginConfig { + ", userName='" + userName + '\'' + ", password=********'" + password + '\'' + ", keystore=********'" + keystore + '\'' + ", lazyLogin=" + lazyLogin + ']'; } -} \ No newline at end of file +} diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java index 339ea2d..0fcc566 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java @@ -47,8 +47,8 @@ import org.apache.camel.component.salesforce.api.dto.RestError; import org.apache.camel.component.salesforce.api.utils.JsonUtils; import org.apache.camel.component.salesforce.internal.dto.LoginError; import org.apache.camel.component.salesforce.internal.dto.LoginToken; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.jsse.KeyStoreParameters; +import org.apache.camel.util.ObjectHelper; import org.eclipse.jetty.client.HttpConversation; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java index e0cd862..513dd25 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.jsse.KeyStoreParameters; +import org.apache.camel.util.ObjectHelper; import static org.apache.camel.util.ObjectHelper.isNotEmpty; diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSalesforceMojo.java index f68113f..8e20a6e 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSalesforceMojo.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSalesforceMojo.java @@ -33,9 +33,9 @@ import org.apache.camel.component.salesforce.internal.client.DefaultRestClient; import org.apache.camel.component.salesforce.internal.client.RestClient; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.StringHelper; -import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException;