Merge branch 'endpoint-updates'

Author: ibalosh

pom.xml

@@ -27,7 +27,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jackson.minimum.version>2.9.7</jackson.minimum.version>
-        <jackson.version>2.14.0</jackson.version>
+        <jackson.version>2.14.1</jackson.version>
         <jersey.version>2.37</jersey.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit.platform.version>1.3.2</junit.platform.version>

src/main/java/com/postmarkapp/postmark/client/data/model/messages/OutboundMessage.java

@@ -25,6 +25,8 @@ public class OutboundMessage {
     private Map<String, String> metadata;
     private String messageStream;
 
+    private Boolean sandboxed;
+
     // GETTERS AND SETTERS
 
     public String getMessageStream() {
@@ -143,4 +145,12 @@ public void setTrackLinks(String trackLinks) {
 
     public void setMetadata(Map<String, String> metadata) { this.metadata = metadata; }
 
+    public Boolean getSandboxed() {
+        return sandboxed;
+    }
+
+    public void setSandboxed(Boolean sandboxed) {
+        this.sandboxed = sandboxed;
+    }
+
 }

src/main/java/com/postmarkapp/postmark/client/data/model/stats/BounceStat.java

@@ -12,6 +12,8 @@ public class BounceStat extends BaseStat {
     private Integer ispBlock;
     private Integer Transient;
 
+    private Integer DMARCPolicy;
+
     // SETTERS AND GETTERS
 
     public Integer getTransient() {
@@ -61,4 +63,12 @@ public Integer getIspBlock() {
     public void setIspBlock(Integer ispBlock) {
         this.ispBlock = ispBlock;
     }
+
+    public Integer getDMARCPolicy() {
+        return DMARCPolicy;
+    }
+
+    public void setDMARCPolicy(Integer DMARCPolicy) {
+        this.DMARCPolicy = DMARCPolicy;
+    }
 }

src/main/java/com/postmarkapp/postmark/client/data/model/stats/OutboundBounceStats.java

@@ -13,6 +13,7 @@ public class OutboundBounceStats {
     private Integer spamComplaint;
     private Integer ispBlock;
     private Integer Transient;
+    private Integer DMARCPolicy;
 
     // SETTERS AND GETTERS
 
@@ -73,4 +74,12 @@ public List<BounceStat> getDays() {
     public void setDays(List<BounceStat> days) {
         this.days = days;
     }
+
+    public Integer getDMARCPolicy() {
+        return DMARCPolicy;
+    }
+
+    public void setDMARCPolicy(Integer DMARCPolicy) {
+        this.DMARCPolicy = DMARCPolicy;
+    }
 }

src/main/java/com/postmarkapp/postmark/client/data/model/webhooks/SubscriptionChange.java

@@ -0,0 +1,19 @@
+package com.postmarkapp.postmark.client.data.model.webhooks;
+
+public class SubscriptionChange {
+    private Boolean enabled;
+
+    public SubscriptionChange() {}
+
+    public SubscriptionChange(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+}

src/main/java/com/postmarkapp/postmark/client/data/model/webhooks/WebhookTriggers.java

@@ -9,12 +9,15 @@ public class WebhookTriggers {
     private BounceWebhookTrigger bounce;
     private SpamWebhookTrigger spamComplaint;
 
+    private SubscriptionChange subscriptionChange;
+
     public WebhookTriggers() {
         this.open = new OpenWebhookTrigger(false);
         this.click = new WebhookTrigger(false);
         this.delivery = new WebhookTrigger(false);
         this.bounce = new BounceWebhookTrigger(false);
         this.spamComplaint = new SpamWebhookTrigger(false);
+        this.subscriptionChange = new SubscriptionChange(false);
     }
 
     public WebhookTriggers(boolean openEnabled, boolean clickEnabled) {
@@ -38,6 +41,17 @@ public WebhookTriggers(boolean openEnabled, boolean clickEnabled,
         this.spamComplaint = new SpamWebhookTrigger(spamComplaintEnabled);
     }
 
+    public WebhookTriggers(boolean openEnabled, boolean clickEnabled,
+                           boolean bounceEnabled, boolean spamComplaintEnabled, boolean deliveryEnabled,
+                           boolean subscriptionChangeEnabled) {
+        this.open = new OpenWebhookTrigger(openEnabled);
+        this.click = new WebhookTrigger(clickEnabled);
+        this.delivery = new WebhookTrigger(deliveryEnabled);
+        this.bounce = new BounceWebhookTrigger(bounceEnabled);
+        this.spamComplaint = new SpamWebhookTrigger(spamComplaintEnabled);
+        this.subscriptionChange = new SubscriptionChange(subscriptionChangeEnabled);
+    }
+
     public WebhookTriggers(OpenWebhookTrigger open, WebhookTrigger click, WebhookTrigger delivery,
                            BounceWebhookTrigger bounce, SpamWebhookTrigger spamComplaint) {
         this.open = open;
@@ -47,6 +61,17 @@ public WebhookTriggers(OpenWebhookTrigger open, WebhookTrigger click, WebhookTri
         this.spamComplaint = spamComplaint;
     }
 
+    public WebhookTriggers(OpenWebhookTrigger open, WebhookTrigger click, WebhookTrigger delivery,
+                           BounceWebhookTrigger bounce, SpamWebhookTrigger spamComplaint,
+                           SubscriptionChange subscriptionChange) {
+        this.open = open;
+        this.click = click;
+        this.delivery = delivery;
+        this.bounce = bounce;
+        this.spamComplaint = spamComplaint;
+        this.subscriptionChange = subscriptionChange;
+    }
+
     public OpenWebhookTrigger getOpen() {
         return open;
     }
@@ -86,4 +111,12 @@ public SpamWebhookTrigger getSpamComplaint() {
     public void setSpamComplaint(SpamWebhookTrigger spamComplaint) {
         this.spamComplaint = spamComplaint;
     }
+
+    public SubscriptionChange getSubscriptionChange() {
+        return subscriptionChange;
+    }
+
+    public void setSubscriptionChange(SubscriptionChange subscriptionChange) {
+        this.subscriptionChange = subscriptionChange;
+    }
 }