updated request response format for bypassing and server deleting

Author: ibalosh

src/main/java/com/wildbit/java/postmark/client/AccountApiClient.java

@@ -1,5 +1,6 @@
 package com.wildbit.java.postmark.client;
 
+import com.wildbit.java.postmark.client.data.model.RequestResponse;
 import com.wildbit.java.postmark.client.data.model.domains.*;
 import com.wildbit.java.postmark.client.data.model.senders.*;
 import com.wildbit.java.postmark.client.data.model.server.Server;
@@ -58,8 +59,9 @@ public Servers getServers(Parameters parameters) throws PostmarkException, IOExc
         return dataHandler.fromJson(response, Servers.class);
     }
 
-    public String deleteServer(Integer id) throws PostmarkException, IOException {
-        return execute(HttpClient.REQUEST_TYPES.DELETE, getEndpointUrl(serversEndpoint + id));
+    public RequestResponse deleteServer(Integer id) throws PostmarkException, IOException {
+        String response = execute(HttpClient.REQUEST_TYPES.DELETE, getEndpointUrl(serversEndpoint + id));
+        return dataHandler.fromJson(response, RequestResponse.class);
     }
 
     /*

src/main/java/com/wildbit/java/postmark/client/ApiClient.java

@@ -1,11 +1,11 @@
 package com.wildbit.java.postmark.client;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.wildbit.java.postmark.client.data.model.RequestResponse;
 import com.wildbit.java.postmark.client.data.model.bounces.Bounce;
 import com.wildbit.java.postmark.client.data.model.bounces.BounceDump;
 import com.wildbit.java.postmark.client.data.model.bounces.Bounces;
 import com.wildbit.java.postmark.client.data.model.bounces.DeliveryStats;
-import com.wildbit.java.postmark.client.data.model.message.BaseMessageResponse;
 import com.wildbit.java.postmark.client.data.model.message.Message;
 import com.wildbit.java.postmark.client.data.model.message.MessageResponse;
 import com.wildbit.java.postmark.client.data.model.messages.*;
@@ -41,7 +41,6 @@ public class ApiClient extends BaseApiClient {
     private final String outboundMessagesEndpoint       = "/messages/outbound/";
     private final String inboundMessagesEndpoint        = "/messages/inbound/";
     private final String outboundStatsEndpoint          = "/stats/outbound/";
-    private final String triggerTagsEndpoint            = "/triggers/tags/";
     private final String triggerInboundRulesEndpoint    = "/triggers/inboundRules/";
     private final String sendingEndpoint                = "/email/";
     private final String webhooksEndpoint               = "/webhooks/";
@@ -267,14 +266,14 @@ public InboundMessageDetails getInboundMessageDetails(String id) throws Postmark
         return dataHandler.fromJson(response, InboundMessageDetails.class);
     }
 
-    public String bypassInboundMessage(String id) throws PostmarkException, IOException {
+    public RequestResponse bypassInboundMessage(String id) throws PostmarkException, IOException {
         String response = execute(HttpClient.REQUEST_TYPES.PUT, getEndpointUrl(inboundMessagesEndpoint + id + "/bypass"));
-        return dataHandler.fromJson(response, BaseMessageResponse.class).getMessage();
+        return dataHandler.fromJson(response, RequestResponse.class);
     }
 
-    public String retryFailedInboundMessage( String id) throws PostmarkException, IOException {
+    public RequestResponse retryFailedInboundMessage(String id) throws PostmarkException, IOException {
         String response = execute(HttpClient.REQUEST_TYPES.PUT, getEndpointUrl(inboundMessagesEndpoint + id + "/retry"));
-        return dataHandler.fromJson(response, BaseMessageResponse.class).getMessage();
+        return dataHandler.fromJson(response, RequestResponse.class);
     }
 
     /*
@@ -430,5 +429,9 @@ public SuppressionStatuses deleteSuppressions(String messageStream, SuppressionE
         return dataHandler.fromJson(response, SuppressionStatuses.class);
     }
 
+    /*
+        Message stream endpoints
+     */
+
 
 }

src/main/java/com/wildbit/java/postmark/client/data/model/RequestResponse.java

@@ -0,0 +1,24 @@
+package com.wildbit.java.postmark.client.data.model;
+
+public class RequestResponse {
+    private Integer errorCode;
+    private String message;
+
+    // SETTERS AND GETTERS
+
+    public Integer getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(Integer errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

src/main/java/com/wildbit/java/postmark/client/data/model/message/BaseMessageResponse.java

@@ -1,27 +1,8 @@
 package com.wildbit.java.postmark.client.data.model.message;
 
+import com.wildbit.java.postmark.client.data.model.RequestResponse;
+
 /**
  * HTTP send request response object
  */
-public class BaseMessageResponse {
-    private Integer errorCode;
-    private String message;
-
-    // SETTERS AND GETTERS
-
-    public Integer getErrorCode() {
-        return errorCode;
-    }
-
-    public void setErrorCode(Integer errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}
+public class BaseMessageResponse extends RequestResponse { }