From ba1dc02f624a6e5f9761b9bebec90f4f67aec0cf Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Wed, 14 Aug 2019 16:37:03 +0200 Subject: [PATCH 01/15] Added Feature Flag to enable Whatsapp Sandbox --- README.md | 10 ++++++++++ .../java/com/messagebird/MessageBirdClient.java | 13 ++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbacf4fe..94992545 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,16 @@ If you server doesn't have a direct connection to the internet you can setup a p messageBirdService.setProxy(proxy); ``` +##### Conversations WhatsApp Sandbox +To use the whatsapp sandbox you need to add `MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX` to the list of features you want enabled. Don't forget to replace `YOUR_ACCESS_KEY` with your actual access key. + +```java + // Create a MessageBirdService + final MessageBirdService messageBirdService = new MessageBirdServiceImpl("YOUR_ACCESS_KEY"); + // Add the service to the client + final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new String[]{MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX}); +``` + Documentation ------------- Complete documentation, instructions, and examples are available at: diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index 57c42f29..7abbbdcc 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -43,7 +43,9 @@ public class MessageBirdClient { * can, however, override this behaviour by providing absolute URLs * ourselves. */ - private static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1"; + private String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1"; + private static final String CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL ="https://whatsapp-sandbox.messagebird.com/v1"; + static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com"; private static String[] supportedLanguages = {"de-DE", "en-AU", "en-UK", "en-US", "es-ES", "es-LA", "fr-FR", "it-IT", "nl-NL", "pt-BR"}; @@ -68,10 +70,19 @@ public class MessageBirdClient { private MessageBirdService messageBirdService; + + public static final String ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX = "ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX"; + public MessageBirdClient(final MessageBirdService messageBirdService) { this.messageBirdService = messageBirdService; } + public MessageBirdClient(final MessageBirdService messageBirdService, String[] features) { + this.messageBirdService = messageBirdService; + if(Arrays.asList(features).contains(MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX)) { + this.CONVERSATIONS_BASE_URL = CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL; + } + } /****************************************************************************************************/ /** Balance and HRL methods **/ /****************************************************************************************************/ From 71ef655f51c0766b27d5e2f5a9bc7abb399d09dd Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 16 Aug 2019 12:42:41 +0200 Subject: [PATCH 02/15] Change features to using ENUMS --- README.md | 2 +- api/src/main/java/com/messagebird/MessageBirdClient.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 94992545..44fc4f0c 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ To use the whatsapp sandbox you need to add `MessageBirdClient.ENABLE_CONVERSATI // Create a MessageBirdService final MessageBirdService messageBirdService = new MessageBirdServiceImpl("YOUR_ACCESS_KEY"); // Add the service to the client - final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new String[]{MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX}); + final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new MessageBirdClient.Feature[]{MessageBirdClient.Feature.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX}); ``` Documentation diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index 7abbbdcc..bea22cc0 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -71,15 +71,17 @@ public class MessageBirdClient { private MessageBirdService messageBirdService; - public static final String ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX = "ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX"; + public enum Feature { + ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX + } public MessageBirdClient(final MessageBirdService messageBirdService) { this.messageBirdService = messageBirdService; } - public MessageBirdClient(final MessageBirdService messageBirdService, String[] features) { + public MessageBirdClient(final MessageBirdService messageBirdService, Feature[] features) { this.messageBirdService = messageBirdService; - if(Arrays.asList(features).contains(MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX)) { + if(Arrays.asList(features).contains(Feature.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX)) { this.CONVERSATIONS_BASE_URL = CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL; } } From 861083a606da66b8d8096cfc83e55854283fca32 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Wed, 28 Aug 2019 11:30:42 +0200 Subject: [PATCH 03/15] Changed ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX to ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX --- README.md | 4 ++-- api/src/main/java/com/messagebird/MessageBirdClient.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 44fc4f0c..9c59497e 100644 --- a/README.md +++ b/README.md @@ -116,13 +116,13 @@ If you server doesn't have a direct connection to the internet you can setup a p ``` ##### Conversations WhatsApp Sandbox -To use the whatsapp sandbox you need to add `MessageBirdClient.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX` to the list of features you want enabled. Don't forget to replace `YOUR_ACCESS_KEY` with your actual access key. +To use the whatsapp sandbox you need to add `MessageBirdClient.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX` to the list of features you want enabled. Don't forget to replace `YOUR_ACCESS_KEY` with your actual access key. ```java // Create a MessageBirdService final MessageBirdService messageBirdService = new MessageBirdServiceImpl("YOUR_ACCESS_KEY"); // Add the service to the client - final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new MessageBirdClient.Feature[]{MessageBirdClient.Feature.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX}); + final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new MessageBirdClient.Feature[]{MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX}); ``` Documentation diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index bea22cc0..c3c31f18 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -72,7 +72,7 @@ public class MessageBirdClient { public enum Feature { - ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX + ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX } public MessageBirdClient(final MessageBirdService messageBirdService) { @@ -81,7 +81,7 @@ public MessageBirdClient(final MessageBirdService messageBirdService) { public MessageBirdClient(final MessageBirdService messageBirdService, Feature[] features) { this.messageBirdService = messageBirdService; - if(Arrays.asList(features).contains(Feature.ENABLE_CONVERSATIONAPI_WHATSAPP_SANDBOX)) { + if(Arrays.asList(features).contains(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX)) { this.CONVERSATIONS_BASE_URL = CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL; } } From d284fd497bd29debd4d483f008aaab83bee10860 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 14:56:04 +0200 Subject: [PATCH 04/15] Fixed style and converted array to list --- README.md | 2 +- api/src/main/java/com/messagebird/MessageBirdClient.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c59497e..39d62596 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ To use the whatsapp sandbox you need to add `MessageBirdClient.ENABLE_CONVERSATI // Create a MessageBirdService final MessageBirdService messageBirdService = new MessageBirdServiceImpl("YOUR_ACCESS_KEY"); // Add the service to the client - final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, new MessageBirdClient.Feature[]{MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX}); + final MessageBirdClient messageBirdClient = new MessageBirdClient(messageBirdService, List.of(MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX)); ``` Documentation diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index c3c31f18..60ca328e 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -43,8 +43,8 @@ public class MessageBirdClient { * can, however, override this behaviour by providing absolute URLs * ourselves. */ - private String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1"; - private static final String CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL ="https://whatsapp-sandbox.messagebird.com/v1"; + private String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1"; + private static final String CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL = "https://whatsapp-sandbox.messagebird.com/v1"; static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com"; private static String[] supportedLanguages = {"de-DE", "en-AU", "en-UK", "en-US", "es-ES", "es-LA", "fr-FR", "it-IT", "nl-NL", "pt-BR"}; @@ -70,7 +70,6 @@ public class MessageBirdClient { private MessageBirdService messageBirdService; - public enum Feature { ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX } @@ -79,9 +78,9 @@ public MessageBirdClient(final MessageBirdService messageBirdService) { this.messageBirdService = messageBirdService; } - public MessageBirdClient(final MessageBirdService messageBirdService, Feature[] features) { + public MessageBirdClient(final MessageBirdService messageBirdService, List features) { this.messageBirdService = messageBirdService; - if(Arrays.asList(features).contains(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX)) { + if(features.indexOf(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX) >= 0) { this.CONVERSATIONS_BASE_URL = CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL; } } From 8976ca362dd2df19005205af077777a24cb76b9b Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:18:52 +0200 Subject: [PATCH 05/15] Changed variables to be better --- .../com/messagebird/MessageBirdClient.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index 60ca328e..bbd4c765 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -43,8 +43,8 @@ public class MessageBirdClient { * can, however, override this behaviour by providing absolute URLs * ourselves. */ - private String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1"; - private static final String CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL = "https://whatsapp-sandbox.messagebird.com/v1"; + private static final String BASE_URL_CONVERSATIONS = "https://conversations.messagebird.com/v1"; + private static final String BASE_URL_CONVERSATIONS_WHATSAPP_SANDBOX = "https://whatsapp-sandbox.messagebird.com/v1"; static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com"; private static String[] supportedLanguages = {"de-DE", "en-AU", "en-UK", "en-US", "es-ES", "es-LA", "fr-FR", "it-IT", "nl-NL", "pt-BR"}; @@ -70,6 +70,8 @@ public class MessageBirdClient { private MessageBirdService messageBirdService; + private String conversationsBaseUrl = BASE_URL_CONVERSATIONS; + public enum Feature { ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX } @@ -81,7 +83,7 @@ public MessageBirdClient(final MessageBirdService messageBirdService) { public MessageBirdClient(final MessageBirdService messageBirdService, List features) { this.messageBirdService = messageBirdService; if(features.indexOf(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX) >= 0) { - this.CONVERSATIONS_BASE_URL = CONVERSATIONS_WHATSAPP_SANDBOX_BASE_URL; + this.conversationsBaseUrl = BASE_URL_CONVERSATIONS_WHATSAPP_SANDBOX; } } /****************************************************************************************************/ @@ -722,7 +724,7 @@ public Conversation viewConversation(final String id) throws NotFoundException, if (id == null) { throw new IllegalArgumentException("Id must be specified"); } - String url = CONVERSATIONS_BASE_URL + CONVERSATION_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_PATH; return messageBirdService.requestByID(url, id, Conversation.class); } @@ -738,7 +740,7 @@ public Conversation updateConversation(final String id, final ConversationStatus if (id == null) { throw new IllegalArgumentException("Id must be specified."); } - String url = String.format("%s%s/%s", CONVERSATIONS_BASE_URL, CONVERSATION_PATH, id); + String url = String.format("%s%s/%s", this.conversationsBaseUrl, CONVERSATION_PATH, id); return messageBirdService.sendPayLoad("PATCH", url, status, Conversation.class); } @@ -751,7 +753,7 @@ public Conversation updateConversation(final String id, final ConversationStatus */ public ConversationList listConversations(final int offset, final int limit) throws UnauthorizedException, GeneralException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_PATH; return messageBirdService.requestList(url, offset, limit, ConversationList.class); } @@ -775,7 +777,7 @@ public ConversationList listConversations() throws UnauthorizedException, Genera */ public Conversation startConversation(ConversationStartRequest request) throws UnauthorizedException, GeneralException { - String url = String.format("%s%s/start", CONVERSATIONS_BASE_URL, CONVERSATION_PATH); + String url = String.format("%s%s/start", this.conversationsBaseUrl, CONVERSATION_PATH); return messageBirdService.sendPayLoad(url, request, Conversation.class); } @@ -794,7 +796,7 @@ public ConversationMessageList listConversationMessages( ) throws UnauthorizedException, GeneralException { String url = String.format( "%s%s/%s%s", - CONVERSATIONS_BASE_URL, + this.conversationsBaseUrl, CONVERSATION_PATH, conversationId, CONVERSATION_MESSAGE_PATH @@ -825,7 +827,7 @@ public ConversationMessageList listConversationMessages( */ public ConversationMessage viewConversationMessage(final String messageId) throws NotFoundException, GeneralException, UnauthorizedException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_MESSAGE_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_MESSAGE_PATH; return messageBirdService.requestByID(url, messageId, ConversationMessage.class); } @@ -842,7 +844,7 @@ public ConversationMessage sendConversationMessage( ) throws UnauthorizedException, GeneralException { String url = String.format( "%s%s/%s%s", - CONVERSATIONS_BASE_URL, + this.conversationsBaseUrl, CONVERSATION_PATH, conversationId, CONVERSATION_MESSAGE_PATH @@ -857,7 +859,7 @@ public ConversationMessage sendConversationMessage( */ public void deleteConversationWebhook(final String webhookId) throws NotFoundException, GeneralException, UnauthorizedException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH; messageBirdService.deleteByID(url, webhookId); } @@ -869,7 +871,7 @@ public void deleteConversationWebhook(final String webhookId) */ public ConversationWebhook sendConversationWebhook(final ConversationWebhookCreateRequest request) throws UnauthorizedException, GeneralException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH; return messageBirdService.sendPayLoad(url, request, ConversationWebhook.class); } @@ -884,7 +886,7 @@ public ConversationWebhook updateConversationWebhook(final String id, final Conv throw new IllegalArgumentException("Conversation webhook ID must be specified."); } - String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH + "/" + id; + String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH + "/" + id; return messageBirdService.sendPayLoad("PATCH", url, request, ConversationWebhook.class); } @@ -895,7 +897,7 @@ public ConversationWebhook updateConversationWebhook(final String id, final Conv * @return The retrieved webhook. */ public ConversationWebhook viewConversationWebhook(final String webhookId) throws NotFoundException, GeneralException, UnauthorizedException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH; return messageBirdService.requestByID(url, webhookId, ConversationWebhook.class); } @@ -908,7 +910,7 @@ public ConversationWebhook viewConversationWebhook(final String webhookId) throw */ ConversationWebhookList listConversationWebhooks(final int offset, final int limit) throws UnauthorizedException, GeneralException { - String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH; + String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH; return messageBirdService.requestList(url, offset, limit, ConversationWebhookList.class); } From 1ef47d7273fc9f99e377395e418da4de9665df86 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:35:54 +0200 Subject: [PATCH 06/15] Style --- api/src/main/java/com/messagebird/MessageBirdClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index bbd4c765..1a115128 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -69,7 +69,6 @@ public class MessageBirdClient { private static final String VOICELEGS_SUFFIX_PATH = "/legs"; private MessageBirdService messageBirdService; - private String conversationsBaseUrl = BASE_URL_CONVERSATIONS; public enum Feature { From 378ab6d24bd19096c108cdc4e6674bdcc0c1a29e Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:46:28 +0200 Subject: [PATCH 07/15] Changed initialization of conversations base url to constructor --- api/src/main/java/com/messagebird/MessageBirdClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index 1a115128..d4386b22 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -69,7 +69,7 @@ public class MessageBirdClient { private static final String VOICELEGS_SUFFIX_PATH = "/legs"; private MessageBirdService messageBirdService; - private String conversationsBaseUrl = BASE_URL_CONVERSATIONS; + private String conversationsBaseUrl; public enum Feature { ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX @@ -83,6 +83,8 @@ public MessageBirdClient(final MessageBirdService messageBirdService, List= 0) { this.conversationsBaseUrl = BASE_URL_CONVERSATIONS_WHATSAPP_SANDBOX; + } else { + this.conversationsBaseUrl = BASE_URL_CONVERSATIONS; } } /****************************************************************************************************/ From c2d3477469952f699b7ad064d0198b2381255754 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:50:57 +0200 Subject: [PATCH 08/15] Force CI rebuild phase 1 --- api/src/main/java/com/messagebird/MessageBirdClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index d4386b22..55da2b33 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -369,6 +369,7 @@ public Verify sendVerifyToken(VerifyRequest verifyRequest) throws UnauthorizedEx return messageBirdService.sendPayLoad(VERIFYPATH, verifyRequest, Verify.class); } + /** * @param recipient The telephone number that you want to verify. * @return Verify object From b541b3a94d0963e6ef5a96e43be62ffff9794107 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:51:09 +0200 Subject: [PATCH 09/15] Force CI rebuild phase 2 --- api/src/main/java/com/messagebird/MessageBirdClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index 55da2b33..d4386b22 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -369,7 +369,6 @@ public Verify sendVerifyToken(VerifyRequest verifyRequest) throws UnauthorizedEx return messageBirdService.sendPayLoad(VERIFYPATH, verifyRequest, Verify.class); } - /** * @param recipient The telephone number that you want to verify. * @return Verify object From 21cd39824bb7d1aaae46ed8d910a48e59ea74cbd Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:53:49 +0200 Subject: [PATCH 10/15] CI timed out again --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 39d62596..97864dea 100644 --- a/README.md +++ b/README.md @@ -133,3 +133,5 @@ Complete documentation, instructions, and examples are available at: License ------- The MessageBird REST Client for Java is licensed under [The BSD 2-Clause License](http://opensource.org/licenses/BSD-2-Clause). Copyright (c) 2015-2019, MessageBird + +CI \ No newline at end of file From 442a65008f51beca1b0fd68c6abcfd7f2ea15b94 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 15:54:02 +0200 Subject: [PATCH 11/15] CI timed out again --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 97864dea..39d62596 100644 --- a/README.md +++ b/README.md @@ -133,5 +133,3 @@ Complete documentation, instructions, and examples are available at: License ------- The MessageBird REST Client for Java is licensed under [The BSD 2-Clause License](http://opensource.org/licenses/BSD-2-Clause). Copyright (c) 2015-2019, MessageBird - -CI \ No newline at end of file From 4c25e8023b2ae76330ee36d4c297228b4a78e8c7 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Fri, 6 Sep 2019 16:18:41 +0200 Subject: [PATCH 12/15] Fixed construtor error --- api/src/main/java/com/messagebird/MessageBirdClient.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/com/messagebird/MessageBirdClient.java b/api/src/main/java/com/messagebird/MessageBirdClient.java index d4386b22..3b60b2a3 100644 --- a/api/src/main/java/com/messagebird/MessageBirdClient.java +++ b/api/src/main/java/com/messagebird/MessageBirdClient.java @@ -77,14 +77,13 @@ public enum Feature { public MessageBirdClient(final MessageBirdService messageBirdService) { this.messageBirdService = messageBirdService; + this.conversationsBaseUrl = BASE_URL_CONVERSATIONS; } public MessageBirdClient(final MessageBirdService messageBirdService, List features) { - this.messageBirdService = messageBirdService; + this(messageBirdService); if(features.indexOf(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX) >= 0) { this.conversationsBaseUrl = BASE_URL_CONVERSATIONS_WHATSAPP_SANDBOX; - } else { - this.conversationsBaseUrl = BASE_URL_CONVERSATIONS; } } /****************************************************************************************************/ From b92a9941e8488f3f512ec4246318f1d362e7b675 Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Mon, 16 Sep 2019 11:55:10 +0200 Subject: [PATCH 13/15] Added an example for StartConversation with WhatsApp Sandbox enabled --- ...StartConversationsWithWhatsAppSandbox.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java diff --git a/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java new file mode 100644 index 00000000..7c4a9ff4 --- /dev/null +++ b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java @@ -0,0 +1,50 @@ +import com.messagebird.MessageBirdClient; +import com.messagebird.MessageBirdService; +import com.messagebird.MessageBirdServiceImpl; +import com.messagebird.exceptions.GeneralException; +import com.messagebird.exceptions.UnauthorizedException; +import com.messagebird.objects.conversations.*; +import java.util.List; + +// import java.util.ArrayList; +// import java.util.Arrays; +// import java.util.List; + +public class ExampleStartConversationsWithWhatsAppSandbox { + + public static void main(String[] args) { + if (args.length != 3) { + System.out.println("Please at least specify your access key, the channel id and destination address.\n" + + "Usage : java -jar test_accesskey(Required) channel_id(Required) to(Required)"); + return; + } + + //First create your service object + final MessageBirdService wsr = new MessageBirdServiceImpl(args[0]); + + System.out.println("Done"); + //Add the service to the client + final MessageBirdClient messageBirdClient = new MessageBirdClient(wsr, List.of(MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX)); //Create client with WhatsApp Sandbox enabled + + ConversationContent conversationContent = new ConversationContent(); + conversationContent.setText("Hello world from java sdk"); + + ConversationStartRequest request = new ConversationStartRequest( + args[2], + ConversationContentType.TEXT, + conversationContent, + args[1] + ); + try { + Conversation conversation = messageBirdClient.startConversation(request); + // assertEquals("convid", conversation.getId()); + System.out.println(conversation.getId()); + + } catch (GeneralException | UnauthorizedException exception) { + exception.printStackTrace(); + } + System.out.println("Done"); + + + } +} From b273ab3edb24df1d73d4db8f73d14496964c77ac Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Mon, 16 Sep 2019 12:01:57 +0200 Subject: [PATCH 14/15] =?UTF-8?q?Cleanup=20=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ExampleStartConversationsWithWhatsAppSandbox.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java index 7c4a9ff4..b0123e0c 100644 --- a/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java +++ b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java @@ -22,7 +22,6 @@ public static void main(String[] args) { //First create your service object final MessageBirdService wsr = new MessageBirdServiceImpl(args[0]); - System.out.println("Done"); //Add the service to the client final MessageBirdClient messageBirdClient = new MessageBirdClient(wsr, List.of(MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX)); //Create client with WhatsApp Sandbox enabled @@ -43,8 +42,5 @@ public static void main(String[] args) { } catch (GeneralException | UnauthorizedException exception) { exception.printStackTrace(); } - System.out.println("Done"); - - } } From c1dcb98429af75ab20c52439c40c95006540b0bc Mon Sep 17 00:00:00 2001 From: Marius Potgieter Date: Mon, 16 Sep 2019 12:23:08 +0200 Subject: [PATCH 15/15] =?UTF-8?q?More=20cleanup=20=F0=9F=A7=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ExampleStartConversationsWithWhatsAppSandbox.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java index b0123e0c..08e82f33 100644 --- a/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java +++ b/examples/src/main/java/ExampleStartConversationsWithWhatsAppSandbox.java @@ -6,10 +6,6 @@ import com.messagebird.objects.conversations.*; import java.util.List; -// import java.util.ArrayList; -// import java.util.Arrays; -// import java.util.List; - public class ExampleStartConversationsWithWhatsAppSandbox { public static void main(String[] args) {