Changed Repeated Object References To Builder Pattern

abaldwin-Bandwidth · abaldwin-Bandwidth · commit 916fd8bc5b1f · 2021-09-27T13:30:34.000-04:00
Most of the tests were using repeated references to an object when initializing its state. Changed to the builder pattern to clean things up.
diff --git a/src/test/java/com/bandwidth/MessagingApiTests.java b/src/test/java/com/bandwidth/MessagingApiTests.java
@@ -38,11 +38,12 @@ public void initTest(){
     public void testCreateMessage() throws Exception {
         final String text = "Java Test";
 
-        MessageRequest body = new MessageRequest();
-        body.setTo(Collections.singletonList(USER_NUMBER));
-        body.setFrom(BW_NUMBER);
-        body.setText(text);
-        body.setApplicationId(MESSAGING_APPLICATION_ID);
+        MessageRequest body = new MessageRequest.Builder()
+                .to(Collections.singletonList(USER_NUMBER))
+                .from(BW_NUMBER)
+                .text(text)
+                .applicationId(MESSAGING_APPLICATION_ID)
+                .build();
 
         BandwidthMessage response = controller.createMessage(ACCOUNT_ID, body).getResult();
         assertEquals("Application ID not equal", MESSAGING_APPLICATION_ID, response.getApplicationId());
@@ -53,11 +54,12 @@ public void testCreateMessage() throws Exception {
 
     @Test(expected = MessagingException.class)
     public void testCreateMessageInvalidPhoneNumber() throws Exception {
-        MessageRequest body = new MessageRequest();
-        body.setTo(Collections.singletonList("+1invalid"));
-        body.setFrom(BW_NUMBER);
-        body.setText("Java Test");
-        body.setApplicationId(MESSAGING_APPLICATION_ID);
+        MessageRequest body = new MessageRequest.Builder()
+                .to(Collections.singletonList("+1invalid"))
+                .from(BW_NUMBER)
+                .text("Java Test")
+                .applicationId(MESSAGING_APPLICATION_ID)
+                .build();
 
         controller.createMessage(ACCOUNT_ID, body);
     }
diff --git a/src/test/java/com/bandwidth/MfaApiTests.java b/src/test/java/com/bandwidth/MfaApiTests.java
@@ -30,77 +30,83 @@ public void initTest(){
 
     @Test
     public void testMfaMessaging() throws Exception {
-        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema();
-        body.setTo(USER_NUMBER);
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(MESSAGING_APPLICATION_ID);
-        body.setScope("scope");
-        body.setDigits(6);
-        body.setMessage("Your temporary {NAME} {SCOPE} code is {CODE}");
+        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema.Builder()
+                .to(USER_NUMBER)
+                .from(BW_NUMBER)
+                .applicationId(MESSAGING_APPLICATION_ID)
+                .scope("scope")
+                .digits(6)
+                .message("Your temporary {NAME} {SCOPE} code is {CODE}")
+                .build();
 
         controller.createMessagingTwoFactor(ACCOUNT_ID, body);
     }
 
     @Test
     public void testMfaVoice() throws Exception {
-        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema();
-        body.setTo(USER_NUMBER);
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setScope("scope");
-        body.setDigits(6);
-        body.setMessage("Your temporary {NAME} {SCOPE} code is {CODE}");
+        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema.Builder()
+                .to(USER_NUMBER)
+                .from(BW_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .scope("scope")
+                .digits(6)
+                .message("Your temporary {NAME} {SCOPE} code is {CODE}")
+                .build();
 
         controller.createVoiceTwoFactor(ACCOUNT_ID, body);
     }
 
     @Test(expected = ErrorWithRequestException.class)
     public void testMfaMessagingInvalidPhoneNumber() throws Exception {
-        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema();
-        body.setTo("+1invalid");
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(MESSAGING_APPLICATION_ID);
-        body.setScope("scope");
-        body.setDigits(6);
-        body.setMessage("Your temporary {NAME} {SCOPE} code is {CODE}");
+        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema.Builder()
+                .to("+1invalid")
+                .from(BW_NUMBER)
+                .applicationId(MESSAGING_APPLICATION_ID)
+                .scope("scope")
+                .digits(6)
+                .message("Your temporary {NAME} {SCOPE} code is {CODE}")
+                .build();
 
         controller.createMessagingTwoFactor(ACCOUNT_ID, body);
     }
 
     @Test(expected = ErrorWithRequestException.class)
     public void testMfaVoiceInvalidPhoneNumber() throws Exception {
-        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema();
-        body.setTo("+1invalid");
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setScope("scope");
-        body.setDigits(6);
-        body.setMessage("Your temporary {NAME} {SCOPE} code is {CODE}");
+        TwoFactorCodeRequestSchema body = new TwoFactorCodeRequestSchema.Builder()
+                .to("+1invalid")
+                .from(BW_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .scope("scope")
+                .digits(6)
+                .message("Your temporary {NAME} {SCOPE} code is {CODE}")
+                .build();
 
         controller.createVoiceTwoFactor(ACCOUNT_ID, body);
     }
 
     @Test
     public void testMfaVerify() throws Exception {
 
-        TwoFactorVerifyRequestSchema body = new TwoFactorVerifyRequestSchema();
-        body.setTo(USER_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setScope("scope");
-        body.setCode("1234567");
-        body.setExpirationTimeInMinutes(3);
+        TwoFactorVerifyRequestSchema body = new TwoFactorVerifyRequestSchema.Builder()
+                .to(USER_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .scope("scope")
+                .code("1234567")
+                .expirationTimeInMinutes(3)
+                .build();
 
         controller.createVerifyTwoFactor(ACCOUNT_ID, body);
     }
 
     @Test(expected = ErrorWithRequestException.class)
     public void testMfaVerifyInvalidPhoneNumber() throws Exception {
-        TwoFactorVerifyRequestSchema body = new TwoFactorVerifyRequestSchema();
-        body.setTo("+1invalid");
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setScope("scope");
-        body.setCode("123456");
-        body.setExpirationTimeInMinutes(3);
+        TwoFactorVerifyRequestSchema body = new TwoFactorVerifyRequestSchema.Builder()
+                .to("+1invalid")
+                .applicationId(VOICE_APPLICATION_ID)
+                .scope("scope")
+                .code("123456")
+                .expirationTimeInMinutes(3)
+                .build();
 
         controller.createVerifyTwoFactor(ACCOUNT_ID, body);
     }
diff --git a/src/test/java/com/bandwidth/TnLookupApiTests.java b/src/test/java/com/bandwidth/TnLookupApiTests.java
@@ -26,9 +26,12 @@ public void initTest(){
 
     @Test
     public void testPhoneNumberLookup() throws Exception {
-        OrderRequest body = new OrderRequest();
-        body.setTns(Collections.singletonList(USER_NUMBER));
+        OrderRequest body = new OrderRequest.Builder()
+                .tns(Collections.singletonList(USER_NUMBER))
+                .build();
+
         OrderResponse orderResponse = controller.createLookupRequest(ACCOUNT_ID, body).getResult();
+
         controller.getLookupRequestStatus(ACCOUNT_ID, orderResponse.getRequestId());
     }
 }
diff --git a/src/test/java/com/bandwidth/VoiceApiTests.java b/src/test/java/com/bandwidth/VoiceApiTests.java
@@ -29,11 +29,12 @@ public void initTest(){
     public void testCreateCallAndGetCallState() throws Exception {
         final String answerUrl = BASE_CALLBACK_URL.concat("/callbacks/outbound");
 
-        CreateCallRequest body = new CreateCallRequest();
-        body.setTo(USER_NUMBER);
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setAnswerUrl(answerUrl);
+        CreateCallRequest body = new CreateCallRequest.Builder()
+                .to(USER_NUMBER)
+                .from(BW_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .answerUrl(answerUrl)
+                .build();
 
         CreateCallResponse createCallResponse = controller.createCall(ACCOUNT_ID, body).getResult();
         assertEquals("Application ID for create call not equal", VOICE_APPLICATION_ID, createCallResponse.getApplicationId());
@@ -54,22 +55,24 @@ public void testCreateCallWithAmdAndGetCallState() throws Exception {
         final String answerUrl = BASE_CALLBACK_URL.concat("/callbacks/outbound");
         final String machineDetectionUrl = BASE_CALLBACK_URL.concat("/callbacks/machineDetection");
 
-        MachineDetectionConfiguration machineDetection = new MachineDetectionConfiguration();
-        machineDetection.setMode(ModeEnum.ASYNC);
-        machineDetection.setCallbackUrl(machineDetectionUrl);
-        machineDetection.setCallbackMethod(CallbackMethodEnum.POST);
-        machineDetection.setDetectionTimeout(5.0);
-        machineDetection.setSilenceTimeout(5.0);
-        machineDetection.setSpeechThreshold(5.0);
-        machineDetection.setSpeechEndThreshold(5.0);
-        machineDetection.setDelayResult(true);
-
-        CreateCallRequest body = new CreateCallRequest();
-        body.setTo(USER_NUMBER);
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setAnswerUrl(answerUrl);
-        body.setMachineDetection(machineDetection);
+        MachineDetectionConfiguration machineDetectionConfiguration = new MachineDetectionConfiguration.Builder()
+                .mode(ModeEnum.ASYNC)
+                .callbackUrl(machineDetectionUrl)
+                .callbackMethod(CallbackMethodEnum.POST)
+                .detectionTimeout(5.0)
+                .silenceTimeout(5.0)
+                .speechThreshold(5.0)
+                .speechEndThreshold(5.0)
+                .delayResult(true)
+                .build();
+
+        CreateCallRequest body = new CreateCallRequest.Builder()
+                .to(USER_NUMBER)
+                .from(BW_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .answerUrl(answerUrl)
+                .machineDetection(machineDetectionConfiguration)
+                .build();
 
         CreateCallResponse createCallResponse = controller.createCall(ACCOUNT_ID, body).getResult();
         assertEquals("Application ID for create call not equal", VOICE_APPLICATION_ID, createCallResponse.getApplicationId());
@@ -88,11 +91,12 @@ public void testCreateCallWithAmdAndGetCallState() throws Exception {
     public void testCreateCallInvalidPhoneNumber() throws Exception {
         final String answerUrl = BASE_CALLBACK_URL.concat("/callbacks/outbound");
 
-        CreateCallRequest body = new CreateCallRequest();
-        body.setTo("+1invalid");
-        body.setFrom(BW_NUMBER);
-        body.setApplicationId(VOICE_APPLICATION_ID);
-        body.setAnswerUrl(answerUrl);
+        CreateCallRequest body = new CreateCallRequest.Builder()
+                .to("+1invalid")
+                .from(BW_NUMBER)
+                .applicationId(VOICE_APPLICATION_ID)
+                .answerUrl(answerUrl)
+                .build();
 
         controller.createCall(ACCOUNT_ID, body);
     }

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,12 @@ public void initTest(){`
`26`	`26`
`27`	`27`	`@Test`
`28`	`28`	`public void testPhoneNumberLookup() throws Exception {`
`29`		`- OrderRequest body = new OrderRequest();`
`30`		`- body.setTns(Collections.singletonList(USER_NUMBER));`
	`29`	`+ OrderRequest body = new OrderRequest.Builder()`
	`30`	`+ .tns(Collections.singletonList(USER_NUMBER))`
	`31`	`+ .build();`
	`32`	`+`
`31`	`33`	`OrderResponse orderResponse = controller.createLookupRequest(ACCOUNT_ID, body).getResult();`
	`34`	`+`
`32`	`35`	`controller.getLookupRequestStatus(ACCOUNT_ID, orderResponse.getRequestId());`
`33`	`36`	`}`
`34`	`37`	`}`