Merge branch 'main' into SWI-3111

Author: ajrice6713

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Global rule:
-* @Bandwidth/dx
+* @Bandwidth/band-swi @Bandwidth/band-swi-github-repo-admin

README.md

@@ -324,6 +324,28 @@ peer.getTn("number");
 peer.moveTns(sipPeerTelephoneNumbers);
 ```
 
+### Enable SMS Settings
+```java
+// Zone1 for US & Canada enabled by default
+SipPeerSmsFeature settings = new SipPeerSmsFeature();
+settings.setTollFree(true);
+settings.setShortCode(true);
+peer.enableSms(settings);
+```
+
+### Enable MMS 
+```java
+peer.enableMms();
+```
+
+### Associate a SipPeer with a Messaging Application
+```java
+SipPeerMessagingApplicationsSettings settings = new SipPeerMessagingApplicationsSettings();
+settings.setApplicationId("abcd-1234");
+
+peer.updateMessagingApplicationSettings(settings);
+```
+
 ## Sites
 
 ### Create A Site
@@ -746,3 +768,4 @@ query.put("tn", "9199918388");
 
 TnOptionOrders response = TnOptions.list(client, query);
 ```
+

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.bandwidth.sdk</groupId>
     <artifactId>bandwidth-java-iris-sdk</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.2</version>
     <packaging>jar</packaging>
     <name>bandwidth-java-iris-sdk</name>
     <description>Java SDK for use with the IRIS API.</description>

src/main/java/com/bandwidth/iris/sdk/model/CombinedSearchAndOrderType.java

@@ -0,0 +1,138 @@
+package com.bandwidth.iris.sdk.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "CombinedSearchAndOrderType")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class CombinedSearchAndOrderType extends BaseOrderType {
+    @XmlElement(name = "AreaCode")
+    private String areaCode;
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    @XmlElement(name = "City")
+    private String city;
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    @XmlElement(name = "EnableLCA")
+    private Boolean enableLCA;
+
+    public Boolean isEnableLCA() {
+        return enableLCA;
+    }
+
+    public void setEnableLCA(Boolean enableLCA) {
+        this.enableLCA = enableLCA;
+    }
+
+    @XmlElement(name = "EndsIn")
+    private Boolean endsIn;
+
+    public Boolean isEndsIn() {
+        return endsIn;
+    }
+
+    public void setEndsIn(Boolean endsIn) {
+        this.endsIn = endsIn;
+    }
+
+    @XmlElement(name = "LATA")
+    private String lata;
+
+    public String getLata() {
+        return lata;
+    }
+
+    public void setLata(String lata) {
+        this.lata = lata;
+    }
+
+    @XmlElement(name = "LocalVanity")
+    private String localVanity;
+
+    public String getLocalVanity() {
+        return localVanity;
+    }
+
+    public void setLocalVanity(String localVanity) {
+        this.localVanity = localVanity;
+    }
+
+    @XmlElement(name = "NpaNxx")
+    private String npaNxx;
+
+    public String getNpaNxx() {
+        return npaNxx;
+    }
+
+    public void setNpaNxx(String npaNxx) {
+        this.npaNxx = npaNxx;
+    }
+
+    @XmlElement(name = "NpaNxxX")
+    private String npaNxxX;
+
+    public String getNpaNxxX() {
+        return npaNxxX;
+    }
+
+    public void setNpaNxxX(String npaNxxX) {
+        this.npaNxxX = npaNxxX;
+    }
+
+    @XmlElement(name = "Quantity")
+    private int quantity;
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+
+    @XmlElement(name = "RateCenter")
+    private String rateCenter;
+
+    public String getRateCenter() {
+        return rateCenter;
+    }
+
+    public void setRateCenter(String rateCenter) {
+        this.rateCenter = rateCenter;
+    }
+
+    @XmlElement(name = "State")
+    private String state;
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    @XmlElement(name = "Zip")
+    private String zip;
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+}

src/main/java/com/bandwidth/iris/sdk/model/Order.java

