Repository: metamodel Updated Branches: refs/heads/5.x 78d85d6d3 -> 16a5e7157
METAMODEL-1140: Allowed SalesforceDataContext without sec. token Closes #143 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/9976b410 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/9976b410 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/9976b410 Branch: refs/heads/5.x Commit: 9976b410f775d09f6d458be435ae01af5171e9bb Parents: b0cfe3a Author: David Krause <[email protected]> Authored: Fri May 12 20:29:28 2017 -0700 Committer: Kasper Sørensen <[email protected]> Committed: Fri May 12 20:31:06 2017 -0700 ---------------------------------------------------------------------- CHANGES.md | 2 ++ .../metamodel/salesforce/SalesforceDataContext.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/9976b410/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index ebc7e66..0f6c990 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,5 @@ + * [METAMODEL-1140] - Allowed SalesforceDataContext without a security token. + ### Apache MetaModel 4.6.0 * [METAMODEL-1136] - New connector for Amazon DynamoDB. http://git-wip-us.apache.org/repos/asf/metamodel/blob/9976b410/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java ---------------------------------------------------------------------- diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java index e1f95aa..3076147 100644 --- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java +++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java @@ -77,7 +77,7 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement try { ConnectorConfig config = new ConnectorConfig(); config.setUsername(username); - config.setPassword(password + securityToken); + config.setPassword(securityToken == null ? password : password + securityToken); config.setAuthEndpoint(endpoint); config.setServiceEndpoint(endpoint); _connection = Connector.newConnection(config); @@ -88,7 +88,15 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement public SalesforceDataContext(String username, String password, String securityToken) { try { - _connection = Connector.newConnection(username, password + securityToken); + _connection = Connector.newConnection(username, securityToken == null ? password : password + securityToken); + } catch (ConnectionException e) { + throw SalesforceUtils.wrapException(e, "Failed to log in to Salesforce service"); + } + } + + public SalesforceDataContext(String username, String password) { + try { + _connection = Connector.newConnection(username, password); } catch (ConnectionException e) { throw SalesforceUtils.wrapException(e, "Failed to log in to Salesforce service"); }
