diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b2fb4d..1be5f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Changed - `pl.smsapi.BasicAuthClient` marked as deprecated +### Removed +- legacy `phonebook.do` contacts API support + ### Removed - deprecated `pl.smsapi.proxy.Proxy#execute` method diff --git a/src/main/java/pl/smsapi/api/PhonebookFactory.java b/src/main/java/pl/smsapi/api/PhonebookFactory.java deleted file mode 100644 index 13d9271..0000000 --- a/src/main/java/pl/smsapi/api/PhonebookFactory.java +++ /dev/null @@ -1,98 +0,0 @@ -package pl.smsapi.api; - -import pl.smsapi.Client; -import pl.smsapi.api.action.phonebook.*; -import pl.smsapi.proxy.Proxy; - -/** - * @deprecated As of 2.3, use ContactsFactory instead. - */ -@Deprecated -public class PhonebookFactory extends ActionFactory { - - public PhonebookFactory(Client client) { - super(client); - } - - public PhonebookFactory(Client client, Proxy proxy) { - super(client, proxy); - } - - public PhonebookGroupList actionGroupList() { - PhonebookGroupList action = new PhonebookGroupList(); - action.client(client); - action.proxy(proxy); - return action; - } - - public PhonebookGroupAdd actionGroupAdd(String groupName) { - PhonebookGroupAdd action = new PhonebookGroupAdd(); - action.client(client); - action.proxy(proxy); - action.setName(groupName); - return action; - } - - public PhonebookGroupEdit actionGroupEdit(String groupName) { - PhonebookGroupEdit action = new PhonebookGroupEdit(); - action.client(client); - action.proxy(proxy); - action.name(groupName); - return action; - } - - public PhonebookGroupGet actionGroupGet(String groupName) { - PhonebookGroupGet action = new PhonebookGroupGet(); - action.client(client); - action.proxy(proxy); - action.name(groupName); - return action; - } - - public PhonebookGroupDelete actionGroupDelete(String groupName) { - PhonebookGroupDelete action = new PhonebookGroupDelete(); - action.client(client); - action.proxy(proxy); - action.name(groupName); - return action; - } - - public PhonebookContactList actionContactList() { - PhonebookContactList action = new PhonebookContactList(); - action.client(client); - action.proxy(proxy); - return action; - } - - public PhonebookContactAdd actionContactAdd(String number) { - PhonebookContactAdd action = new PhonebookContactAdd(); - action.client(client); - action.proxy(proxy); - action.setNumber(number); - return action; - } - - public PhonebookContactEdit actionContactEdit(String number) { - PhonebookContactEdit action = new PhonebookContactEdit(); - action.client(client); - action.proxy(proxy); - action.number(number); - return action; - } - - public PhonebookContactGet actionContactGet(String number) { - PhonebookContactGet action = new PhonebookContactGet(); - action.client(client); - action.proxy(proxy); - action.number(number); - return action; - } - - public PhonebookContactDelete actionContactDelete(String number) { - PhonebookContactDelete action = new PhonebookContactDelete(); - action.client(client); - action.proxy(proxy); - action.number(number); - return action; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/AbstractContactControl.java b/src/main/java/pl/smsapi/api/action/phonebook/AbstractContactControl.java deleted file mode 100644 index 8f894b0..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/AbstractContactControl.java +++ /dev/null @@ -1,132 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.StringUtils; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.ContactResponse; - -import java.util.Calendar; -import java.util.GregorianCalendar; - -abstract public class AbstractContactControl extends AbstractAction { - - /** - * Set contact first name. - */ - public T setFirstName(String firstName) { - params.put("first_name", firstName); - return (T) this; - } - - /** - * Set contact last name. - */ - public T setLastName(String lastName) { - params.put("last_name", lastName); - return (T) this; - } - - /** - * Set additional contact description. - */ - public T setInfo(String info) { - params.put("info", info); - return (T) this; - } - - /** - * Set contact email address. - */ - public T setEmail(String email) { - params.put("email", email); - return (T) this; - } - - /** - * Set contact birthday date. - * - * @param birthday Date in DD.MM.YYYY format. - */ - public T setBirthday(String birthday) { - params.put("birthday", birthday); - return (T) this; - } - - /** - * Set contact birthday date. - */ - public T setBirthday(GregorianCalendar cal) { - String tmp = Integer.toString(cal.get(Calendar.DAY_OF_MONTH)) - + "." + Integer.toString(cal.get(Calendar.MONTH)) - + "." + Integer.toString(cal.get(Calendar.YEAR)); - params.put("birthday", tmp); - return (T) this; - } - - /** - * Set contact city. - */ - public T setCity(String city) { - params.put("city", city); - return (T) this; - } - - /** - * Set contact gender. - */ - public T setGender(ContactResponse.Gender gender) { - params.put("gender", gender.type().toString()); - return (T) this; - } - - /** - * Set contact gender. - */ - public T setGender(String gender) { - - if (gender.equalsIgnoreCase(ContactResponse.Gender.FEMALE.name())) { - setGender(ContactResponse.Gender.FEMALE); - } else if (gender.equalsIgnoreCase(ContactResponse.Gender.MALE.name())) { - setGender(ContactResponse.Gender.MALE); - } - - return (T) this; - } - - /** - * Add contact to group. - */ - public T setGroup(String group) { - params.put("groups", group); - return (T) this; - } - - /** - * Add contact to groups. - */ - public T setGroups(String[] groups) { - params.put("groups", StringUtils.join(groups, ',')); - return (T) this; - } - - protected ContactResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return - new ContactResponse( - jsonObject.getString("number"), - jsonObject.optString("first_name"), - jsonObject.optString("last_name"), - jsonObject.optString("info"), - jsonObject.optString("birthday"), - jsonObject.optString("city"), - jsonObject.optString("gender"), - jsonObject.optInt("date_add"), - jsonObject.optInt("date_mod") - ); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactAdd.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactAdd.java deleted file mode 100644 index 01356b7..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactAdd.java +++ /dev/null @@ -1,12 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -public class PhonebookContactAdd extends AbstractContactControl { - - /** - * Set contact phone number. - */ - public PhonebookContactAdd setNumber(String number) { - params.put("add_contact", number); - return this; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactDelete.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactDelete.java deleted file mode 100644 index b29e0e8..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactDelete.java +++ /dev/null @@ -1,24 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.RawResponse; - -public class PhonebookContactDelete extends AbstractAction { - - /** - * Set contact phone number to delete. - */ - public PhonebookContactDelete number(String number) { - params.put("delete_contact", number); - return this; - } - - protected RawResponse createResponse(String data) { - return new RawResponse(data); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactEdit.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactEdit.java deleted file mode 100644 index 57397b3..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactEdit.java +++ /dev/null @@ -1,20 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -public class PhonebookContactEdit extends AbstractContactControl { - - /** - * Select contact phone number to edit. - */ - public PhonebookContactEdit number(String number) { - params.put("edit_contact", number); - return this; - } - - /** - * Set new phone number. - */ - public PhonebookContactEdit setNumber(String number) { - params.put("new_number", number); - return this; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactGet.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactGet.java deleted file mode 100644 index c1045a8..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactGet.java +++ /dev/null @@ -1,41 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.ContactResponse; - -public class PhonebookContactGet extends AbstractAction { - - public PhonebookContactGet() { - setJson(true); - } - - /** - * Set filter by contact phone number. - */ - public PhonebookContactGet number(String number) { - params.put("get_contact", number); - return this; - } - - protected ContactResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return - new ContactResponse( - jsonObject.getString("number"), - jsonObject.optString("first_name"), - jsonObject.optString("last_name"), - jsonObject.optString("info"), - jsonObject.optString("birthday"), - jsonObject.optString("city"), - jsonObject.optString("gender"), - jsonObject.optInt("date_add"), - jsonObject.optInt("date_mod") - ); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactList.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactList.java deleted file mode 100644 index 1194203..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookContactList.java +++ /dev/null @@ -1,96 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.StringUtils; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.ContactsResponse; - -public class PhonebookContactList extends AbstractAction { - - public PhonebookContactList() { - setJson(true); - params.put("list_contacts", "1"); - } - - /** - * Set filter contacts by phone number. - */ - public PhonebookContactList filterByNumber(String number) { - params.put("number", number); - return this; - } - - /** - * Set filter contacts by group name. - */ - public PhonebookContactList filterByGroup(String group) { - params.put("groups", group); - return this; - } - - /** - * Set filter contacts by group names. - */ - public PhonebookContactList filterByGroups(String[] groups) { - params.put("groups", StringUtils.join(groups, ';')); - return this; - } - - /** - * The result list will contain contacts with given chars string. - */ - public PhonebookContactList filterByText(String text) { - params.put("text_search", text); - return this; - } - - /** - * Set filter by gender. - */ - public PhonebookContactList filterByGender(String gender) { - params.put("gender", gender); - return this; - } - - /** - * Set order parameter. - */ - public PhonebookContactList orderBy(String orderBy) { - params.put("order_by", orderBy); - return this; - } - - /** - * Set order direction. - */ - public PhonebookContactList orderDir(String orderDir) { - params.put("order_dir", orderDir); - return this; - } - - /** - * Set result limit. - */ - public PhonebookContactList limit(int limit) { - params.put("limit", Integer.toString(limit)); - return this; - } - - /** - * Set result offset. - */ - public PhonebookContactList offset(int offset) { - params.put("offset", Integer.toString(offset)); - return this; - } - - protected ContactsResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return new ContactsResponse(jsonObject.getInt("count"), jsonObject.getJSONArray("list")); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupAdd.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupAdd.java deleted file mode 100644 index 24933e8..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupAdd.java +++ /dev/null @@ -1,34 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.GroupResponse; - -public class PhonebookGroupAdd extends AbstractAction { - - /** - * Set group name. - */ - public PhonebookGroupAdd setName(String groupName) { - params.put("add_group", groupName); - return this; - } - - /** - * Set additional group description. - */ - public PhonebookGroupAdd setInfo(String info) { - params.put("info", info); - return this; - } - - protected GroupResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return new GroupResponse(jsonObject.getString("name"), jsonObject.optString("info"), jsonObject.optInt("numbers_count")); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupDelete.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupDelete.java deleted file mode 100644 index f2c830c..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupDelete.java +++ /dev/null @@ -1,38 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.RawResponse; - -public class PhonebookGroupDelete extends AbstractAction { - - /** - * Set group to delete. - */ - public PhonebookGroupDelete name(String groupname) { - params.put("delete_group", groupname); - return this; - } - - /** - * Set flag on true to remove contacts from group. - * If this flag is false or unset contact will be only unbind from group. - */ - public PhonebookGroupDelete removeContacts(boolean remove) { - if (remove) { - params.put("remove_contacts", "1"); - } else { - params.remove("remove_contacts"); - } - - return this; - } - - protected RawResponse createResponse(String data) { - return new RawResponse(data); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupEdit.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupEdit.java deleted file mode 100644 index 0eac938..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupEdit.java +++ /dev/null @@ -1,43 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.GroupResponse; - -public class PhonebookGroupEdit extends AbstractAction { - - /** - * Set edited group name. - */ - public PhonebookGroupEdit name(String groupname) { - params.put("edit_group", groupname); - return this; - } - - /** - * Set new group name. - */ - public PhonebookGroupEdit setName(String groupname) { - params.put("name", groupname); - return this; - } - - /** - * Set additional group description. - */ - public PhonebookGroupEdit setInfo(String info) { - params.put("info", info); - return this; - } - - - protected GroupResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return new GroupResponse(jsonObject.getString("name"), jsonObject.optString("info"), jsonObject.optInt("numbers_count")); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupGet.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupGet.java deleted file mode 100644 index 9ca3590..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupGet.java +++ /dev/null @@ -1,30 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.GroupResponse; - -public class PhonebookGroupGet extends AbstractAction { - - public PhonebookGroupGet() { - setJson(true); - } - - /** - * Set group name to find. - */ - public PhonebookGroupGet name(String groupName) { - params.put("get_group", groupName); - return this; - } - - protected GroupResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return new GroupResponse(jsonObject.getString("name"), jsonObject.optString("info"), jsonObject.optInt("numbers_count")); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupList.java b/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupList.java deleted file mode 100644 index e9b1020..0000000 --- a/src/main/java/pl/smsapi/api/action/phonebook/PhonebookGroupList.java +++ /dev/null @@ -1,23 +0,0 @@ -package pl.smsapi.api.action.phonebook; - -import org.json.JSONObject; -import pl.smsapi.api.action.AbstractAction; -import pl.smsapi.api.response.GroupsResponse; - -public class PhonebookGroupList extends AbstractAction { - - public PhonebookGroupList() { - setJson(true); - params.put("list_groups", "1"); - } - - protected GroupsResponse createResponse(String data) { - JSONObject jsonObject = new JSONObject(data); - return new GroupsResponse(jsonObject.optInt("count"), jsonObject.optString("list")); - } - - @Override - protected String endPoint() { - return "phonebook.do"; - } -} diff --git a/src/main/java/pl/smsapi/api/response/ContactResponse.java b/src/main/java/pl/smsapi/api/response/ContactResponse.java deleted file mode 100644 index 3954e11..0000000 --- a/src/main/java/pl/smsapi/api/response/ContactResponse.java +++ /dev/null @@ -1,81 +0,0 @@ -package pl.smsapi.api.response; - -public class ContactResponse implements Response { - - public static enum Gender { - - MALE(-1), - FEMALE(1); - private final int type; - - Gender(int type) { - this.type = type; - } - - public Integer type() { - return type; - } - } - - ; - private String number; - private String firstName; - private String lastName; - private String info; - private String email; - private String birthday; - private String city; - private String gender; - private int dateAdd; - private int dateMod; - - public ContactResponse(String number, String firstName, String lastName, String info, String birthday, String city, String gender, int dateAdd, int dateMod) { - - this.number = number; - this.firstName = firstName; - this.lastName = lastName; - this.info = info; - this.birthday = birthday; - this.city = city; - this.gender = gender; - this.dateAdd = dateAdd; - this.dateMod = dateMod; - - } - - public String getNumber() { - return number; - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getInfo() { - return info; - } - - public String getBirthday() { - return birthday; - } - - public String getCity() { - return city; - } - - public String getGender() { - return gender; - } - - public int getDateAdd() { - return dateAdd; - } - - public int getDateMod() { - return dateMod; - } -} diff --git a/src/main/java/pl/smsapi/api/response/ContactsResponse.java b/src/main/java/pl/smsapi/api/response/ContactsResponse.java deleted file mode 100644 index 2676f0a..0000000 --- a/src/main/java/pl/smsapi/api/response/ContactsResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package pl.smsapi.api.response; - -import org.json.JSONArray; -import org.json.JSONObject; - -import java.util.ArrayList; - -public class ContactsResponse extends CountableResponse { - - private ArrayList list = new ArrayList(); - - public ContactsResponse(int count, JSONArray list) { - - super(count); - - final int n = list.length(); - for (int i = 0; i < n; i++) { - JSONObject row = list.getJSONObject(i); - this.list.add(new ContactResponse(row.getString("number"), row.optString("first_name"), row.optString("last_name"), row.optString("info"), row.optString("birthday"), row.optString("city"), row.optString("gender"), row.optInt("date_add"), row.optInt("date_mod"))); - } - } - - public ArrayList getList() { - return list; - } -} diff --git a/src/main/java/pl/smsapi/api/response/GroupResponse.java b/src/main/java/pl/smsapi/api/response/GroupResponse.java deleted file mode 100644 index a8c53fa..0000000 --- a/src/main/java/pl/smsapi/api/response/GroupResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -package pl.smsapi.api.response; - -public class GroupResponse implements Response { - - private String name; - private String info; - private int numbers; - - public GroupResponse(String name, String info, int numbers) { - - this.name = name; - this.info = info; - this.numbers = numbers; - } - - public String getName() { - return name; - } - - public String getInfo() { - return info; - } - - public int getNumbers() { - return numbers; - } -} diff --git a/src/main/java/pl/smsapi/api/response/GroupsResponse.java b/src/main/java/pl/smsapi/api/response/GroupsResponse.java deleted file mode 100644 index cfc7816..0000000 --- a/src/main/java/pl/smsapi/api/response/GroupsResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package pl.smsapi.api.response; - -import org.json.JSONArray; -import org.json.JSONObject; - -import java.util.ArrayList; - -public class GroupsResponse extends CountableResponse { - - private ArrayList list = new ArrayList(); - - public GroupsResponse(int count, String data) { - - super(count); - - if (data != null && !data.isEmpty()) { - - JSONArray aData = new JSONArray(data); - final int n = aData.length(); - if (n > 0) { - for (int i = 0; i < n; i++) { - JSONObject tmp = aData.getJSONObject(i); - list.add(new GroupResponse(tmp.optString("name"), tmp.optString("info"), tmp.optInt("numbers_count"))); - } - } - } - - } - - public ArrayList getList() { - return list; - } -} diff --git a/src/test/java/pl/smsapi/test/run/PhonebookTest.java b/src/test/java/pl/smsapi/test/run/PhonebookTest.java deleted file mode 100644 index 7751550..0000000 --- a/src/test/java/pl/smsapi/test/run/PhonebookTest.java +++ /dev/null @@ -1,184 +0,0 @@ -package pl.smsapi.test.run; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import pl.smsapi.api.PhonebookFactory; -import pl.smsapi.api.action.phonebook.*; -import pl.smsapi.api.response.*; -import pl.smsapi.exception.ClientException; -import pl.smsapi.exception.SmsapiException; -import pl.smsapi.test.TestSmsapi; - -import java.util.GregorianCalendar; - -@Ignore -public class PhonebookTest extends TestSmsapi { - private String groupTest = "mytest"; - private String groupTestEdit = "mytestedit"; - private String contactTest = "694562829"; - private String contactTestEdit = "617234123"; - - PhonebookFactory apiFactory; - - @Before - public void setUp() throws ClientException { - apiFactory = new PhonebookFactory(getAuthorizationClient(), getProxy()); - } - - @Test - public void groupAdd() throws SmsapiException { - PhonebookGroupAdd action = apiFactory.actionGroupAdd(groupTest); - GroupResponse item = action.execute(); - - System.out.println("GroupAdd:"); - - renderGroupItem(item); - - } - - @Test - public void groupEdit() throws SmsapiException { - PhonebookGroupEdit action = apiFactory.actionGroupEdit(groupTest); - action.setName(groupTestEdit).setInfo("to jest grupa testowa"); - GroupResponse item = action.execute(); - - System.out.println("GroupEdit:"); - - renderGroupItem(item); - } - - @Test - public void groupGet() throws SmsapiException { - PhonebookGroupGet action = apiFactory.actionGroupGet(groupTestEdit); - GroupResponse item = action.execute(); - - System.out.println("GroupGet:"); - - renderGroupItem(item); - } - - private void renderGroupItem(GroupResponse item) { - if (item != null) { - System.out.println("Groupname: " - + item.getName() - + " Info: " + item.getInfo() - + " Numbers:" + item.getNumbers()); - } else { - System.out.println("Number: "); - } - } - - private void renderContactItem(ContactResponse item) { - if (item != null) { - System.out.println("Number: " + item.getNumber() - + " FirstName: " + item.getFirstName() - + " LastName:" + item.getLastName() - + " City: " + item.getBirthday() - + " Birthday: " + item.getBirthday() - + " Info: " + item.getInfo() - + " Gender: " + item.getGender() - + " DateAdd: " + item.getDateAdd() - + " DateMod: " + item.getDateMod()); - } else { - System.out.println("Number: "); - } - } - - @Test - public void contactAdd() throws SmsapiException { - PhonebookContactAdd action = apiFactory.actionContactAdd(contactTest); - - GregorianCalendar cal = new GregorianCalendar(); - cal.set(1976, 2, 15); - - action.setFirstName("Bolek") - .setLastName("Dzik") - .setBirthday(cal) - .setInfo("to jest test kontaktu") - .setEmail("bolek@aaa.pl") - .setCity("Gliwice") - .setGender(ContactResponse.Gender.MALE) - .setGroup(groupTestEdit); - - ContactResponse item = action.execute(); - - System.out.println("ContactAdd:"); - - renderContactItem(item); - } - - @Test - public void contactEdit() throws SmsapiException { - PhonebookContactEdit action = apiFactory.actionContactEdit(contactTest); - action.setNumber(contactTestEdit).setFirstName("Lolek"); - - ContactResponse item = action.execute(); - - System.out.println("ContactEdit:"); - - renderContactItem(item); - } - - @Test - public void contactGet() throws SmsapiException { - PhonebookContactGet action = apiFactory.actionContactGet(contactTestEdit); - - ContactResponse item = action.execute(); - - System.out.println("ContactGet:"); - - renderContactItem(item); - } - - @Test - public void contactDelete() throws SmsapiException { - PhonebookContactDelete action = apiFactory.actionContactDelete(contactTestEdit); - - RawResponse item = action.execute(); - - System.out.println("ContactDelete:"); - - if (item != null) { - System.out.println("Contact: " + item.getText()); - } else { - System.out.println("Item null"); - } - } - - @Test - public void groupDelete() throws SmsapiException { - PhonebookGroupDelete action = apiFactory.actionGroupDelete(groupTestEdit); - - RawResponse item = action.execute(); - - System.out.println("GroupDelete:"); - - if (item != null) { - System.out.println("Group: " + item.getText()); - } else { - System.out.println("Item null"); - } - } - - @Test - public void contactList() throws SmsapiException { - ContactsResponse result = apiFactory.actionContactList().execute(); - System.out.println("ContactList:"); - - for (ContactResponse item : result.getList()) { - renderContactItem(item); - } - } - - @Test - public void groupList() throws SmsapiException { - GroupsResponse result = apiFactory.actionGroupList().execute(); - - System.out.println("GroupList:"); - - for (GroupResponse item : result.getList()) { - renderGroupItem(item); - } - } -}