Skip to content

Commit ab3fc20

Browse files
maciejlewmaciejlew
committed
Renames POST and PUT Contacts API parameter setters
1 parent f124af2 commit ab3fc20

10 files changed

Lines changed: 92 additions & 92 deletions

File tree

‎src/main/java/pl/smsapi/api/action/contacts/ContactAdd.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@ protected String endPoint() {
99
return "contacts";
1010
}
1111

12-
public ContactAdd setPhoneNumber(String phoneNumber) {
12+
public ContactAdd withPhoneNumber(String phoneNumber) {
1313
params.put("phone_number", phoneNumber);
1414
return this;
1515
}
1616

17-
public ContactAdd setEmail(String email) {
17+
public ContactAdd withEmail(String email) {
1818
params.put("email", email);
1919
return this;
2020
}
2121

22-
public ContactAdd setFirstName(String firstName) {
22+
public ContactAdd withFirstName(String firstName) {
2323
params.put("first_name", firstName);
2424
return this;
2525
}
2626

27-
public ContactAdd setLastName(String lastName) {
27+
public ContactAdd withLastName(String lastName) {
2828
params.put("last_name", lastName);
2929
return this;
3030
}
3131

32-
public ContactAdd setGender(String gender) {
32+
public ContactAdd withGender(String gender) {
3333
params.put("gender", gender);
3434
return this;
3535
}
3636

37-
public ContactAdd setBirthdayDate(String birthdayDate) {
37+
public ContactAdd withBirthdayDate(String birthdayDate) {
3838
params.put("birthday_date", birthdayDate);
3939
return this;
4040
}
4141

42-
public ContactAdd setDescription(String description) {
42+
public ContactAdd withDescription(String description) {
4343
params.put("description", description);
4444
return this;
4545
}
4646

47-
public ContactAdd setCity(String city) {
47+
public ContactAdd withCity(String city) {
4848
params.put("city", city);
4949
return this;
5050
}
5151

52-
public ContactAdd setSource(String source) {
52+
public ContactAdd withSource(String source) {
5353
params.put("source", source);
5454
return this;
5555
}

‎src/main/java/pl/smsapi/api/action/contacts/ContactEdit.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,47 @@ protected String httpMethod() {
2020
return "PUT";
2121
}
2222

23-
public ContactEdit setPhoneNumber(String phoneNumber) {
23+
public ContactEdit withPhoneNumber(String phoneNumber) {
2424
params.put("phone_number", phoneNumber);
2525
return this;
2626
}
2727

28-
public ContactEdit setEmail(String email) {
28+
public ContactEdit withEmail(String email) {
2929
params.put("email", email);
3030
return this;
3131
}
3232

33-
public ContactEdit setFirstName(String firstName) {
33+
public ContactEdit withFirstName(String firstName) {
3434
params.put("first_name", firstName);
3535
return this;
3636
}
3737

38-
public ContactEdit setLastName(String lastName) {
38+
public ContactEdit withLastName(String lastName) {
3939
params.put("last_name", lastName);
4040
return this;
4141
}
4242

43-
public ContactEdit setGender(String gender) {
43+
public ContactEdit withGender(String gender) {
4444
params.put("gender", gender);
4545
return this;
4646
}
4747

48-
public ContactEdit setBirthdayDate(String birthdayDate) {
48+
public ContactEdit withBirthdayDate(String birthdayDate) {
4949
params.put("birthday_date", birthdayDate);
5050
return this;
5151
}
5252

53-
public ContactEdit setDescription(String description) {
53+
public ContactEdit withDescription(String description) {
5454
params.put("description", description);
5555
return this;
5656
}
5757

58-
public ContactEdit setCity(String city) {
58+
public ContactEdit withCity(String city) {
5959
params.put("city", city);
6060
return this;
6161
}
6262

63-
public ContactEdit setSource(String source) {
63+
public ContactEdit withSource(String source) {
6464
params.put("source", source);
6565
return this;
6666
}

‎src/main/java/pl/smsapi/api/action/contacts/groups/GroupAdd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ protected String endPoint() {
1414
return "contacts/groups";
1515
}
1616

17-
public GroupAdd setDescription(String description) {
17+
public GroupAdd withDescription(String description) {
1818
params.put("description", description);
1919
return this;
2020
}
2121

22-
public GroupAdd setIdx(String idx) {
22+
public GroupAdd withIdx(String idx) {
2323
params.put("idx", idx);
2424
return this;
2525
}

‎src/main/java/pl/smsapi/api/action/contacts/groups/GroupEdit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ protected String httpMethod() {
2121
return "PUT";
2222
}
2323

24-
public GroupEdit setName(String name) {
24+
public GroupEdit withName(String name) {
2525
params.put("name", name);
2626
return this;
2727
}
2828

29-
public GroupEdit setDescription(String description) {
29+
public GroupEdit withDescription(String description) {
3030
params.put("description", description);
3131
return this;
3232
}
3333

34-
public GroupEdit setIdx(String idx) {
34+
public GroupEdit withIdx(String idx) {
3535
params.put("idx", idx);
3636
return this;
3737
}

‎src/test/java/pl/smsapi/api/action/contacts/ContactAddTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ContactAddTest {
1414
@Test
1515
public void executeAddPhoneContactRequest() throws SmsapiException {
1616
ContactAdd action = new ContactAdd()
17-
.setPhoneNumber("48327201200");
17+
.withPhoneNumber("48327201200");
1818

1919
ProxyRequestSpy requestSpy = executeAction(action);
2020

@@ -28,7 +28,7 @@ public void executeAddPhoneContactRequest() throws SmsapiException {
2828
@Test
2929
public void executeAddEmailAddressContactRequest() throws SmsapiException {
3030
ContactAdd action = new ContactAdd()
31-
.setEmail("john.doe@example.com");
31+
.withEmail("john.doe@example.com");
3232

3333
ProxyRequestSpy requestSpy = executeAction(action);
3434

@@ -42,15 +42,15 @@ public void executeAddEmailAddressContactRequest() throws SmsapiException {
4242
@Test
4343
public void executeAddContactWithOptionalFieldsRequest() throws SmsapiException {
4444
ContactAdd action = new ContactAdd()
45-
.setPhoneNumber("48327201200")
46-
.setEmail("john.doe@example.com")
47-
.setFirstName("John")
48-
.setLastName("Doe")
49-
.setGender("male")
50-
.setBirthdayDate("2017-07-21")
51-
.setDescription("Resource description")
52-
.setCity("Example City")
53-
.setSource("Example Source");
45+
.withPhoneNumber("48327201200")
46+
.withEmail("john.doe@example.com")
47+
.withFirstName("John")
48+
.withLastName("Doe")
49+
.withGender("male")
50+
.withBirthdayDate("2017-07-21")
51+
.withDescription("Resource description")
52+
.withCity("Example City")
53+
.withSource("Example Source");
5454

5555
ProxyRequestSpy requestSpy = executeAction(action);
5656

‎src/test/java/pl/smsapi/api/action/contacts/ContactEditTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public void executeEditContactRequest() throws SmsapiException {
2626
@Test
2727
public void executeAddContactWithOptionalFieldsRequest() throws SmsapiException {
2828
ContactEdit action = new ContactEdit("0f0f0f0f0f0f0f0f0f0f0f0f")
29-
.setPhoneNumber("48327201200")
30-
.setEmail("john.doe@example.com")
31-
.setFirstName("John")
32-
.setLastName("Doe")
33-
.setGender("male")
34-
.setBirthdayDate("2017-07-21")
35-
.setDescription("Resource description")
36-
.setCity("Example City")
37-
.setSource("Example Source");
29+
.withPhoneNumber("48327201200")
30+
.withEmail("john.doe@example.com")
31+
.withFirstName("John")
32+
.withLastName("Doe")
33+
.withGender("male")
34+
.withBirthdayDate("2017-07-21")
35+
.withDescription("Resource description")
36+
.withCity("Example City")
37+
.withSource("Example Source");
3838

3939
ProxyRequestSpy requestSpy = executeAction(action);
4040

‎src/test/java/pl/smsapi/api/action/contacts/ContactsFactoryTest.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void addContact() throws SmsapiException {
2525
String emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
2626

2727
ContactAdd actionAdd = apiFactory.actionAdd()
28-
.setEmail(emailAddress);
28+
.withEmail(emailAddress);
2929
Contact responseAdd = actionAdd.execute();
3030

3131
assertNotNull(responseAdd);
@@ -49,14 +49,14 @@ public void addContactWithOptionalFields() throws SmsapiException {
4949
String emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
5050

5151
ContactAdd actionAdd = apiFactory.actionAdd()
52-
.setEmail(emailAddress)
53-
.setFirstName("John")
54-
.setLastName("Doe")
55-
.setGender("male")
56-
.setBirthdayDate("2000-01-01")
57-
.setDescription("add-contact-test")
58-
.setCity("Gliwice")
59-
.setSource("add-contact-test-data");
52+
.withEmail(emailAddress)
53+
.withFirstName("John")
54+
.withLastName("Doe")
55+
.withGender("male")
56+
.withBirthdayDate("2000-01-01")
57+
.withDescription("add-contact-test")
58+
.withCity("Gliwice")
59+
.withSource("add-contact-test-data");
6060
Contact responseAdd = actionAdd.execute();
6161

6262
assertNotNull(responseAdd);
@@ -79,14 +79,14 @@ public void addContactWithOptionalFields() throws SmsapiException {
7979
public void getContact() throws SmsapiException {
8080
String emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
8181
ContactAdd actionAdd = apiFactory.actionAdd()
82-
.setEmail(emailAddress)
83-
.setFirstName("John")
84-
.setLastName("Doe")
85-
.setGender("male")
86-
.setBirthdayDate("2000-01-01")
87-
.setDescription("get-contact-test")
88-
.setCity("Gliwice")
89-
.setSource("get-contact-test-data");
82+
.withEmail(emailAddress)
83+
.withFirstName("John")
84+
.withLastName("Doe")
85+
.withGender("male")
86+
.withBirthdayDate("2000-01-01")
87+
.withDescription("get-contact-test")
88+
.withCity("Gliwice")
89+
.withSource("get-contact-test-data");
9090
Contact responseAdd = actionAdd.execute();
9191

9292
ContactGet actionGet = apiFactory.actionGet(responseAdd.id);
@@ -112,26 +112,26 @@ public void getContact() throws SmsapiException {
112112
public void editContact() throws SmsapiException {
113113
String emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
114114
ContactAdd actionAdd = apiFactory.actionAdd()
115-
.setEmail(emailAddress)
116-
.setFirstName("John")
117-
.setLastName("Doe")
118-
.setGender("male")
119-
.setBirthdayDate("2000-01-01")
120-
.setDescription("edit-contact-test-1")
121-
.setCity("Gliwice")
122-
.setSource("edit-contact-test-data-1");
115+
.withEmail(emailAddress)
116+
.withFirstName("John")
117+
.withLastName("Doe")
118+
.withGender("male")
119+
.withBirthdayDate("2000-01-01")
120+
.withDescription("edit-contact-test-1")
121+
.withCity("Gliwice")
122+
.withSource("edit-contact-test-data-1");
123123
Contact responseAdd = actionAdd.execute();
124124

125125
emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
126126
ContactEdit actionEdit = apiFactory.actionEdit(responseAdd.id)
127-
.setEmail(emailAddress)
128-
.setFirstName("Mary")
129-
.setLastName("Rose")
130-
.setGender("female")
131-
.setBirthdayDate("1999-12-31")
132-
.setDescription("edit-contact-test-2")
133-
.setCity("Bytom")
134-
.setSource("edit-contact-test-data-2");
127+
.withEmail(emailAddress)
128+
.withFirstName("Mary")
129+
.withLastName("Rose")
130+
.withGender("female")
131+
.withBirthdayDate("1999-12-31")
132+
.withDescription("edit-contact-test-2")
133+
.withCity("Bytom")
134+
.withSource("edit-contact-test-data-2");
135135

136136
Contact responseEdit = actionEdit.execute();
137137

@@ -154,7 +154,7 @@ public void editContact() throws SmsapiException {
154154
@Test
155155
public void deleteContact() throws SmsapiException {
156156
ContactAdd actionAdd = apiFactory.actionAdd()
157-
.setEmail("smsapi-java-client-" + new Random().nextInt(100000) + "@example.com");
157+
.withEmail("smsapi-java-client-" + new Random().nextInt(100000) + "@example.com");
158158
Contact responseAdd = actionAdd.execute();
159159

160160
ContactDelete actionDelete = apiFactory.actionDelete(responseAdd.id);
@@ -167,7 +167,7 @@ public void deleteContact() throws SmsapiException {
167167
public void listContacts() throws SmsapiException {
168168
String emailAddress = "smsapi-java-client-" + new Random().nextInt(100000) + "@example.com";
169169
ContactAdd actionAdd = apiFactory.actionAdd()
170-
.setEmail(emailAddress);
170+
.withEmail(emailAddress);
171171
actionAdd.execute();
172172

173173
ContactsList actionList = apiFactory.actionList();

‎src/test/java/pl/smsapi/api/action/contacts/groups/GroupAddTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public void executeAddGroupRequest() throws SmsapiException {
2727
@Test
2828
public void executeAddGroupWithOptionalFieldsRequest() throws SmsapiException {
2929
GroupAdd action = new GroupAdd("Example Group")
30-
.setDescription("Resource description")
31-
.setIdx("example-user-provided-id-123");
30+
.withDescription("Resource description")
31+
.withIdx("example-user-provided-id-123");
3232

3333
ProxyRequestSpy requestSpy = executeAction(action);
3434

‎src/test/java/pl/smsapi/api/action/contacts/groups/GroupEditTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public void executeEditGroupRequest() throws SmsapiException {
2626
@Test
2727
public void executeEditGroupWithOptionalFieldsRequest() throws SmsapiException {
2828
GroupEdit action = new GroupEdit("0f0f0f0f0f0f0f0f0f0f0f0f")
29-
.setName("Example Group")
30-
.setDescription("Resource description")
31-
.setIdx("example-user-provided-id-123");
29+
.withName("Example Group")
30+
.withDescription("Resource description")
31+
.withIdx("example-user-provided-id-123");
3232

3333
ProxyRequestSpy requestSpy = executeAction(action);
3434

0 commit comments

Comments
 (0)