Merge pull request #24 from SkNuwanTissera/slalpha5

Migrate connector on SLAlpha5 branch to SLBeta3 with backward compatibility
ballerina-platform · Sep 23, 2021 · dd803de · dd803de
2 parents aa429b6 + f8917b0
commit dd803de
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
         steps:
             - uses: actions/checkout@v2
             - name: Ballerina Build
-              uses: ballerina-platform/ballerina-action/@slalpha5
+              uses: ballerina-platform/ballerina-action/@nightly
               with:
                   args:
                       build -c

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -10,7 +10,7 @@ jobs:
         steps:
             - uses: actions/checkout@v2
             - name: Ballerina Build
-              uses: ballerina-platform/ballerina-action/@slalpha5
+              uses: ballerina-platform/ballerina-action/@nightly
               with:
                   args:
                       build -c

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
         steps:
             - uses: actions/checkout@v2
             - name: Ballerina Build
-              uses: ballerina-platform/ballerina-action/@slalpha5
+              uses: ballerina-platform/ballerina-action/@nightly
               with:
                   args:
                       build -c --skip-tests
@@ -21,7 +21,7 @@ jobs:
                   CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
                   REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
             - name: Ballerina Push
-              uses: ballerina-platform/ballerina-action/@slalpha5
+              uses: ballerina-platform/ballerina-action/@nightly
               with:
                   args:
                       push

diff --git a/Ballerina.toml b/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org= "ballerinax"
 name= "googleapis.people"
-version= "0.1.3"
+version= "0.1.4"
 license= ["Apache-2.0"]
 authors = ["Ballerina"]
 keywords = ["google", "people", "contact"]

diff --git a/Dependencies.toml b/Dependencies.toml
diff --git a/Package.md b/Package.md
@@ -18,7 +18,7 @@ The Google People Ballerina Connector allows you to access the Google People API
 * Java 11 Installed
   Java Development Kit (JDK) with version 11 is required.
 
-* Download the Ballerina [distribution](https://ballerinalang.org/downloads/) SLAlpha5
+* Download the Ballerina [distribution](https://ballerinalang.org/downloads/) SLBeta3
   Ballerina Swan Lake Alpha Version 5 is required.
 
 * Instantiate the connector by giving authentication details in the HTTP client config. The HTTP client config has built-in support for BasicAuth and OAuth 2.0. Google People uses OAuth 2.0 to authenticate and authorize requests. 
@@ -36,7 +36,7 @@ The Google People Ballerina Connector allows you to access the Google People API
 
 |                             |            Versions             |
 |:---------------------------:|:-------------------------------:|
-|    Ballerina Language       |       Swan Lake Alpha 5         |
+|    Ballerina Language       |       Swan Lake Beta 3          |
 |     Google People API       |               V1                |
 
 

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The Google People Ballerina Connector allows you to access the Google People API
 * Java 11 Installed
   Java Development Kit (JDK) with version 11 is required.
 
-* Download the Ballerina [distribution](https://ballerinalang.org/downloads/) SLAlpha5
+* Download the Ballerina [distribution](https://ballerinalang.org/downloads/) SLBeta3
   Ballerina Swan Lake Alpha Version 5 is required.
 
 * Instantiate the connector by giving authentication details in the HTTP client config. The HTTP client config has built-in support for BasicAuth and OAuth 2.0. Google People uses OAuth 2.0 to authenticate and authorize requests. 
@@ -38,7 +38,7 @@ The Google People Ballerina Connector allows you to access the Google People API
 
 |                             |            Versions             |
 |:---------------------------:|:-------------------------------:|
-|    Ballerina Language       |       Swan Lake Alpha 5         |
+|    Ballerina Language       |       Swan Lake Beta 3          |
 |     Google People API       |               V1                |
 
 

diff --git a/utils.bal b/utils.bal
@@ -188,7 +188,7 @@ isolated function convertImageToBase64String(string imagePath) returns @tainted
 function getContacts(http:Client googleContactClient, @tainted PersonResponse[] persons, string pathProvided = EMPTY_STRING, 
                            ContactListOptions? options = ()) returns @tainted stream<PersonResponse>|ContactsTriggerResponse|error {
     string path = <@untainted>prepareUrlWithContactOptions(pathProvided, options);
-    var httpResponse = googleContactClient->get(path);
+    http:Response httpResponse = check googleContactClient->get(path);
     json getResponse = check checkAndSetErrors(httpResponse);
     ConnectionsResponse|ContactsTriggerResponse|error response = getResponse.cloneWithType(ConnectionsResponse);
     if (response is ConnectionsResponse) {
@@ -229,7 +229,7 @@ function getContacts(http:Client googleContactClient, @tainted PersonResponse[]
 isolated function getContactsStream(http:Client googleContactClient, @tainted PersonResponse[] persons, string pathProvided = EMPTY_STRING, 
                            ContactListOptions? options = ()) returns @tainted stream<PersonResponse>|error {
     string path = <@untainted>prepareUrlWithContactOptions(pathProvided, options);
-    var httpResponse = googleContactClient->get(path);
+    http:Response httpResponse = check googleContactClient->get(path);
     json response = check checkAndSetErrors(httpResponse);
     map<json> mapResponse = <map<json>> response;
     if (mapResponse.length() != 0) {
@@ -266,7 +266,7 @@ isolated function getOtherContactsStream(http:Client googleContactClient, @taint
                                 string pathProvided = EMPTY_STRING, ContactListOptions? options = ()) 
                                 returns @tainted stream<PersonResponse>|error {
     string path = <@untainted>prepareUrlWithContactOptions(pathProvided, options);
-    var httpResponse = googleContactClient->get(path);
+    http:Response httpResponse = check googleContactClient->get(path);
     json response = check checkAndSetErrors(httpResponse);
     map<json> mapResponse = <map<json>> response;
     if (mapResponse.length() != 0) {
@@ -303,7 +303,7 @@ isolated function getContactGroupStream(http:Client googleContactClient, @tainte
                                 string pathProvided = EMPTY_STRING, ContactListOptions? options = ()) 
                                 returns @tainted stream<ContactGroup>|error {
     string path = <@untainted>prepareUrlWithContactOptions(pathProvided, options);
-    var httpResponse = googleContactClient->get(path);
+    http:Response httpResponse = check googleContactClient->get(path);
     json response = check checkAndSetErrors(httpResponse);
     map<json> mapResponse = <map<json>> response;
     if (mapResponse.length() != 0) {