You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2017/05/10 03:54:18 UTC
[16/43] metamodel git commit: METAMODEL-1115: Fixed by exposing new
SalesforceDataContext constructor
METAMODEL-1115: Fixed by exposing new SalesforceDataContext constructor
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e5fb93a0
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e5fb93a0
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e5fb93a0
Branch: refs/heads/5.x
Commit: e5fb93a0cba347faf3d42337bae1e844f82305b1
Parents: 73b70b9
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Aug 21 21:15:21 2016 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Aug 21 21:26:06 2016 -0700
----------------------------------------------------------------------
salesforce/pom.xml | 12 +---------
.../salesforce/SalesforceDataContext.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5fb93a0/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index c6d5ed7..307833e 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -36,17 +36,7 @@ under the License.
<dependency>
<groupId>com.force.api</groupId>
<artifactId>force-partner-api</artifactId>
- <version>24.0.0</version>
- <exclusions>
- <exclusion>
- <artifactId>gson</artifactId>
- <groupId>com.google.code.gson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>js</artifactId>
- <groupId>rhino</groupId>
- </exclusion>
- </exclusions>
+ <version>35.0.1</version>
</dependency>
<!-- provided -->
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e5fb93a0/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 c8add52..e1f95aa 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
@@ -94,6 +94,30 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
}
}
+ /**
+ * Creates a {@code SalesforceDataContext} instance , configured with given
+ * salesforce connection.
+ *
+ * @param connection
+ * salesforce connection (cannot be {@code null}).
+ *
+ */
+ public SalesforceDataContext(PartnerConnection connection) {
+ if (connection == null) {
+ throw new IllegalArgumentException("connection cannot be null");
+ }
+ _connection = connection;
+ }
+
+ /**
+ * Returns the Salesforce connection being used by this datacontext.
+ *
+ * @return the Salesforce connection
+ */
+ public PartnerConnection getConnection() {
+ return _connection;
+ }
+
@Override
protected Schema getMainSchema() throws MetaModelException {
final SalesforceSchema schema = new SalesforceSchema(getMainSchemaName(), _connection);