Merge pull request #136 from rjelierse/master

Revert "Merge pull request #65 from mariuspot/master"

Author: denizkilic

README.md

@@ -115,16 +115,6 @@ 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_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, List.of(MessageBirdClient.Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX));
-```
-
 Documentation
 -------------
 Complete documentation, instructions, and examples are available at:

api/src/main/java/com/messagebird/MessageBirdClient.java

@@ -95,9 +95,7 @@ public class MessageBirdClient {
      * can, however, override this behaviour by providing absolute URLs
      * ourselves.
      */
-    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";
-    
+    private static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1";
     static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com";
     static final String NUMBERS_CALLS_BASE_URL = "https://numbers.messagebird.com/v1";
     private static String[] supportedLanguages = {"de-DE", "en-AU", "en-UK", "en-US", "es-ES", "es-LA", "fr-FR", "it-IT", "nl-NL", "pt-BR"};
@@ -136,23 +134,11 @@ public class MessageBirdClient {
     private final String DOWNLOADS = "Downloads";
 
     private MessageBirdService messageBirdService;
-    private String conversationsBaseUrl;
-
-    public enum Feature {
-        ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX
-    }
 
     public MessageBirdClient(final MessageBirdService messageBirdService) {
         this.messageBirdService = messageBirdService;
-        this.conversationsBaseUrl = BASE_URL_CONVERSATIONS;
     }
 
-    public MessageBirdClient(final MessageBirdService messageBirdService, List<Feature> features) {
-        this(messageBirdService);
-        if(features.indexOf(Feature.ENABLE_CONVERSATION_API_WHATSAPP_SANDBOX) >= 0) {
-            this.conversationsBaseUrl = BASE_URL_CONVERSATIONS_WHATSAPP_SANDBOX;
-        }
-    }
     /****************************************************************************************************/
     /** Balance and HRL methods                                                                        **/
     /****************************************************************************************************/
@@ -897,7 +883,7 @@ public Conversation viewConversation(final String id) throws NotFoundException,
         if (id == null) {
             throw new IllegalArgumentException("Id must be specified");
         }
-        String url = this.conversationsBaseUrl + CONVERSATION_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_PATH;
         return messageBirdService.requestByID(url, id, Conversation.class);
     }
 
@@ -913,7 +899,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", this.conversationsBaseUrl, CONVERSATION_PATH, id);
+        String url = String.format("%s%s/%s", CONVERSATIONS_BASE_URL, CONVERSATION_PATH, id);
         return messageBirdService.sendPayLoad("PATCH", url, status, Conversation.class);
     }
 
@@ -926,7 +912,7 @@ public Conversation updateConversation(final String id, final ConversationStatus
      */
     public ConversationList listConversations(final int offset, final int limit)
             throws UnauthorizedException, GeneralException {
-        String url = this.conversationsBaseUrl + CONVERSATION_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_PATH;
         return messageBirdService.requestList(url, offset, limit, ConversationList.class);
     }
 
@@ -950,7 +936,7 @@ public ConversationList listConversations() throws UnauthorizedException, Genera
      */
     public Conversation startConversation(ConversationStartRequest request)
             throws UnauthorizedException, GeneralException {
-        String url = String.format("%s%s/start", this.conversationsBaseUrl, CONVERSATION_PATH);
+        String url = String.format("%s%s/start", CONVERSATIONS_BASE_URL, CONVERSATION_PATH);
         return messageBirdService.sendPayLoad(url, request, Conversation.class);
     }
 
@@ -962,7 +948,7 @@ public Conversation startConversation(ConversationStartRequest request)
      */
     public ConversationSendResponse sendMessage(ConversationSendRequest request)
             throws UnauthorizedException, GeneralException {
-        String url = String.format("%s%s", this.conversationsBaseUrl, CONVERSATION_SEND_PATH);
+        String url = String.format("%s%s", CONVERSATIONS_BASE_URL, CONVERSATION_SEND_PATH);
         return messageBirdService.sendPayLoad(url, request, ConversationSendResponse.class);
     }
 
@@ -981,7 +967,7 @@ public ConversationMessageList listConversationMessages(
     ) throws UnauthorizedException, GeneralException {
         String url = String.format(
                 "%s%s/%s%s",
-                this.conversationsBaseUrl,
+                CONVERSATIONS_BASE_URL,
                 CONVERSATION_PATH,
                 conversationId,
                 CONVERSATION_MESSAGE_PATH
@@ -1012,7 +998,7 @@ public ConversationMessageList listConversationMessages(
      */
     public ConversationMessage viewConversationMessage(final String messageId)
             throws NotFoundException, GeneralException, UnauthorizedException {
-        String url = this.conversationsBaseUrl + CONVERSATION_MESSAGE_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_MESSAGE_PATH;
         return messageBirdService.requestByID(url, messageId, ConversationMessage.class);
     }
 
@@ -1029,7 +1015,7 @@ public ConversationMessage sendConversationMessage(
     ) throws UnauthorizedException, GeneralException {
         String url = String.format(
                 "%s%s/%s%s",
-                this.conversationsBaseUrl,
+                CONVERSATIONS_BASE_URL,
                 CONVERSATION_PATH,
                 conversationId,
                 CONVERSATION_MESSAGE_PATH
@@ -1044,7 +1030,7 @@ public ConversationMessage sendConversationMessage(
      */
     public void deleteConversationWebhook(final String webhookId)
             throws NotFoundException, GeneralException, UnauthorizedException {
-        String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH;
         messageBirdService.deleteByID(url, webhookId);
     }
 
@@ -1056,7 +1042,7 @@ public void deleteConversationWebhook(final String webhookId)
      */
     public ConversationWebhook sendConversationWebhook(final ConversationWebhookCreateRequest request)
             throws UnauthorizedException, GeneralException {
-        String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH;
         return messageBirdService.sendPayLoad(url, request, ConversationWebhook.class);
     }
 
@@ -1071,7 +1057,7 @@ public ConversationWebhook updateConversationWebhook(final String id, final Conv
             throw new IllegalArgumentException("Conversation webhook ID must be specified.");
         }
 
-        String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH + "/" + id;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH + "/" + id;
         return messageBirdService.sendPayLoad("PATCH", url, request, ConversationWebhook.class);
     }
 
@@ -1082,7 +1068,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 = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH;
         return messageBirdService.requestByID(url, webhookId, ConversationWebhook.class);
     }
 
@@ -1095,7 +1081,7 @@ public ConversationWebhook viewConversationWebhook(final String webhookId) throw
      */
     public ConversationWebhookList listConversationWebhooks(final int offset, final int limit)
             throws UnauthorizedException, GeneralException {
-        String url = this.conversationsBaseUrl + CONVERSATION_WEBHOOK_PATH;
+        String url = CONVERSATIONS_BASE_URL + CONVERSATION_WEBHOOK_PATH;
         return messageBirdService.requestList(url, offset, limit, ConversationWebhookList.class);
     }
 
@@ -1781,4 +1767,4 @@ public void cancelNumber(String number) throws UnauthorizedException, GeneralExc
         final String url = String.format("%s/phone-numbers", NUMBERS_CALLS_BASE_URL);
         messageBirdService.deleteByID(url, number);
     }
-} 
+}