refactor (Mailgun) SDK adaptation

sinch · Dec 17, 2024 · 2ebed1e · 2ebed1e
1 parent ef1127d
commit 2ebed1e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/mailgun/v1/EmailsSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/mailgun/v1/EmailsSteps.java
@@ -4,8 +4,7 @@
 import com.sinch.sdk.domains.mailgun.api.v1.EmailsService;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendEmailRequest;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendMimeEmailRequest;
-import com.sinch.sdk.domains.mailgun.models.v1.emails.response.ExceededQueueQuotaRegular;
-import com.sinch.sdk.domains.mailgun.models.v1.emails.response.ExceededQueueQuotaScheduled;
+import com.sinch.sdk.domains.mailgun.models.v1.emails.response.ExceededQueueQuota;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.response.GetStoredEmailResponse;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.response.QueueStatusDisabledDetails;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.response.SendEmailResponse;
@@ -160,15 +159,15 @@ public void getSendingQueuesStatusResult() {
     SendingQueuesStatusResponse expected =
         SendingQueuesStatusResponse.builder()
             .setRegular(
-                ExceededQueueQuotaRegular.builder()
+                ExceededQueueQuota.builder()
                     .setIsDisabled(false)
-                    .setDisabled(
+                    .setDetails(
                         QueueStatusDisabledDetails.builder().setUntil("").setReason("").build())
                     .build())
             .setScheduled(
-                ExceededQueueQuotaScheduled.builder()
+                ExceededQueueQuota.builder()
                     .setIsDisabled(false)
-                    .setDisabled(
+                    .setDetails(
                         QueueStatusDisabledDetails.builder().setUntil("").setReason("").build())
                     .build())
             .build();

diff --git a/...est/java/com/sinch/sdk/domains/mailgun/models/v1/emails/request/SendEmailRequestTest.java b/...est/java/com/sinch/sdk/domains/mailgun/models/v1/emails/request/SendEmailRequestTest.java
@@ -7,6 +7,7 @@
 import com.sinch.sdk.core.http.HttpMapper;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendEmailRequest.TrackingClicksEnum;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendEmailRequest.TrackingEnum;
+import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendEmailRequest.TrackingPixelLocationTopEnum;
 import java.io.File;
 import java.time.Instant;
 import java.util.Arrays;
@@ -61,7 +62,7 @@ public class SendEmailRequestTest extends BaseTest {
               "o:skip-verification","true",
               "o:sending-ip","192.168.0.10",
               "o:sending-ip-pool","sending pool ID",
-              "o:tracking-pixel-location-top","foo",
+              "o:tracking-pixel-location-top","htmlonly",
               "recipient-variables","{\"[email protected]\": {\"variable1\": \"value1\"}}"
               // spotless:on
             );
@@ -97,7 +98,7 @@ public class SendEmailRequestTest extends BaseTest {
           .setSkipVerification(true)
           .setSendingIp("192.168.0.10")
           .setSendingIpPool("sending pool ID")
-          .setTrackingPixelLocationTop("foo")
+          .setTrackingPixelLocationTop(TrackingPixelLocationTopEnum.HTMLONLY)
           .setRecipientVariables("{\"[email protected]\": {\"variable1\": \"value1\"}}")
           .setTemplate("template value")
           .build();

diff --git a/...java/com/sinch/sdk/domains/mailgun/models/v1/emails/request/SendMimeEmailRequestTest.java b/...java/com/sinch/sdk/domains/mailgun/models/v1/emails/request/SendMimeEmailRequestTest.java
@@ -6,6 +6,7 @@
 import com.sinch.sdk.core.databind.multipart.ObjectMapperTest;
 import com.sinch.sdk.core.http.HttpMapper;
 import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendMimeEmailRequest.TrackingClicksEnum;
+import com.sinch.sdk.domains.mailgun.models.v1.emails.request.SendMimeEmailRequest.TrackingPixelLocationTopEnum;
 import java.io.File;
 import java.time.Instant;
 import java.util.Arrays;
@@ -52,7 +53,7 @@ public class SendMimeEmailRequestTest extends BaseTest {
             "o:skip-verification","false",
             "o:sending-ip","192.168.0.10",
             "o:sending-ip-pool","sending pool ID",
-            "o:tracking-pixel-location-top","foo",
+            "o:tracking-pixel-location-top","htmlonly",
             "recipient-variables","{\"[email protected]\": {\"variable1\": \"value1\"}}"
               // spotless:on
             );
@@ -80,7 +81,7 @@ public class SendMimeEmailRequestTest extends BaseTest {
           .setSkipVerification(false)
           .setSendingIp("192.168.0.10")
           .setSendingIpPool("sending pool ID")
-          .setTrackingPixelLocationTop("foo")
+          .setTrackingPixelLocationTop(TrackingPixelLocationTopEnum.HTMLONLY)
           .setRecipientVariables("{\"[email protected]\": {\"variable1\": \"value1\"}}")
           .setTemplate("template value")
           .build();

diff --git a/.../sinch/sdk/domains/mailgun/models/v1/emails/response/SendingQueuesStatusResponseTest.java b/.../sinch/sdk/domains/mailgun/models/v1/emails/response/SendingQueuesStatusResponseTest.java
@@ -12,18 +12,18 @@ public class SendingQueuesStatusResponseTest extends BaseTest {
   public static SendingQueuesStatusResponse expectedSendingQueuesStatusResponse =
       SendingQueuesStatusResponse.builder()
           .setRegular(
-              ExceededQueueQuotaRegular.builder()
+              ExceededQueueQuota.builder()
                   .setIsDisabled(true)
-                  .setDisabled(
+                  .setDetails(
                       QueueStatusDisabledDetails.builder()
                           .setUntil("Mon, 24 Jan 2006 16:00:00 MST")
                           .setReason("You have too many messages in regular queue")
                           .build())
                   .build())
           .setScheduled(
-              ExceededQueueQuotaScheduled.builder()
+              ExceededQueueQuota.builder()
                   .setIsDisabled(true)
-                  .setDisabled(
+                  .setDetails(
                       QueueStatusDisabledDetails.builder()
                           .setUntil("Mon, 12 Jan 2006 15:04:05 MST")
                           .setReason("You have too many messages in scheduled queue")