Merge pull request #35 from RestComm/TWOFA-71

MX-service new API support

Author: jaimecasero

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <lombok.project>1.16.18</lombok.project>
+        <lombok.project>1.18.10</lombok.project>
         <fluent-hc.version>4.5.5</fluent-hc.version>
         <jackson.version>2.9.5</jackson.version>
         <junit.version>4.12</junit.version>

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

@@ -1,8 +1,5 @@
 package org.restcomm.sdk;
 
-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.AvailablePhoneNumber;
@@ -12,13 +9,23 @@
 import org.restcomm.sdk.domain.ConferencePage;
 import org.restcomm.sdk.domain.ExtensionData;
 import org.restcomm.sdk.domain.IncomingPhoneNumber;
-import org.restcomm.sdk.domain.Participant;
 import org.restcomm.sdk.domain.RecordingPage;
 import org.restcomm.sdk.domain.ShortMessage;
 import org.restcomm.sdk.domain.XmppDomain;
 import org.restcomm.sdk.domain.XmppMapping;
 import org.restcomm.sdk.domain.XmppWhitelistRule;
+import org.restcomm.sdk.domain.solutions.MXEnterpriseResponse;
+import org.restcomm.sdk.domain.solutions.MXEnterprisesResponse;
 import org.restcomm.sdk.endpoints.RestEndpoints;
+import org.restcomm.sdk.domain.solutions.MXDomainResponse;
+import org.restcomm.sdk.domain.solutions.MXDomainsResponse;
+import org.restcomm.sdk.domain.solutions.MXMappingResponse;
+import org.restcomm.sdk.domain.solutions.MXMappingsResponse;
+import org.restcomm.sdk.domain.solutions.MXWhitelistResponse;
+import org.restcomm.sdk.domain.solutions.MXWhitelistsResponse;
+
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * @author [email protected] (Oleg Agafonov)
@@ -147,6 +154,38 @@ public RestEndpoints<XmppWhitelistRule> getXmppWhitelistRulesEndpoints() {
         return getEndpoints("xmpp-whitelistRules", baseUrl + "/xmpp/whitelistRules", XmppWhitelistRule.class);
     }
 
+    public RestEndpoints<MXMappingResponse> getMXMappingsEndpoints() {
+        return getEndpoints("mx-mappings", baseUrl + "/messageexchange/mappings", MXMappingResponse.class);
+    }
+
+    public RestEndpoints<MXMappingsResponse> getMXMappingsSearchEndpoints() {
+        return getEndpoints("mx-mappings-search", baseUrl + "/messageexchange/mappings/search", MXMappingsResponse.class);
+    }
+
+    public RestEndpoints<MXDomainResponse> getMxDomainsEndpoints() {
+        return getEndpoints("mx-domain", baseUrl + "/messageexchange/domains", MXDomainResponse.class);
+    }
+
+    public RestEndpoints<MXDomainsResponse> getXmppDomainsSearchEndpoints() {
+        return getEndpoints("mx-domain-search", baseUrl + "/messageexchange/domains/search", MXDomainsResponse.class);
+    }
+
+    public RestEndpoints<MXWhitelistResponse> getMXWhitelistRulesEndpoints() {
+        return getEndpoints("mx-whitelistRules", baseUrl + "/messageexchange/whitelist", MXWhitelistResponse.class);
+    }
+
+    public RestEndpoints<MXWhitelistsResponse> getMXWhitelistRulesSearchEndpoints() {
+        return getEndpoints("mx-whitelistRules-search", baseUrl + "/messageexchange/whitelist/search", MXWhitelistsResponse.class);
+    }
+
+    public RestEndpoints<MXEnterpriseResponse> getMXEnterpriseEndpoints() {
+        return getEndpoints("mx-enterprise", baseUrl + "/messageexchange/enterprise", MXEnterpriseResponse.class);
+    }
+
+    public RestEndpoints<MXEnterprisesResponse> getMXEnterprisesSearchEndpoints() {
+        return getEndpoints("mx-enterprise-search", baseUrl + "/messageexchange/enterprise/search", MXEnterprisesResponse.class);
+    }
+
     public RestEndpoints<ShortMessage> getShortMessagesEndpoints() {
         return getShortMessagesEndpoints("messages", this.accountSid);
     }

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

@@ -1,10 +1,14 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Builder(toBuilder = true)
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Account {
 
     private String sid;

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

@@ -1,10 +1,14 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Builder(toBuilder = true)
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Application {
 
     private String sid;

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

@@ -1,8 +1,10 @@
 package org.restcomm.sdk.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -11,6 +13,8 @@
 @Builder(toBuilder = true)
 @Getter
 @Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class AvailablePhoneNumber {
 
     @JsonProperty("friendlyName")

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

@@ -1,8 +1,9 @@
 package org.restcomm.sdk.domain;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 /**
@@ -15,6 +16,8 @@
 @Builder(toBuilder = true)
 @Getter
 @ToString
+@NoArgsConstructor
+@AllArgsConstructor
 public class Call {
 
     private String sid;

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

@@ -1,7 +1,9 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.util.List;
@@ -15,6 +17,8 @@
 @Builder(toBuilder = true)
 @Getter
 @ToString
+@NoArgsConstructor
+@AllArgsConstructor
 public class CallPage extends AbstractPageHeader {
 
     private List<Call> calls;

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

@@ -1,13 +1,17 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 /**
  * @author [email protected] (Oleg Agafonov)
  */
 @Builder(toBuilder = true)
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Client {
 
     private String sid;

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

@@ -1,10 +1,14 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Builder(toBuilder = true)
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Conference {
 
     private String sid;

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

@@ -1,10 +1,14 @@
 package org.restcomm.sdk.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Builder(toBuilder = true)
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class ExtensionData {
 
     private String extensionName;