Merge pull request #29 from RestComm/BS-392-2

Bs-392

Author: vetss

src/main/java/org/restcomm/sdk/RestcommClient.java

@@ -1,61 +1,142 @@
 package org.restcomm.sdk;
 
-import org.restcomm.sdk.domain.*;
-import org.restcomm.sdk.endpoints.RestEndpoints;
-
+import java.util.Collections;
 import java.util.Map;
 
+import org.restcomm.sdk.domain.Account;
+import org.restcomm.sdk.domain.Application;
+import org.restcomm.sdk.domain.CallPage;
+import org.restcomm.sdk.domain.Client;
+import org.restcomm.sdk.domain.ExtensionData;
+import org.restcomm.sdk.domain.IncomingPhoneNumber;
+import org.restcomm.sdk.domain.RecordingPage;
+import org.restcomm.sdk.domain.ShortMessage;
+import org.restcomm.sdk.domain.XmppMapping;
+import org.restcomm.sdk.endpoints.RestEndpoints;
+
 /**
  * @author [email protected] (Oleg Agafonov)
+ * @author sergey vetyutnev
  */
 public class RestcommClient {
 
     private final HttpClient httpClient;
 
-    private final String baseRestcommUrl;
     private final String baseRestcommUrlWithoutAccount;
 
     private final String baseUrl;
+    private final String accountSid;
 
     private final Map<String, String> endpoints;
 
     public RestcommClient(RestcommClientConfiguration config) {
         this.httpClient = new HttpClient(config.getAccountSid(), config.getAccountToken());
-        this.baseRestcommUrlWithoutAccount = config.getBaseUrl() + "/restcomm/2012-04-24/Accounts";
-        this.baseRestcommUrl = config.getBaseUrl() + "/restcomm/2012-04-24/Accounts/" + config.getAccountSid();
+
         this.baseUrl = config.getBaseUrl();
-        this.endpoints = config.getEndpoints();
+        this.baseRestcommUrlWithoutAccount = baseUrl + "/restcomm/2012-04-24/Accounts";
+        if (config.getEndpoints() != null)
+            this.endpoints = config.getEndpoints();
+        else
+            this.endpoints = Collections.emptyMap();
+        this.accountSid = config.getAccountSid();
+    }
+
+    public String getAccountSid() {
+        return this.accountSid;
     }
 
     public RestEndpoints<CallPage> getCallsEndpoint() {
-        return getEndpoints("calls", baseRestcommUrl + "/Calls.json", CallPage.class);
+        return getCallsEndpoint("calls", this.accountSid);
+    }
+
+    public RestEndpoints<CallPage> getCallsEndpoint(String accountSid) {
+        return getCallsEndpoint("calls-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<CallPage> getCallsEndpoint(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/Calls.json", CallPage.class);
     }
 
     public RestEndpoints<RecordingPage> getRecordingsEndpoint() {
-        return getEndpoints("recordings", baseRestcommUrl + "/Recordings.json", RecordingPage.class);
+        return getRecordingsEndpoint("recordings", this.accountSid);
+    }
+
+    public RestEndpoints<RecordingPage> getRecordingsEndpoint(String accountSid) {
+        return getRecordingsEndpoint("recordings-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<RecordingPage> getRecordingsEndpoint(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/Recordings.json",
+                RecordingPage.class);
     }
 
     public RestEndpoints<Client> getClientsEndpoints() {
-        return getEndpoints("clients", baseRestcommUrl + "/Clients.json", Client.class);
+        return getClientsEndpoints("clients", this.accountSid);
+    }
+
+    public RestEndpoints<Client> getClientsEndpoints(String accountSid) {
+        return getClientsEndpoints("clients-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<Client> getClientsEndpoints(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/Clients.json", Client.class);
+    }
+
+    public RestEndpoints<Account> getAccountsEndpoints() {
+        return getEndpoints("accounts", baseRestcommUrlWithoutAccount + ".json", Account.class);
+    }
+
+    public RestEndpoints<Account> getAccountsEndpoints(String accountSid) {
+        return getEndpoints("accounts-" + accountSid, baseRestcommUrlWithoutAccount + ".json/" + accountSid, Account.class);
+    }
+
+    public RestEndpoints<Application> getApplicationsEndpoints() {
+        return getApplicationsEndpoints("applications", this.accountSid);
+    }
+
+    public RestEndpoints<Application> getApplicationsEndpoints(String accountSid) {
+        return getApplicationsEndpoints("applications-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<Application> getApplicationsEndpoints(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/Applications.json",
+                Application.class);
     }
 
     public RestEndpoints<IncomingPhoneNumber> getIncomingPhoneNumbersEndpoints() {
-        return getEndpoints("incoming-phone-numbers", baseRestcommUrl + "/IncomingPhoneNumbers.json", IncomingPhoneNumber.class);
+        return getIncomingPhoneNumbersEndpoints("incoming-phone-numbers", this.accountSid);
+    }
+
+    public RestEndpoints<IncomingPhoneNumber> getIncomingPhoneNumbersEndpoints(String accountSid) {
+        return getIncomingPhoneNumbersEndpoints("incoming-phone-numbers-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<IncomingPhoneNumber> getIncomingPhoneNumbersEndpoints(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/IncomingPhoneNumbers.json",
+                IncomingPhoneNumber.class);
     }
 
     public RestEndpoints<XmppMapping> getXmppMappingsEndpoints() {
         return getEndpoints("xmpp-mappings", baseUrl + "/xmpp/xmppMappings", XmppMapping.class);
     }
 
     public RestEndpoints<ShortMessage> getShortMessagesEndpoints() {
-        return getEndpoints("messages", baseRestcommUrl + "/SMS/Messages.json", ShortMessage.class);
+        return getShortMessagesEndpoints("messages", this.accountSid);
     }
 
-    public RestEndpoints<ShortMessage> getShortMessagesEndpoints(String subAccountSid) {
-        return getEndpoints("messages", baseRestcommUrlWithoutAccount + "/" + subAccountSid + "/SMS/Messages.json",
+    public RestEndpoints<ShortMessage> getShortMessagesEndpoints(String accountSid) {
+        return getShortMessagesEndpoints("messages-" + accountSid, accountSid);
+    }
+
+    private RestEndpoints<ShortMessage> getShortMessagesEndpoints(String endpoint, String accountSid) {
+        return getEndpoints(endpoint, baseRestcommUrlWithoutAccount + "/" + accountSid + "/SMS/Messages.json",
                 ShortMessage.class);
     }
 
+    public RestEndpoints<ExtensionData> getExtensions() {
+        return getEndpoints("extensions", baseUrl + "/restcomm/2012-04-24/ExtensionsConfiguration.json", ExtensionData.class);
+    }
+
     private <T> RestEndpoints<T> getEndpoints(String endpoint, String defaultUrl, Class<T> type) {
         String url = endpoints.getOrDefault(endpoint, defaultUrl);
         return new RestEndpoints(url, httpClient, type);

src/main/java/org/restcomm/sdk/domain/Account.java

@@ -0,0 +1,23 @@
+package org.restcomm.sdk.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder(toBuilder = true)
+@Getter
+public class Account {
+
+    private String sid;
+    private String organization; // !!!
+    private String friendlyName;
+    private String emailAddress;
+    private String password;
+    private String status;
+    private String role;
+    private String type;
+    private String dateCreated;
+    private String dateUpdated;
+    private String authToken;
+    private String uri;
+
+}

src/main/java/org/restcomm/sdk/domain/Application.java

@@ -0,0 +1,21 @@
+package org.restcomm.sdk.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder(toBuilder = true)
+@Getter
+public class Application {
+
+    private String sid;
+    private String dateCreated;
+    private String dateUpdated;
+    private String friendlyName;
+    private String accountSid;
+    private String apiVersion;
+    private String voiceCallerIdLookup;
+    private String uri;
+    private String rcmlUrl;
+    private String kind;
+
+}

src/main/java/org/restcomm/sdk/domain/ExtensionData.java

@@ -0,0 +1,22 @@
+package org.restcomm.sdk.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder(toBuilder = true)
+@Getter
+public class ExtensionData {
+
+    private String extensionName;
+    private String enabled;
+    private String accountSid;
+    private String configurationData;
+
+    // back data
+    private String sid;
+    private String extension;
+    private String configuration;
+    private String dateCreated;
+    private String dateUpdated;
+
+}