Fixing checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d4c9a3da Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4c9a3da Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4c9a3da Branch: refs/heads/master Commit: d4c9a3da48c44f7ef52bac116860e6562f91af5c Parents: 032047c Author: Zoran Regvart <zregv...@apache.org> Authored: Wed Mar 15 12:59:54 2017 +0100 Committer: Zoran Regvart <zregv...@apache.org> Committed: Wed Mar 15 13:02:20 2017 +0100 ---------------------------------------------------------------------- .../salesforce/SalesforceComponent.java | 6 ++--- .../SalesforceComponentVerifierTest.java | 24 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d4c9a3da/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java ---------------------------------------------------------------------- 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 80fdf8a..2655434 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 @@ -69,9 +69,9 @@ public class SalesforceComponent extends UriEndpointComponent implements Endpoin private static final Logger LOG = LoggerFactory.getLogger(SalesforceComponent.class); - static final int CONNECTION_TIMEOUT = 60000; - static final Pattern SOBJECT_NAME_PATTERN = Pattern.compile("^.*[\\?&]sObjectName=([^&,]+).*$"); - static final String APEX_CALL_PREFIX = OperationName.APEX_CALL.value() + "/"; + private static final int CONNECTION_TIMEOUT = 60000; + private static final Pattern SOBJECT_NAME_PATTERN = Pattern.compile("^.*[\\?&]sObjectName=([^&,]+).*$"); + private static final String APEX_CALL_PREFIX = OperationName.APEX_CALL.value() + "/"; @Metadata(label = "security") private SalesforceLoginConfig loginConfig; http://git-wip-us.apache.org/repos/asf/camel/blob/d4c9a3da/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierTest.java index 542139e..cb1607a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierTest.java @@ -28,17 +28,17 @@ import org.junit.Assume; import org.junit.Test; public class SalesforceComponentVerifierTest extends CamelTestSupport { - private static final String clientId = getSystemPropertyOrEnvVar("salesforce.clientid"); - private static final String clientSecret = getSystemPropertyOrEnvVar("salesforce.clientsecret"); - private static final String userName = getSystemPropertyOrEnvVar("salesforce.userName"); - private static final String password = getSystemPropertyOrEnvVar("salesforce.password"); + private static final String CLIENT_ID = getSystemPropertyOrEnvVar("salesforce.clientid"); + private static final String CLIENT_SECRET = getSystemPropertyOrEnvVar("salesforce.clientsecret"); + private static final String USERNAME = getSystemPropertyOrEnvVar("salesforce.userName"); + private static final String PASSWORD = getSystemPropertyOrEnvVar("salesforce.password"); @Override protected void doPreSetup() throws Exception { - Assume.assumeNotNull(clientId); - Assume.assumeNotNull(clientSecret); - Assume.assumeNotNull(userName); - Assume.assumeNotNull(password); + Assume.assumeNotNull(CLIENT_ID); + Assume.assumeNotNull(CLIENT_SECRET); + Assume.assumeNotNull(USERNAME); + Assume.assumeNotNull(PASSWORD); } @Override @@ -52,10 +52,10 @@ public class SalesforceComponentVerifierTest extends CamelTestSupport { protected Map<String, Object> getParameters() { HashMap<String, Object> parameters = new HashMap<>(); - parameters.put("clientId", clientId); - parameters.put("clientSecret", clientSecret); - parameters.put("userName", userName); - parameters.put("password", password); + parameters.put("clientId", CLIENT_ID); + parameters.put("clientSecret", CLIENT_SECRET); + parameters.put("userName", USERNAME); + parameters.put("password", PASSWORD); return parameters; }
