Merge pull request #74 from chamil321/120

chamil321 · web-flow · commit 9d1dbb69be9d · 2020-03-20T16:28:38.000+05:30
Change org/module and Migrate to b7a v1.2.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,18 @@
+name: CI
+
+on: [push]
+
+jobs:
+    build:
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+            - name: Ballerina Build
+              uses: ballerina-platform/ballerina-action/@master
+              with:
+                  args:
+                      build -a -c --skip-tests
+              env:
+                  JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: Deployment
+
+on: [release]
+
+jobs:
+    build:
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+            - name: Ballerina Build
+              uses: ballerina-platform/ballerina-action/@master
+              with:
+                  args:
+                      build -a -c --skip-tests
+            - name: Ballerina Push
+              uses: ballerina-platform/ballerina-action/@master
+              with:
+                  args:
+                      push -a
+              env:
+                  JAVA_OPTS: -DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true
+                  BALLERINA_CENTRAL_ACCESS_TOKEN: ${{ secrets.BALLERINA_CENTRAL_ACCESS_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 script:
-  - wget https://product-dist.ballerina.io/downloads/1.1.0/ballerina-linux-installer-x64-1.1.0.deb
-  - sudo dpkg -i ballerina-linux-installer-x64-1.1.0.deb
+  - wget https://product-dist.ballerina.io/downloads/1.2.0/ballerina-linux-installer-x64-1.2.0.deb
+  - sudo dpkg -i ballerina-linux-installer-x64-1.2.0.deb
   - sudo apt-get install -f
   - ballerina --version
-  - ballerina build -c --skip-tests gmail
+  - ballerina build -c --skip-tests googleapis.gmail
diff --git a/Ballerina.lock b/Ballerina.lock
@@ -1,19 +1,4 @@
-org_name = "wso2"
-version = "0.11.0"
-lockfile_version = "1.0.0"
-ballerina_version = "1.1.0"
-
-[[imports."wso2/gmail:0.11.0"]]
-org_name = "ballerinax"
-name = "java"
-version = "0.0.0"
-
-[[imports."wso2/gmail:0.11.0"]]
 org_name = "ballerinax"
-name = "java.arrays"
-version = "0.0.0"
-
-[[imports."ballerinax/java.arrays:0.0.0"]]
-org_name = "ballerinax"
-name = "java"
-version = "0.0.0"
+version = "0.12.0"
+lockfile_version = "1.0.0"
+ballerina_version = "1.2.0"
diff --git a/Ballerina.toml b/Ballerina.toml
@@ -1,8 +1,8 @@
 [project]
-org-name= "wso2"
-version= "0.11.0"
-authors = ["WSO2"]
-repository = "https://github.com/wso2-ballerina/module-gmail"
+org-name= "ballerinax"
+version= "0.12.0"
+authors = ["Ballerina"]
+repository = "https://github.com/ballerina-platform/module-gmail"
 keywords = ["gmail","email"]
 license = ["Apache-2.0"]
 
diff --git a/Readme.md b/Readme.md
@@ -1,8 +1,10 @@
-[![Build Status](https://travis-ci.org/wso2-ballerina/module-gmail.svg?branch=master)](https://travis-ci.org/wso2-ballerina/module-gmail)
+[![Build Status](https://travis-ci.org/ballerina-platform/module-gmail.svg?branch=master)](https://travis-ci.org/ballerina-platform/module-gmail)
 
 # Ballerina Gmail Connector
 
-Ballerina Gmail Connector provides the capability to send, read and delete emails through the Gmail REST API. It also provides the ability to read, trash, untrash and delete threads, ability to get the Gmail profile and mailbox history, etc. The connector handles OAuth 2.0 authentication.
+Ballerina Gmail Connector provides the capability to send, read and delete emails through the Gmail REST API. 
+It also provides the ability to read, trash, untrash and delete threads, ability to get the Gmail profile and 
+mailbox history, etc. The connector handles OAuth 2.0 authentication.
 
 The following sections provide you with information on how to use the Ballerina Gmail Connector.
 
@@ -15,56 +17,66 @@ The following sections provide you with information on how to use the Ballerina
 
 | Ballerina Language Versions  | Gmail API Version |
 |:---------------------------:|:------------------------------:|
-|  1.0.x, 1.1.x                   |   v1                           |
+|  1.0.x, 1.1.x, 1.2.x            |   v1                           |
 
 ## Feature Overview
 
 #### Working with Emails
 
-The `wso2/gmail` module contains operations to send emails in Text and HTML formats with attachments and inline images. It supports searching and reading emails in Gmail using Gmail filters. The module also supports trashing, untrashing, deleting, and modifying emails.
+The `ballerinax/googleapis.gmail` module contains operations to send emails in Text and HTML formats with 
+attachments and inline images. It supports searching and reading emails in Gmail using Gmail filters. The module 
+also supports trashing, untrashing, deleting, and modifying emails.
 
 #### Working with Threads
 
-The `wso2/gmail` module contains operations to read, search, trash, untrash, modify and delete email threads in Gmail.
+The `ballerinax/googleapis.gmail` module contains operations to read, search, trash, untrash, modify and delete 
+email threads in Gmail.
 
 #### Working with Drafts
 
-The `wso2/gmail` module contains operations to search, read, delete, create, update and send drafts in Gmail.
+The `ballerinax/googleapis.gmail` module contains operations to search, read, delete, create, update and send 
+drafts in Gmail.
 
 #### Working with Labels
 
-The `wso2/gmail` module containes operations to list, read, create, update and delete labels in Gmail.
+The `ballerinax/googleapis.gmail` module contains operations to list, read, create, update and delete labels in Gmail.
 
 #### Working with User Profiles
 
-The `wso2/gmail` module contains operations to get Gmail user profile details.
+The `ballerinax/googleapis.gmail` module contains operations to get Gmail user profile details.
 
 #### Working with Mailbox History
 
-The `wso2/gmail` module contains operations to lists the history of changes to the user's mailbox.
+The `ballerinax/googleapis.gmail` module contains operations to lists the history of changes to the user's mailbox.
 
 ## Getting Started
 
 ## Sample
-First, import the `wso2/gmail` module into the Ballerina project.
+First, import the `ballerinax/googleapis.gmail` module into the Ballerina project.
 ```ballerina
-import wso2/gmail;
+import ballerinax/googleapis.gmail;
 ```
-Instantiate the connector by giving authentication details in the Gmail client config, which has built-in support for OAuth 2.0. Gmail uses OAuth 2.0 to authenticate and authorize requests. The Gmail connector can be minimally instantiated in the Gmail client config using the Access Token or by using the Client ID, Client Secret and Refresh Token.
+Instantiate the connector by giving authentication details in the Gmail client config, which has built-in support 
+for OAuth 2.0. Gmail uses OAuth 2.0 to authenticate and authorize requests. The Gmail connector can be minimally 
+instantiated in the Gmail client config using the Access Token or by using the Client ID, Client Secret and Refresh Token.
 
 **Obtaining Tokens to Run the Sample**
 
-1. Visit [Google API Console](https://console.developers.google.com), click **Create Project**, and follow the wizard to create a new project.
+1. Visit [Google API Console](https://console.developers.google.com), click **Create Project**, and follow the wizard 
+to create a new project.
 2. Go to **Credentials -> OAuth Consent Screen**, enter a product name to be shown to users, and click **Save**.
 3. On the **Credentials** tab, click **Create Credentials** and select **OAuth Client ID**.
-4. Select an application type, enter a name for the application, and specify a redirect URI (enter https://developers.google.com/oauthplayground if you want to use 
+4. Select an application type, enter a name for the application, and specify a redirect URI 
+(enter https://developers.google.com/oauthplayground if you want to use 
 [OAuth 2.0 Playground](https://developers.google.com/oauthplayground) to receive the Authorization Code and obtain the 
 Access Token and Refresh Token).
 5. Click **Create**. Your Client ID and Client Secret will appear.
-6. In a separate browser window or tab, visit [OAuth 2.0 Playground](https://developers.google.com/oauthplayground). Click on the `OAuth 2.0 Configuration`
- icon in the top right corner and click on `Use your own OAuth credentials` and provide your `OAuth Client ID` and `OAuth Client Secret`.
+6. In a separate browser window or tab, visit [OAuth 2.0 Playground](https://developers.google.com/oauthplayground). 
+Click on the `OAuth 2.0 Configuration` icon in the top right corner and click on `Use your own OAuth credentials` and 
+provide your `OAuth Client ID` and `OAuth Client Secret`.
 7. Select the required Gmail API scopes from the list of API's, and then click **Authorize APIs**.
-8. When you receive your authorization code, click **Exchange authorization code for tokens** to obtain the refresh token and access token.
+8. When you receive your authorization code, click **Exchange authorization code for tokens** to obtain the 
+refresh token and access token.
 
 You can now enter the credentials in the Gmail client config.
 ```ballerina
@@ -115,7 +127,8 @@ if (sendMessageResponse is [string, string]) {
 }
 ```
 
-The `readMessage` remote function reads messages. It returns the `Message` object when successful or an `error` when unsuccessful.
+The `readMessage` remote function reads messages. It returns the `Message` object when successful or an `error` 
+when unsuccessful.
 
 ```ballerina
 var response = gmailClient->readMessage(userId, <@untainted>messageId);
diff --git a/src/gmail/resources/.keep b/src/gmail/resources/.keep
diff --git a/src/gmail/tests/resources/.keep b/src/gmail/tests/resources/.keep
diff --git a/src/googleapis.gmail/Module.md b/src/googleapis.gmail/Module.md
@@ -50,7 +50,7 @@ gmail:Client gmailClient = new (gmailConfig);
 
 ```ballerina
 import ballerina/io;
-import wso2/gmail;
+import ballerinax/googleapis.gmail;
 
 gmail:GmailConfiguration gmailConfig = {
     oauthClientConfig: {
diff --git a/src/googleapis.gmail/external_functions.bal b/src/googleapis.gmail/external_functions.bal
@@ -1,4 +1,4 @@
-import ballerinax/java;
+import ballerina/java;
 
 function split(handle receiver, handle delimeter) returns handle = @java:Method {
     class: "java.lang.String"
diff --git a/src/googleapis.gmail/gmail_constants.bal b/src/googleapis.gmail/gmail_constants.bal
@@ -190,4 +190,4 @@ public const string TEXT_PLAIN = "text/plain";
 public const string TEXT_HTML = "text/html";
 
 // Error Codes
-const string GMAIL_ERROR_CODE = "(wso2/gmail)GmailError";
+const string GMAIL_ERROR_CODE = "(ballerinax/googleapis.gmail)GmailError";
diff --git a/src/googleapis.gmail/gmail_data_mappings.bal b/src/googleapis.gmail/gmail_data_mappings.bal
@@ -131,11 +131,11 @@ function convertJSONToMsgBodyAttachment(json sourceMessageBodyJsonObject) return
     return targetMessageAttachment;
 }
 
-# Transforms mail thread JSON object into Thread.
+# Transforms mail thread JSON object into MailThread type.
 # + sourceThreadJsonObject - `json` message thread object.
-# + return - Returns Thread type.
-function convertJSONToThreadType(json sourceThreadJsonObject) returns @tainted Thread {
-    Thread targetThreadType = {};
+# + return - Returns MailThread type.
+function convertJSONToThreadType(json sourceThreadJsonObject) returns @tainted MailThread {
+    MailThread targetThreadType = {};
     //Empty check is done since toString() returns "null" when accessing non existing keys of a json object
     targetThreadType.id = sourceThreadJsonObject.id != () ? sourceThreadJsonObject.id.toString() : EMPTY_STRING;
     targetThreadType.historyId = sourceThreadJsonObject.historyId != () ?
diff --git a/src/googleapis.gmail/gmail_endpoint.bal b/src/googleapis.gmail/gmail_endpoint.bal
@@ -293,9 +293,9 @@ public type Client client object {
     #                               base64url encoded string. (the payload field is not included in the response)
     # + metadataHeaders - Optional. The meta data headers array to include in the reponse when the format is given
     #                           as `FORMAT_METADATA`.
-    # + return - If successful, returns Thread type of the specified mail thread. Else returns error.
+    # + return - If successful, returns MailThread type of the specified mail thread. Else returns error.
     public remote function readThread(string userId, string threadId, string? format = (),
-    string[]? metadataHeaders = ()) returns @tainted Thread | error {
+    string[]? metadataHeaders = ()) returns @tainted MailThread | error {
         string uriParams = "";
         if (format is string) {
             uriParams = check appendEncodedURIParameter(uriParams, FORMAT, format);
@@ -310,7 +310,7 @@ public type Client client object {
         var httpResponse = self.gmailClient->get(readThreadPath);
         //Get json thread response. If unsuccessful, throws and returns error.
         json jsonReadThreadResponse = check handleResponse(httpResponse);
-        //Transform the json thread response from Gmail API to Thread type. If unsuccessful, throws and returns error.
+        //Transform the json thread response from Gmail API to MailThread type. If unsuccessful, throws and returns error.
         return convertJSONToThreadType(jsonReadThreadResponse);
     }
 
@@ -364,9 +364,9 @@ public type Client client object {
     # + threadId - The id of the thread to modify
     # + addLabelIds - A list of IDs of labels to add to this thread
     # + removeLabelIds - A list IDs of labels to remove from this thread
-    # + return - If successful, returns modified Thread type object. Else returns error.
+    # + return - If successful, returns modified MailThread type object. Else returns error.
     public remote function modifyThread(string userId, string threadId, string[] addLabelIds, string[] removeLabelIds)
-    returns @tainted Thread | error {
+    returns @tainted MailThread | error {
         string modifyThreadPath = USER_RESOURCE + userId + THREAD_RESOURCE + FORWARD_SLASH_SYMBOL + threadId
             + MODIFY_RESOURCE;
         if (addLabelIds.length() == 0 && removeLabelIds.length() == 0) {
@@ -382,7 +382,7 @@ public type Client client object {
         http:Request request = new;
         request.setJsonPayload(jsonPayload);
         var httpResponse = self.gmailClient->post(modifyThreadPath, request);
-        //Transform the json thread response from Gmail API to Thread type. If unsuccessful throws and returns error.
+        //Transform the json thread response from Gmail API to MailThread type. If unsuccessful throws and returns error.
         return convertJSONToThreadType(check handleResponse(httpResponse));
     }
 
diff --git a/src/googleapis.gmail/gmail_types.bal b/src/googleapis.gmail/gmail_types.bal
@@ -33,7 +33,7 @@ public type UserProfile record {
 # + snippet - A short part of the message text
 # + historyId - The ID of the last history record that modified this thread
 # + messages - The list of messages in the thread
-public type Thread record {
+public type MailThread record {
     string id = "";
     string snippet = "";
     string historyId = "";
diff --git a/src/googleapis.gmail/gmail_utils.bal b/src/googleapis.gmail/gmail_utils.bal
@@ -17,11 +17,11 @@
 import ballerina/encoding;
 import ballerina/http;
 import ballerina/io;
+import ballerina/java;
+import ballerina/java.arrays as jarrays;
 import ballerina/lang.'string as strings;
 import ballerina/log;
 import ballerina/mime;
-import ballerinax/java;
-import ballerinax/java.arrays as jarrays;
 
 # Gets only the attachment and inline image MIME messageParts from the JSON message payload of the email.
 #
diff --git a/src/googleapis.gmail/tests/README.md b/src/googleapis.gmail/tests/README.md
@@ -2,7 +2,7 @@
 
 | Ballerina Language Version | Gmail API Version |  
 |:--------------------------:|:-----------------:|
-| 1.0.1                    |        v1         |
+| 1.2.0                    |        v1         |
 
 ### Prerequisites
 
diff --git a/src/googleapis.gmail/tests/main_test.bal b/src/googleapis.gmail/tests/main_test.bal
@@ -266,7 +266,7 @@ function testReadThread() {
     log:printInfo("testReadThread");
     var thread = gmailClient->readThread(testUserId, sentTextMessageThreadId, format = FORMAT_METADATA,
         metadataHeaders = ["Subject"]);
-    if (thread is Thread) {
+    if (thread is MailThread) {
         test:assertEquals(thread.id, sentTextMessageThreadId, msg = "Read thread failed");
     } else {
         test:assertFail(msg = <string>thread.detail()["message"]);
@@ -281,13 +281,13 @@ function testModifyThread() {
     //Modify labels of the thread with thread id which was sent in testSendTextMessage
     log:printInfo("testModifyThread");
     var response = gmailClient->modifyThread(testUserId, sentTextMessageThreadId, ["INBOX"], []);
-    if (response is Thread) {
+    if (response is MailThread) {
         test:assertTrue(response.id == sentTextMessageThreadId, msg = "Modify thread by adding new label failed");
     } else {
         test:assertFail(msg = <string>response.detail()["message"]);
     }
     response = gmailClient->modifyThread(testUserId, sentTextMessageThreadId, [], ["INBOX"]);
-    if (response is Thread) {
+    if (response is MailThread) {
         test:assertTrue(response.id == sentTextMessageThreadId,
             msg = "Modify thread by removing existing label failed");
     } else {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import ballerinax/java;`
	`1`	`+import ballerina/java;`
`2`	`2`
`3`	`3`	`function split(handle receiver, handle delimeter) returns handle = @java:Method {`
`4`	`4`	`class: "java.lang.String"`