Merge branch 'master' of github.com:wildbit/postmark-java

Author: ibalosh

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

@@ -5,6 +5,7 @@
 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.*;
@@ -268,12 +269,12 @@ public InboundMessageDetails getInboundMessageDetails(String id) throws Postmark
 
     public String bypassInboundMessage(String id) throws PostmarkException, IOException {
         String response = execute(HttpClient.REQUEST_TYPES.PUT, getEndpointUrl(inboundMessagesEndpoint + id + "/bypass"));
-        return dataHandler.fromJson(response, String.class);
+        return dataHandler.fromJson(response, BaseMessageResponse.class).getMessage();
     }
 
-    public String retryFailedInboundMessage(String id) throws PostmarkException, IOException {
+    public String retryFailedInboundMessage( String id) throws PostmarkException, IOException {
         String response = execute(HttpClient.REQUEST_TYPES.PUT, getEndpointUrl(inboundMessagesEndpoint + id + "/retry"));
-        return dataHandler.fromJson(response, String.class);
+        return dataHandler.fromJson(response, BaseMessageResponse.class).getMessage();
     }
 
     /*