@@ -49,6 +49,9 @@ public class Order extends BaseModel {
     private TollFreeWildCharSearchAndOrderType tollFreeWildCharSearchAndOrderType;
     @XmlElement(name = "ZIPSearchAndOrderType")
     private ZIPSearchAndOrderType zipSearchAndOrderType;
+    @XmlElement(name = "CombinedSearchAndOrderType")
+    private CombinedSearchAndOrderType combinedSearchAndOrderType;
+
 
     public static OrderResponse create(IrisClient client, Order order) throws Exception {
         OrderResponse orderResponse = client
@@ -208,6 +211,14 @@ public void setZipSearchAndOrderType(ZIPSearchAndOrderType zipSearchAndOrderType
         this.zipSearchAndOrderType = zipSearchAndOrderType;
     }
 
+    public CombinedSearchAndOrderType getCombinedSearchAndOrderType() {
+        return combinedSearchAndOrderType;
+    }
+
+    public void setCombinedSearchAndOrderType(CombinedSearchAndOrderType combinedSearchAndOrderType) {
+        this.combinedSearchAndOrderType = combinedSearchAndOrderType;
+    }
+
     public void addNote(Note note) throws Exception {
         client.put(client.buildAccountModelUri(new String[] { IrisPath.ORDERS_URI_PATH, id, "notes" }), note);
     }

src/main/java/com/bandwidth/iris/sdk/model/SipPeer.java

@@ -208,4 +208,20 @@ public List<SipPeerTelephoneNumber> getTns() throws Exception {
                         IrisPath.SIPPEERS_URI_PATH, peerId, "tns" }),
                 SipPeerTelephoneNumbersResponse.class).getSipPeerTelephoneNumbers();
     }
+
+    public void enableSms(SipPeerSmsFeature smsSettings) throws Exception {
+        client.post(client.buildAccountModelUri(new String[] { IrisPath.SITES_URI_PATH, siteId,
+                IrisPath.SIPPEERS_URI_PATH, peerId, "products", "messaging", "features", "sms" }), smsSettings);
+    }
+
+    public void enableMms() throws Exception {
+        SipPeerMmsFeature mmsSettings = new SipPeerMmsFeature();
+        client.post(client.buildAccountModelUri(new String[] { IrisPath.SITES_URI_PATH, siteId,
+                IrisPath.SIPPEERS_URI_PATH, peerId, "products", "messaging", "features", "mms" }), mmsSettings);
+    }
+
+    public void updateMessagingApplicationSettings (SipPeerMessagingApplicationsSettings settings) throws Exception {
+        client.post(client.buildAccountModelUri(new String[] { IrisPath.SITES_URI_PATH, siteId,
+                IrisPath.SIPPEERS_URI_PATH, peerId, "products", "messaging","applicationSettings" }), settings);
+    }
 }

src/main/java/com/bandwidth/iris/sdk/model/SipPeerMessagingApplicationsSettings.java

@@ -0,0 +1,14 @@
+package com.bandwidth.iris.sdk.model;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "ApplicationSettings")
+public class SipPeerMessagingApplicationsSettings extends BaseModel {
+    @XmlElement(name = "HttpMessagingV2AppId")
+    String applicationId;
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+    }
+}

src/main/java/com/bandwidth/iris/sdk/model/SipPeerMmsFeature.java

@@ -0,0 +1,43 @@
+package com.bandwidth.iris.sdk.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "MmsFeature")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class SipPeerMmsFeature extends BaseModel {
+    @XmlElement(name = "MmsSettings")
+    MmsSettings mmsSettings;
+    @XmlElement(name = "Protocols")
+    Protocols protocols;
+
+    public SipPeerMmsFeature()
+    {
+        this.mmsSettings = new MmsSettings();
+        this.protocols = new Protocols();
+        this.protocols.http = new Http();
+        this.protocols.http.httpSettings = new HttpSettings();
+    }
+
+    private static class MmsSettings extends BaseModel {
+        @XmlElement(name = "Protocol")
+        private final String protocol = "HTTP";
+    }
+
+    private static class Protocols extends BaseModel {
+        @XmlElement(name = "HTTP")
+        Http http;
+    }
+
+    private static class Http extends BaseModel {
+        @XmlElement(name = "HttpSettings")
+        HttpSettings httpSettings = new HttpSettings();
+    }
+
+    private static class HttpSettings extends BaseModel {
+        @XmlElement(name = "ProxyPeerId")
+        String proxyPeerId = "";
+    }
+}