Skip to content

Commit

Permalink
Merge pull request #35 from kesavany/master
Browse files Browse the repository at this point in the history
Blocking call support added.
  • Loading branch information
Shakila authored Jun 26, 2019
2 parents 6dc4cc7 + ad20875 commit ba892c2
Show file tree
Hide file tree
Showing 143 changed files with 2,936 additions and 1,193 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The Salesforce REST [Connector](https://docs.wso2.com/display/EI650/Working+with

| Connector version | Supported Salesforce REST API version | Supported WSO2 ESB/EI version |
| ------------- | ------------- | ------------- |
| [1.0.8](https://github.com/wso2-extensions/esb-connector-salesforcerest/tree/org.wso2.carbon.connector.salesforcerest-1.0.8) | v32.0 | EI 6.5.0 |
| [1.0.7](https://github.com/wso2-extensions/esb-connector-salesforcerest/tree/org.wso2.carbon.connector.salesforcerest-1.0.7) | v32.0 | EI 6.5.0 |
| [1.0.6](https://github.com/wso2-extensions/esb-connector-salesforcerest/tree/org.wso2.carbon.connector.salesforcerest-1.0.6) | v32.0 | ESB 5.0.0, EI 6.1.0, 6.1.1, 6.2.0, 6.3.0, 6.4.0 |
| [1.0.5](https://github.com/wso2-extensions/esb-connector-salesforcerest/tree/org.wso2.carbon.connector.salesforcerest-1.0.5) | v32.0 | ESB 5.0.0, EI 6.1.0, 6.1.1, 6.2.0, 6.3.0, 6.4.0 |
Expand Down
2 changes: 2 additions & 0 deletions docs/appmenu.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -182,6 +183,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.listItemsInMenu>
Expand Down
2 changes: 2 additions & 0 deletions docs/approvals.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -86,6 +87,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.listApprovals/>
Expand Down
11 changes: 8 additions & 3 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Add the following <salesforcerest.init> method in your configuration:
<apiVersion>{$ctx:apiVersion}</apiVersion>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
```
**Properties**
Expand All @@ -91,6 +92,7 @@ Add the following <salesforcerest.init> method in your configuration:
* clientSecret: The consumer secret of the connected application that you created.
* intervalTime: The time interval in milliseconds, after which you need to check the validity of the access token.
* registryPath: The registry path of the connector. You must specify the registry path as follows: registryPath = “connectors/salesforcerest”.
* blocking: Indicates whether the connector needs to perform blocking invocations to Salesforce. (Supported in WSO2 ESB 4.9.0 and later.)

**Sample Request**

Expand All @@ -106,7 +108,8 @@ Following is a sample REST request that can be handled by the init operation.
"registryPath":"connectors/salesforcerest",
"accessToken":"00D280000017q6q!AQoAQOeXcp7zKo3gUdy6r064_LsJ5bYYrUn_qAZG9TtKFLPfUMRxiato.E162_2XAtCTZLFQTbNk2Rz6Zm_juSakFE_aaBPp",
"intervalTime" : "100000",
"apiUrl":"https://ap2.salesforce.com"
"apiUrl":"https://ap2.salesforce.com",
"blocking" : "false"
}
```

Expand All @@ -125,6 +128,7 @@ Following is a sample REST request that can be handled by the init operation.
<apiVersion>{$ctx:apiVersion}</apiVersion>
<username>{$ctx:username}</username>
<password>{$ctx:password}</password>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
```
**Properties**
Expand All @@ -135,7 +139,7 @@ Following is a sample REST request that can be handled by the init operation.
* clientSecret: The consumer secret of the connected application that you created.
* username: The username for the salesforce.
* password: The password for the salesforce (Need to append the password with security key).

* blocking: Indicates whether the connector needs to perform blocking invocations to Salesforce. (Supported in WSO2 ESB 4.9.0 and later.)

**Sample Request**

Expand All @@ -149,7 +153,8 @@ Following is a sample REST request that can be handled by the init operation for
"apiVersion": "v32.0",
"username": "tharis63@outlook.com",
"password": "xxxxxxxxxxxxxxxxxxxxxx",
"apiUrl":"https://ap2.salesforce.com"
"apiUrl":"https://ap2.salesforce.com",
"blocking" : "false"
}
```

Expand Down
2 changes: 2 additions & 0 deletions docs/event_monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -165,6 +166,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.queryEventMonitoringData>
Expand Down
2 changes: 2 additions & 0 deletions docs/invocable_actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -198,6 +199,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.getAttributeOfSpecificAction>
Expand Down
2 changes: 2 additions & 0 deletions docs/layouts.md
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -475,6 +476,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.sObjectNamedLayouts>
Expand Down
2 changes: 2 additions & 0 deletions docs/list_views.md
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -380,6 +381,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.recentListViews>
Expand Down
2 changes: 2 additions & 0 deletions docs/process_rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -146,6 +147,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.getSpecificProcessRule>
Expand Down
2 changes: 2 additions & 0 deletions docs/queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -294,6 +295,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.query>
Expand Down
3 changes: 3 additions & 0 deletions docs/quick_actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ Given below is a sample response for the getDefaultValueOfAction operation.
Following example illustrates how to connect to Salesforce with the init operation and getSpecificAction operation.

1. Create a sample proxy as below :

```xml
<proxy xmlns="http://ws.apache.org/ns/synapse" name="getSpecificAction"
statistics="disable" trace="disable" transports="https http">
Expand All @@ -320,6 +321,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -330,6 +332,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.getSpecificAction>
Expand Down
2 changes: 2 additions & 0 deletions docs/records.md
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -621,6 +622,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.create>
Expand Down
3 changes: 3 additions & 0 deletions docs/sObjects.md
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ Given below is a sample response for the sObjectRows operation.
Following example illustrates how to connect to Salesforce with the init operation and sObjectGetUpdated operation.

1. Create a sample proxy as below :

```xml
<proxy xmlns="http://ws.apache.org/ns/synapse" name="sObjectGetUpdated"
statistics="disable" trace="disable" transports="https http">
Expand All @@ -632,6 +633,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -642,6 +644,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.sObjectGetUpdated>
Expand Down
2 changes: 2 additions & 0 deletions docs/search.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -216,6 +217,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.search>
Expand Down
2 changes: 2 additions & 0 deletions docs/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<property name="apiVersion" expression="json-eval($.apiVersion)"/>
<property name="registryPath" expression="json-eval($.registryPath)"/>
<property name="intervalTime" expression="json-eval($.intervalTime)"/>
<property name="blocking" expression="json-eval($.blocking)"/>
<salesforcerest.init>
<accessToken>{$ctx:accessToken}</accessToken>
<apiUrl>{$ctx:apiUrl}</apiUrl>
Expand All @@ -153,6 +154,7 @@ Following example illustrates how to connect to Salesforce with the init operati
<refreshToken>{$ctx:refreshToken}</refreshToken>
<registryPath>{$ctx:registryPath}</registryPath>
<intervalTime>{$ctx:intervalTime}</intervalTime>
<blocking>{$ctx:blocking}</blocking>
</salesforcerest.init>
<log category="INFO" level="full" separator=","/>
<salesforcerest.resetPassword>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<groupId>org.wso2.carbon.connector</groupId>
<artifactId>org.wso2.carbon.connector.salesforcerest</artifactId>
<packaging>jar</packaging>
<version>1.0.8-SNAPSHOT</version>
<version>1.0.8</version>
<name>WSO2 Carbon - Mediation Library Connector For Salesforcerest</name>
<url>http://wso2.org</url>
<properties>
<connector.name>salesforcerest</connector.name>
<product.ei.version>6.5.0-m5</product.ei.version>
<product.ei.version>6.5.0</product.ei.version>
<carbon.kernel.version>4.4.17</carbon.kernel.version>
<automation.framework.utils.version>4.4.2</automation.framework.utils.version>
<automation.framework.version>4.4.3</automation.framework.version>
Expand Down
Loading

0 comments on commit ba892c2

Please sign in to comment.