{
private String number;
/** The Url of the Contacts image on the web **/
private String imageUrl;
-
+
public Contact(String name, String id, String number, String imageUrl) {
super();
this.name = name;
@@ -80,7 +80,7 @@ public String getId() {
public void setId(String id) {
this.id = id;
}
-
+
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@@ -101,7 +101,7 @@ public String toString() {
}
return ret+"}";
}
-
+
/**
* Deprecated Method. Creates a Contact out of a html
* TODO DummyData - Implement.
@@ -112,15 +112,15 @@ public String toString() {
@Deprecated
public static Contact extractContact(String html) {
html = ParsingUtil.removeUninterestingParts(html,"", true);
-
- //if it shows a name John Doe
+
+ //if it shows a name John Doe
String lname;
try {
lname = ParsingUtil.removeUninterestingParts(html,"","",false);
} catch (Exception e) {
lname = "Parsing Error (name)";
}
-
+
String lid;
try {
String comingCloser = ParsingUtil.removeUninterestingParts(html,"","",true);
@@ -128,8 +128,8 @@ public static Contact extractContact(String html) {
} catch (Exception e) {
lid = "Parsing Error (id)";
}
-
-
+
+
// if it shows a phone number (912) 230-0029 - mobile
String lnumber;
try {
@@ -138,27 +138,27 @@ public static Contact extractContact(String html) {
} catch (Exception e) {
lnumber = "Parsing Error (number)";
}
-
+
//if it shows an image for the contact
String limageUrl;
try {
// Get the correct part: |
limageUrl = ParsingUtil.removeUninterestingParts(html,""," or 
- limageUrl= ParsingUtil.removeUninterestingParts(html," ",false);
+ limageUrl= ParsingUtil.removeUninterestingParts(html,"",false);
// now we have alt="Blue_ghost" src="/voice/resources/1366864992-blue_ghost.jpg"> or createDisabledForwardingIdListFromJsonPartResponse(String jsonPart) {
+ public final static List createDisabledForwardingIdListFromJsonPartResponse(String jsonPart) {
List disabledForwardingIds = new ArrayList();
try {
String[] disNames = JSONObject.getNames(new JSONObject(jsonPart));
@@ -42,7 +42,7 @@ public final static List createDisabledForwardingIdListFro
if(jsonPart!=null &! jsonPart.equals("")) {
jsonPart = jsonPart.replaceAll(",\"", ",#");
String[] disabledForwardingIdsStrings = jsonPart.split(Pattern.quote(","));
- for (int j = 0; j < disabledForwardingIdsStrings.length; j++) {
+ for (int j = 0; j < disabledForwardingIdsStrings.length; j++) {
try {
String gId = ParsingUtil.removeUninterestingParts(disabledForwardingIdsStrings[j], "\"", "\"", false);
boolean gState = Boolean.parseBoolean(disabledForwardingIdsStrings[j].substring(disabledForwardingIdsStrings[j].indexOf(":")+1,disabledForwardingIdsStrings[j].indexOf("}")));
@@ -58,7 +58,7 @@ public final static List createDisabledForwardingIdListFro
return disabledForwardingIds;
*/
}
-
+
public final static DisabledForwardingId[] createDisabledForwardingIdArrayFromJsonPartResponse(String jsonPart) {
List list = createDisabledForwardingIdListFromJsonPartResponse(jsonPart);
DisabledForwardingId[] result = new DisabledForwardingId[list.size()];
@@ -67,20 +67,20 @@ public final static DisabledForwardingId[] createDisabledForwardingIdArrayFromJs
}
return result;
}
-
- public String toJson(){
+
+ public String toJson(){
return toJsonObject().toString();
}
-
+
public JSONObject toJsonObject(){
JSONObject resultO = new JSONObject();
- try {
+ try {
resultO.putOpt("id", id);
resultO.putOpt("disabled", disabled);
} catch (JSONException e) {
return null;
}
-
+
return resultO;
}
@@ -116,6 +116,6 @@ public void setId(String id) {
public void setDisabled(boolean disabled) {
this.disabled = disabled;
}
-
-
-}
+
+
+}
diff --git a/src/com/techventus/server/voice/datatypes/DisabledId.java b/src/main/java/com/techventus/server/voice/datatypes/DisabledId.java
similarity index 92%
rename from src/com/techventus/server/voice/datatypes/DisabledId.java
rename to src/main/java/com/techventus/server/voice/datatypes/DisabledId.java
index 9b3a386..51f377a 100644
--- a/src/com/techventus/server/voice/datatypes/DisabledId.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/DisabledId.java
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package com.techventus.server.voice.datatypes;
@@ -19,9 +19,9 @@
public class DisabledId {
String id;
boolean disabled;
-
+
/**
- *
+ *
* @param pId
* @param pDisabled
*/
@@ -29,9 +29,9 @@ public DisabledId(String pId, boolean pDisabled) {
id = pId;
disabled = pDisabled;
}
-
+
/**
- *
+ *
* @param jsonObject
* @param saveMode
* @throws JSONException
@@ -40,24 +40,24 @@ public DisabledId(JSONObject jsonObject, boolean saveMode) throws JSONException
if(!saveMode || saveMode && jsonObject.has("id")) id = jsonObject.getString("id");
if(!saveMode || saveMode && jsonObject.has("disabled")) disabled = jsonObject.getBoolean("disabled");
}
-
+
public String toString() {
String ret="{id="+id+";";
- ret+="disabled="+disabled+"}";
+ ret+="disabled="+disabled+"}";
return ret;
}
-
+
/**
- *
+ *
* @param jsonPart
* @return List
*/
- public final static List createDisabledIdListFromJsonPartResponse(String jsonPart) {
+ public final static List createDisabledIdListFromJsonPartResponse(String jsonPart) {
List disabledIds = new ArrayList();
if(jsonPart!=null &! jsonPart.equals("")) {
jsonPart = jsonPart.replaceAll(",\"", ",#");
String[] disabledIdsStrings = jsonPart.split(Pattern.quote(","));
- for (int j = 0; j < disabledIdsStrings.length; j++) {
+ for (int j = 0; j < disabledIdsStrings.length; j++) {
String gId = ParsingUtil.removeUninterestingParts(disabledIdsStrings[j], "\"", "\"", false);
boolean gState = Boolean.parseBoolean(disabledIdsStrings[j].substring(disabledIdsStrings[j].indexOf(":")+1));
disabledIds.add(new DisabledId(gId, gState));
@@ -65,14 +65,14 @@ public final static List createDisabledIdListFromJsonPartResponse(St
}
return disabledIds;
}
-
+
/**
- *
+ *
* @param disabledIdMapJSON
* @return List
* @throws JSONException
*/
- public final static List createListFromJsonObject(JSONObject disabledIdMapJSON) throws JSONException {
+ public final static List createListFromJsonObject(JSONObject disabledIdMapJSON) throws JSONException {
List disabledIds = new ArrayList();
JSONArray disabledNames = disabledIdMapJSON.names();
if(disabledNames!=null) {
@@ -83,13 +83,13 @@ public final static List createListFromJsonObject(JSONObject disable
}
} // if null, then no phones are disabled.
return disabledIds;
- /*
+ /*
if(settingsJSON.has("disabledIdMap")) {
JSONArray lArray;
try {
lArray = settingsJSON.getJSONArray("disabledIdMap");
// JSONArray objectNames = lArray.names();
-
+
for (int i = 0; i < lArray.length(); i++) {
String lId = lArray.getJSONObject(i).getString(i+"");
boolean lDisabled;
@@ -105,34 +105,34 @@ public final static List createListFromJsonObject(JSONObject disable
}
}
-
+
return disabledIds;
*/
}
-
+
/**
- *
+ *
* @param settingsJSON
* @return DisabledId[]
* @throws JSONException
*/
//TODO dotn create list first, direct transform
- public final static DisabledId[] createArrayFromJsonObject(JSONObject settingsJSON) throws JSONException {
+ public final static DisabledId[] createArrayFromJsonObject(JSONObject settingsJSON) throws JSONException {
List tList = createListFromJsonObject(settingsJSON.getJSONObject("disabledIdMap"));
return (DisabledId[]) tList.toArray(new DisabledId[tList.size()]);
}
-
+
/**
* @return "1":true
*/
public String toJson() {
return "\""+id+"\":"+disabled;
}
-
+
public String getId() {
return id;
}
-
+
public int getIdAsInt() {
int ret;
try {
@@ -142,34 +142,34 @@ public int getIdAsInt() {
}
return ret;
}
-
+
public boolean isDisabled() {
return disabled;
}
-
+
public JSONObject toJsonObject(){
JSONObject resultO = new JSONObject();
- try {
+ try {
resultO.accumulate(id, disabled);
} catch (JSONException e) {
return null;
}
-
+
return resultO;
}
-
+
/**
* @param id the id to set
*/
public void setId(String id) {
this.id = id;
}
-
+
/**
* @param disabled the disabled to set
*/
public void setDisabled(boolean disabled) {
this.disabled = disabled;
}
-
+
}
diff --git a/src/com/techventus/server/voice/datatypes/EmailAddress.java b/src/main/java/com/techventus/server/voice/datatypes/EmailAddress.java
similarity index 91%
rename from src/com/techventus/server/voice/datatypes/EmailAddress.java
rename to src/main/java/com/techventus/server/voice/datatypes/EmailAddress.java
index 170bdb7..9277ccb 100644
--- a/src/com/techventus/server/voice/datatypes/EmailAddress.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/EmailAddress.java
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package com.techventus.server.voice.datatypes;
@@ -18,40 +18,40 @@
*/
public class EmailAddress {
String address;
-
+
/**
- *
+ *
* @param pId
*/
public EmailAddress(String pId) {
address = pId;
}
-
+
public String toString() {
- String ret="{address="+address+"}";
+ String ret="{address="+address+"}";
return ret;
}
-
+
/**
- *
+ *
* @param phonesJSON
* @throws JSONException
*/
public EmailAddress(JSONObject phonesJSON) throws JSONException {
if(phonesJSON.has("emailAddresses")) address = phonesJSON.getString("emailAddresses");
}
-
+
/**
- *
+ *
* @param jsonPart
* @return List
*/
- public final static List createEmailAddressListFromJsonPartResponse(String jsonPart) {
+ public final static List createEmailAddressListFromJsonPartResponse(String jsonPart) {
List emailAddresses = new ArrayList();
if(jsonPart!=null &! jsonPart.equals("")) {
jsonPart = jsonPart.replaceAll(",\"", ",#");
String[] emailAddressesStrings = jsonPart.split(Pattern.quote(","));
- for (int j = 0; j < emailAddressesStrings.length; j++) {
+ for (int j = 0; j < emailAddressesStrings.length; j++) {
String gId = ParsingUtil.removeUninterestingParts(emailAddressesStrings[j], "\"", "\"", false);
emailAddresses.add(new EmailAddress(gId));
}
@@ -64,11 +64,11 @@ public String toJson() {
}
/**
- *
+ *
* @param settingsJSON
* @return EmailAddress[]
*/
- public final static EmailAddress[] createArrayFromJsonObject(JSONObject settingsJSON) {
+ public final static EmailAddress[] createArrayFromJsonObject(JSONObject settingsJSON) {
JSONArray addresses;
EmailAddress[] ret;
try {
@@ -87,19 +87,19 @@ public final static EmailAddress[] createArrayFromJsonObject(JSONObject settings
}
return ret;
}
-
+
/**
* @return the address
*/
public String getAddress() {
return address;
}
-
+
/**
* @param address the address to set
*/
public void setAddress(String address) {
this.address = address;
}
-
+
}
diff --git a/src/com/techventus/server/voice/datatypes/Greeting.java b/src/main/java/com/techventus/server/voice/datatypes/Greeting.java
similarity index 91%
rename from src/com/techventus/server/voice/datatypes/Greeting.java
rename to src/main/java/com/techventus/server/voice/datatypes/Greeting.java
index 1fc6b65..a42a7c7 100644
--- a/src/com/techventus/server/voice/datatypes/Greeting.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/Greeting.java
@@ -1,165 +1,165 @@
-package com.techventus.server.voice.datatypes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import com.techventus.server.voice.util.ParsingUtil;
-
-/**
- *
- * TODO Add jobberName
- * @author Tobias Eisentraeger
- *
- */
-public class Greeting implements Comparable {
-
-
- private int id;
- private String name;
- private String jobberName;
-
- public Greeting(int id,String name){
- this.id = id;
- this.name = name;
- this.jobberName = "";
- }
-
- public Greeting(int id,String jobberName, String name){
- this.id = id;
- this.name = name;
- this.jobberName = jobberName;
- }
-
- public String toString(){
- String ret="{id="+id+";";
- ret+="name="+name+",";
- ret+="jobberName="+jobberName+"}";
- return ret;
- }
-
-
- public final static List createGroupSettingsFromJsonResponse(String json) {
- List result = new ArrayList();
- json = ParsingUtil.removeUninterestingParts(json, "\"greetings\":[", "],", false);
- String[] greetingsStrings = json.split(Pattern.quote("},{"));
- // Add System standard greeting
- result.add(new Greeting(0, "System Standard"));
- for (int i = 1; i < greetingsStrings.length; i++) {
- int lId = Integer.parseInt(ParsingUtil.removeUninterestingParts(greetingsStrings[i] , "\"id\":" , ",", false));
- String lName = ParsingUtil.removeUninterestingParts(greetingsStrings[i], "\"name\":\"", "\",\"", false);
- Greeting lGreeting = new Greeting(lId, lName);
- result.add(lGreeting);
- }
- return result;
- }
-
- /*
-"greetings": [
- {
- "id": "0",
- "jobberName": "",
- "name": "System Standard"
- },
- {
- "id": 2,
- "jobberName": "",
- "name": "Testgreeting 1"
- },
- {
- "id": 3,
- "jobberName": "47ee52c084.3.greeting.mulaw",
- "name": "Testgreeting 2"
- }
- ],
- */
- public final static List createListFromJsonObject(JSONObject settingsJSON) {
- List greetingss = new ArrayList();
- if(settingsJSON.has("greetings")) {
- try {
- JSONArray lArray = (JSONArray) settingsJSON.getJSONArray("greetings");
- for (int i = 0; i < lArray.length(); i++) {
- int lId = lArray.getJSONObject(i).getInt("id");
- String lJobberName = lArray.getJSONObject(i).getString("jobberName");
- String lName = lArray.getJSONObject(i).getString("name");
- greetingss.add(new Greeting(lId,lJobberName,lName));
- }
- } catch (JSONException e1) {
- // Nothing - will return empty List at exception
- }
-
- }
-
- return greetingss;
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the jobberName
- */
- public String getJobberName() {
- return jobberName;
- }
-
-
- /**
- * @param id the id to set
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @param jobberName the jobberName to set
- */
- public void setJobberName(String jobberName) {
- this.jobberName = jobberName;
- }
-
- //TODO dotn create list first, direct transform
- public final static Greeting[] createArrayFromJsonObject(JSONObject settingsJSON) {
- List tList = createListFromJsonObject(settingsJSON);
- return (Greeting[]) tList.toArray(new Greeting[tList.size()]);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- @Override
- public int compareTo(Greeting o) {
- if( id < (o.getId() ))
- return -1;
- if( id > (o.getId() ))
- return 1;
-
- return 0;
- }
-
-
-
-
-}
+package com.techventus.server.voice.datatypes;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import com.techventus.server.voice.util.ParsingUtil;
+
+/**
+ *
+ * TODO Add jobberName
+ * @author Tobias Eisentraeger
+ *
+ */
+public class Greeting implements Comparable {
+
+
+ private int id;
+ private String name;
+ private String jobberName;
+
+ public Greeting(int id,String name){
+ this.id = id;
+ this.name = name;
+ this.jobberName = "";
+ }
+
+ public Greeting(int id,String jobberName, String name){
+ this.id = id;
+ this.name = name;
+ this.jobberName = jobberName;
+ }
+
+ public String toString(){
+ String ret="{id="+id+";";
+ ret+="name="+name+",";
+ ret+="jobberName="+jobberName+"}";
+ return ret;
+ }
+
+
+ public final static List createGroupSettingsFromJsonResponse(String json) {
+ List result = new ArrayList();
+ json = ParsingUtil.removeUninterestingParts(json, "\"greetings\":[", "],", false);
+ String[] greetingsStrings = json.split(Pattern.quote("},{"));
+ // Add System standard greeting
+ result.add(new Greeting(0, "System Standard"));
+ for (int i = 1; i < greetingsStrings.length; i++) {
+ int lId = Integer.parseInt(ParsingUtil.removeUninterestingParts(greetingsStrings[i] , "\"id\":" , ",", false));
+ String lName = ParsingUtil.removeUninterestingParts(greetingsStrings[i], "\"name\":\"", "\",\"", false);
+ Greeting lGreeting = new Greeting(lId, lName);
+ result.add(lGreeting);
+ }
+ return result;
+ }
+
+ /*
+"greetings": [
+ {
+ "id": "0",
+ "jobberName": "",
+ "name": "System Standard"
+ },
+ {
+ "id": 2,
+ "jobberName": "",
+ "name": "Testgreeting 1"
+ },
+ {
+ "id": 3,
+ "jobberName": "47ee52c084.3.greeting.mulaw",
+ "name": "Testgreeting 2"
+ }
+ ],
+ */
+ public final static List createListFromJsonObject(JSONObject settingsJSON) {
+ List greetingss = new ArrayList();
+ if(settingsJSON.has("greetings")) {
+ try {
+ JSONArray lArray = (JSONArray) settingsJSON.getJSONArray("greetings");
+ for (int i = 0; i < lArray.length(); i++) {
+ int lId = lArray.getJSONObject(i).getInt("id");
+ String lJobberName = lArray.getJSONObject(i).getString("jobberName");
+ String lName = lArray.getJSONObject(i).getString("name");
+ greetingss.add(new Greeting(lId,lJobberName,lName));
+ }
+ } catch (JSONException e1) {
+ // Nothing - will return empty List at exception
+ }
+
+ }
+
+ return greetingss;
+ }
+
+ /**
+ * @return the id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the jobberName
+ */
+ public String getJobberName() {
+ return jobberName;
+ }
+
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @param jobberName the jobberName to set
+ */
+ public void setJobberName(String jobberName) {
+ this.jobberName = jobberName;
+ }
+
+ //TODO dotn create list first, direct transform
+ public final static Greeting[] createArrayFromJsonObject(JSONObject settingsJSON) {
+ List tList = createListFromJsonObject(settingsJSON);
+ return (Greeting[]) tList.toArray(new Greeting[tList.size()]);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ @Override
+ public int compareTo(Greeting o) {
+ if( id < (o.getId() ))
+ return -1;
+ if( id > (o.getId() ))
+ return 1;
+
+ return 0;
+ }
+
+
+
+
+}
diff --git a/src/com/techventus/server/voice/datatypes/Group.java b/src/main/java/com/techventus/server/voice/datatypes/Group.java
similarity index 88%
rename from src/com/techventus/server/voice/datatypes/Group.java
rename to src/main/java/com/techventus/server/voice/datatypes/Group.java
index e413c8e..cada1f4 100644
--- a/src/com/techventus/server/voice/datatypes/Group.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/Group.java
@@ -1,381 +1,381 @@
-package com.techventus.server.voice.datatypes;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import com.techventus.server.voice.util.ParsingUtil;
-
-/**
- *
- *
- * @author Tobias Eisentraeger
- *
- */
-public class Group {
-
- private boolean saveMode = true;
- private String id;
- private String name;
- private boolean isCustomForwarding;
- private List disabledForwardingIds;
- private DisabledForwardingId[] disabledForwardingIdsNeu;
- private boolean isCustomDirectConnect;
- private boolean directConnect;
- private boolean isCustomGreeting;
- private int greetingId;
-
- public Group(String id, String name, boolean isCustomForwarding,
- List disabledForwardingIds,
- boolean isCustomDirectConnect, boolean directConnect,
- boolean isCustomGreeting, int greetingId) {
- super();
- this.id = id;
- this.name = name;
- this.isCustomForwarding = isCustomForwarding;
- this.disabledForwardingIds = disabledForwardingIds;
- this.isCustomDirectConnect = isCustomDirectConnect;
- this.directConnect = directConnect;
- this.isCustomGreeting = isCustomGreeting;
- this.greetingId = greetingId;
- }
-
- public Group(String id, String name, boolean isCustomForwarding,
- DisabledForwardingId[] disabledForwardingIdsNeu,
- boolean isCustomDirectConnect, boolean directConnect,
- boolean isCustomGreeting, int greetingId) {
- super();
- this.id = id;
- this.name = name;
- this.isCustomForwarding = isCustomForwarding;
- this.disabledForwardingIdsNeu = disabledForwardingIdsNeu;
- this.isCustomDirectConnect = isCustomDirectConnect;
- this.directConnect = directConnect;
- this.isCustomGreeting = isCustomGreeting;
- this.greetingId = greetingId;
- }
-
- /**
- * @param jsonObject
- * @throws JSONException
- */
- public Group(JSONObject jsonObject) throws JSONException {
- if(!saveMode || saveMode && jsonObject.has("id")) id = jsonObject.getString("id");
- if(!saveMode || saveMode && jsonObject.has("name")) name = jsonObject.getString("name");
- if(!saveMode || saveMode && jsonObject.has("isCustomForwarding")) isCustomForwarding = jsonObject.getBoolean("isCustomForwarding");
- if(!saveMode || saveMode && jsonObject.has("isCustomGreeting")) isCustomGreeting = jsonObject.getBoolean("isCustomGreeting");
- if(!saveMode || saveMode && jsonObject.has("isCustomDirectConnect")) isCustomDirectConnect = jsonObject.getBoolean("isCustomDirectConnect");
- if(!saveMode || saveMode && jsonObject.has("directConnect")) directConnect = jsonObject.getBoolean("directConnect");
- if(!saveMode || saveMode && jsonObject.has("greetingId")) greetingId = jsonObject.getInt("greetingId");
- if(!saveMode || saveMode && jsonObject.has("disabledForwardingIds")) {
- JSONObject disabledForwardingIdsObject = jsonObject.getJSONObject("disabledForwardingIds");
- disabledForwardingIds = DisabledForwardingId.createDisabledForwardingIdListFromJsonPartResponse(disabledForwardingIdsObject.toString());
- }
- }
-
- /**
- * Constructs an Object from the json Resonse
- * @param json
- */
- public final static List createGroupSettingsFromJsonResponse(String json) {
- List result = new ArrayList();
-
- json = ParsingUtil.removeUninterestingParts(json, "\"groups\":{", ",\"groupList\"", false);
- json = json.replaceAll("\\},\"isCustomForwarding\"", "!,\"isCustomForwarding\"");
-
- String[] groupsStrings = json.split(Pattern.quote("},"));
-
- for (int i = 0; i < groupsStrings.length; i++) {
- String id = ParsingUtil.removeUninterestingParts(groupsStrings[i] , "\"id\":\"" , "\"", false);
- String name = ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"name\":\"", "\",\"", false);
- boolean isCustomForwarding = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomForwarding\":", ",", false));
- boolean isCustomGreeting = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomGreeting\":", ",", false));
- boolean isCustomDirectConnect = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomDirectConnect\":", ",", false));
- boolean directConnect = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"directConnect\":", ",", false));
- int greetingId = Integer.parseInt(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"greetingId\":", ",", false));
- String disabledForwardingIdsStr = ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"disabledForwardingIds\":{", "!,\"", false);
-
- List disabledForwardingIds = new ArrayList();
- if(disabledForwardingIdsStr!=null &! disabledForwardingIdsStr.equals("")) {
- disabledForwardingIds = DisabledForwardingId.createDisabledForwardingIdListFromJsonPartResponse(disabledForwardingIdsStr);
- }
-
- result.add(new Group(id, name, isCustomForwarding, disabledForwardingIds, isCustomDirectConnect, directConnect, isCustomGreeting, greetingId));
- }
-
- return result;
-
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString(){
- String ret="{id="+id+";";
- ret+="name="+name+";";
- ret+="isCustomDirectConnect="+isCustomDirectConnect+";";
- ret+="directConnect="+directConnect+";";
- ret+="isCustomGreeting="+isCustomGreeting+";";
- ret+="isCustomForwarding="+isCustomForwarding+";";
- ret+="greetingId="+greetingId+";";
- ret+="disabledForwardingIds="+disabledForwardingIds+"}";
- return ret;
- }
- public String toJson(){
- return toJsonObject().toString();
- }
-
- public JSONObject toJsonObject(){
- JSONObject resultO = new JSONObject();
- try {
- resultO.putOpt("id", id);
- resultO.putOpt("name", name);
- resultO.putOpt("isCustomForwarding", isCustomForwarding);
- resultO.accumulate("disabledForwardingIds", DisabledForwardingId.arrayToJsonObject(disabledForwardingIds));
- resultO.putOpt("isCustomDirectConnect", isCustomDirectConnect);
- resultO.putOpt("directConnect", directConnect);
- resultO.putOpt("greetingId", greetingId);
- resultO.putOpt("isCustomGreeting", isCustomGreeting);
- } catch (JSONException e) {
- return null;
- }
-
- return resultO;
- }
- /*
- public String toJson(){
- String ret = "\""+id+"\":{";
- ret+="\"id\":\""+id+"\",";
- ret+="\"name\":\""+name+"\",";
- ret+="\"disabledForwardingIds\":{";
- for (Iterator iterator = disabledForwardingIds.iterator(); iterator.hasNext();) {
- DisabledForwardingId element = (DisabledForwardingId) iterator.next();
- ret+=element.toJson();
- if(iterator.hasNext()) {
- ret+=",";
- }
- }
- ret+="},";
- ret+="\"isCustomForwarding\":"+isCustomForwarding+",";
- ret+="\"isCustomGreeting\":"+isCustomGreeting+",";
- ret+="\"isCustomDirectConnect\":"+isCustomDirectConnect+",";
- ret+="\"directConnect\":"+directConnect+",";
- ret+="\"greetingId\":"+greetingId+"}";
- return ret;
- }
- */
- /**
- * Creates a complete json of a list of Group
- * "groups":{"15":{..details of group id 15..},"12":{..details of group id 12..}}
- *
- * @param pGroupSettings the group settings
- * @return the JSON string
- */
- public static String listToJson(List pGroupSettings) {
- String ret = "\"groups\":{";
- for (Iterator iterator = pGroupSettings.iterator(); iterator.hasNext();) {
- Group setting = (Group) iterator.next();
- String id = ParsingUtil.removeUninterestingParts(setting.toString(), "{id=", ";name", false);
- ret+= "\"" + id + "\":" + setting.toJson();
- if(iterator.hasNext()) {
- ret+=",";
- }
- }
- ret+="}";
- return ret;
- }
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the isCustomForwarding - Call Presentation
- */
- public boolean isCustomForwarding() {
- return isCustomForwarding;
- }
-
- /**
- * @return the disabledForwardingIds
- */
- public List getDisabledForwardingIds() {
- return disabledForwardingIds;
- }
-
- /**
- * @return the isCustomDirectConnect
- */
- public boolean isCustomDirectConnect() {
- return isCustomDirectConnect;
- }
-
- /**
- * @return the directConnect
- */
- public boolean isDirectConnect() {
- return directConnect;
- }
-
- /**
- * @return the isCustomGreeting
- */
- public boolean isCustomGreeting() {
- return isCustomGreeting;
- }
-
-
-
- /**
- * @return the greetingId
- */
- public int getGreetingId() {
- return greetingId;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @param isCustomForwarding the isCustomForwarding to set
- */
- public void setCustomForwarding(boolean isCustomForwarding) {
- this.isCustomForwarding = isCustomForwarding;
- }
-
- /**
- * @param disabledForwardingIds the disabledForwardingIds to set
- */
- public void setDisabledForwardingIds(
- List disabledForwardingIds) {
- this.disabledForwardingIds = disabledForwardingIds;
- }
-
- /**
- * @param isCustomDirectConnect the isCustomDirectConnect to set
- */
- public void setCustomDirectConnect(boolean isCustomDirectConnect) {
- this.isCustomDirectConnect = isCustomDirectConnect;
- }
-
- /**
- * @param directConnect the directConnect to set
- */
- public void setDirectConnect(boolean directConnect) {
- this.directConnect = directConnect;
- }
-
- /**
- * @param isCustomGreeting the isCustomGreeting to set
- */
- public void setCustomGreeting(boolean isCustomGreeting) {
- this.isCustomGreeting = isCustomGreeting;
- }
-
- /**
- * @param greetingId the greetingId to set
- */
- public void setGreetingId(int greetingId) {
- this.greetingId = greetingId;
- }
-
-
- //TODO dotn create list first, direct transform
- public final static Group[] createArrayFromJsonObject(JSONObject groupsJSON) throws JSONException {
- JSONArray groupNames = groupsJSON.names();
- Group[] result = new Group[groupsJSON.length()];
- for (int i = 0; i < groupNames.length(); i++) {
- result[i] = new Group(groupsJSON.getJSONObject(groupNames.getString(i)));
- }
- return result;
- }
-
- public final static JSONObject[] createJSONObjectArrayFromJsonObject(JSONObject settingsJSON) throws JSONException {
- Group[] lGroupsArray = Group.createArrayFromJsonObject(settingsJSON);
- JSONObject[] result = new JSONObject[lGroupsArray.length];
- for (int i = 0; i < lGroupsArray.length; i++) {
- result[i] = new JSONObject();
- result[i].put(lGroupsArray[i].getId(), lGroupsArray[i]);
- }
- return result;
- }
-
- public final static JSONObject createJSONObjectFromJsonObject(JSONObject settingsJSON) throws JSONException {
- Group[] lGroupsArray = Group.createArrayFromJsonObject(settingsJSON);
- JSONObject result = new JSONObject();
- for (int i = 0; i < lGroupsArray.length; i++) {
- result = new JSONObject();
- result.put(lGroupsArray[i].getId(), lGroupsArray[i]);
- }
- return result;
- }
-
- /**
- * Groups array to json object.
- *
- * @param groups the groups
- * @return the object
- * @throws JSONException the jSON exception
- */
- public static Object groupsArrayToJsonObject(Group[] groups) throws JSONException {
- JSONObject groupO = new JSONObject();
- for (int i = 0; i < groups.length; i++) {
- groupO.put(groups[i].getId()+"",groups[i].toJsonObject());
- }
- return groupO;
- }
-
- /**
- * Query disabled status - if id not found, then it returns false, which means enabled.
- *
- * @param phoneId the phone id
- * @return true, if is phone disabled
- */
- public boolean isPhoneDisabled(int phoneId) {
- boolean ret = false;
- try {
- if(disabledForwardingIds!=null) {
- for (int i = 0; i < disabledForwardingIds.size(); i++) {
- if(disabledForwardingIds.get(i).getId().equals(phoneId+"")) {
- ret = true;
- }
- }
- } else {
- // list is null, so we return false
- ret = false;
- }
- } catch (NullPointerException e) {
- ret = false;
- }
- return ret;
- }
-
-}
+package com.techventus.server.voice.datatypes;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import com.techventus.server.voice.util.ParsingUtil;
+
+/**
+ *
+ *
+ * @author Tobias Eisentraeger
+ *
+ */
+public class Group {
+
+ private boolean saveMode = true;
+ private String id;
+ private String name;
+ private boolean isCustomForwarding;
+ private List disabledForwardingIds;
+ private DisabledForwardingId[] disabledForwardingIdsNeu;
+ private boolean isCustomDirectConnect;
+ private boolean directConnect;
+ private boolean isCustomGreeting;
+ private int greetingId;
+
+ public Group(String id, String name, boolean isCustomForwarding,
+ List disabledForwardingIds,
+ boolean isCustomDirectConnect, boolean directConnect,
+ boolean isCustomGreeting, int greetingId) {
+ super();
+ this.id = id;
+ this.name = name;
+ this.isCustomForwarding = isCustomForwarding;
+ this.disabledForwardingIds = disabledForwardingIds;
+ this.isCustomDirectConnect = isCustomDirectConnect;
+ this.directConnect = directConnect;
+ this.isCustomGreeting = isCustomGreeting;
+ this.greetingId = greetingId;
+ }
+
+ public Group(String id, String name, boolean isCustomForwarding,
+ DisabledForwardingId[] disabledForwardingIdsNeu,
+ boolean isCustomDirectConnect, boolean directConnect,
+ boolean isCustomGreeting, int greetingId) {
+ super();
+ this.id = id;
+ this.name = name;
+ this.isCustomForwarding = isCustomForwarding;
+ this.disabledForwardingIdsNeu = disabledForwardingIdsNeu;
+ this.isCustomDirectConnect = isCustomDirectConnect;
+ this.directConnect = directConnect;
+ this.isCustomGreeting = isCustomGreeting;
+ this.greetingId = greetingId;
+ }
+
+ /**
+ * @param jsonObject
+ * @throws JSONException
+ */
+ public Group(JSONObject jsonObject) throws JSONException {
+ if(!saveMode || saveMode && jsonObject.has("id")) id = jsonObject.getString("id");
+ if(!saveMode || saveMode && jsonObject.has("name")) name = jsonObject.getString("name");
+ if(!saveMode || saveMode && jsonObject.has("isCustomForwarding")) isCustomForwarding = jsonObject.getBoolean("isCustomForwarding");
+ if(!saveMode || saveMode && jsonObject.has("isCustomGreeting")) isCustomGreeting = jsonObject.getBoolean("isCustomGreeting");
+ if(!saveMode || saveMode && jsonObject.has("isCustomDirectConnect")) isCustomDirectConnect = jsonObject.getBoolean("isCustomDirectConnect");
+ if(!saveMode || saveMode && jsonObject.has("directConnect")) directConnect = jsonObject.getBoolean("directConnect");
+ if(!saveMode || saveMode && jsonObject.has("greetingId")) greetingId = jsonObject.getInt("greetingId");
+ if(!saveMode || saveMode && jsonObject.has("disabledForwardingIds")) {
+ JSONObject disabledForwardingIdsObject = jsonObject.getJSONObject("disabledForwardingIds");
+ disabledForwardingIds = DisabledForwardingId.createDisabledForwardingIdListFromJsonPartResponse(disabledForwardingIdsObject.toString());
+ }
+ }
+
+ /**
+ * Constructs an Object from the json Resonse
+ * @param json
+ */
+ public final static List createGroupSettingsFromJsonResponse(String json) {
+ List result = new ArrayList();
+
+ json = ParsingUtil.removeUninterestingParts(json, "\"groups\":{", ",\"groupList\"", false);
+ json = json.replaceAll("\\},\"isCustomForwarding\"", "!,\"isCustomForwarding\"");
+
+ String[] groupsStrings = json.split(Pattern.quote("},"));
+
+ for (int i = 0; i < groupsStrings.length; i++) {
+ String id = ParsingUtil.removeUninterestingParts(groupsStrings[i] , "\"id\":\"" , "\"", false);
+ String name = ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"name\":\"", "\",\"", false);
+ boolean isCustomForwarding = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomForwarding\":", ",", false));
+ boolean isCustomGreeting = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomGreeting\":", ",", false));
+ boolean isCustomDirectConnect = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"isCustomDirectConnect\":", ",", false));
+ boolean directConnect = Boolean.parseBoolean(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"directConnect\":", ",", false));
+ int greetingId = Integer.parseInt(ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"greetingId\":", ",", false));
+ String disabledForwardingIdsStr = ParsingUtil.removeUninterestingParts(groupsStrings[i], "\"disabledForwardingIds\":{", "!,\"", false);
+
+ List disabledForwardingIds = new ArrayList();
+ if(disabledForwardingIdsStr!=null &! disabledForwardingIdsStr.equals("")) {
+ disabledForwardingIds = DisabledForwardingId.createDisabledForwardingIdListFromJsonPartResponse(disabledForwardingIdsStr);
+ }
+
+ result.add(new Group(id, name, isCustomForwarding, disabledForwardingIds, isCustomDirectConnect, directConnect, isCustomGreeting, greetingId));
+ }
+
+ return result;
+
+ }
+
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString(){
+ String ret="{id="+id+";";
+ ret+="name="+name+";";
+ ret+="isCustomDirectConnect="+isCustomDirectConnect+";";
+ ret+="directConnect="+directConnect+";";
+ ret+="isCustomGreeting="+isCustomGreeting+";";
+ ret+="isCustomForwarding="+isCustomForwarding+";";
+ ret+="greetingId="+greetingId+";";
+ ret+="disabledForwardingIds="+disabledForwardingIds+"}";
+ return ret;
+ }
+ public String toJson(){
+ return toJsonObject().toString();
+ }
+
+ public JSONObject toJsonObject(){
+ JSONObject resultO = new JSONObject();
+ try {
+ resultO.putOpt("id", id);
+ resultO.putOpt("name", name);
+ resultO.putOpt("isCustomForwarding", isCustomForwarding);
+ resultO.accumulate("disabledForwardingIds", DisabledForwardingId.arrayToJsonObject(disabledForwardingIds));
+ resultO.putOpt("isCustomDirectConnect", isCustomDirectConnect);
+ resultO.putOpt("directConnect", directConnect);
+ resultO.putOpt("greetingId", greetingId);
+ resultO.putOpt("isCustomGreeting", isCustomGreeting);
+ } catch (JSONException e) {
+ return null;
+ }
+
+ return resultO;
+ }
+ /*
+ public String toJson(){
+ String ret = "\""+id+"\":{";
+ ret+="\"id\":\""+id+"\",";
+ ret+="\"name\":\""+name+"\",";
+ ret+="\"disabledForwardingIds\":{";
+ for (Iterator iterator = disabledForwardingIds.iterator(); iterator.hasNext();) {
+ DisabledForwardingId element = (DisabledForwardingId) iterator.next();
+ ret+=element.toJson();
+ if(iterator.hasNext()) {
+ ret+=",";
+ }
+ }
+ ret+="},";
+ ret+="\"isCustomForwarding\":"+isCustomForwarding+",";
+ ret+="\"isCustomGreeting\":"+isCustomGreeting+",";
+ ret+="\"isCustomDirectConnect\":"+isCustomDirectConnect+",";
+ ret+="\"directConnect\":"+directConnect+",";
+ ret+="\"greetingId\":"+greetingId+"}";
+ return ret;
+ }
+ */
+ /**
+ * Creates a complete json of a list of Group
+ * "groups":{"15":{..details of group id 15..},"12":{..details of group id 12..}}
+ *
+ * @param pGroupSettings the group settings
+ * @return the JSON string
+ */
+ public static String listToJson(List pGroupSettings) {
+ String ret = "\"groups\":{";
+ for (Iterator iterator = pGroupSettings.iterator(); iterator.hasNext();) {
+ Group setting = (Group) iterator.next();
+ String id = ParsingUtil.removeUninterestingParts(setting.toString(), "{id=", ";name", false);
+ ret+= "\"" + id + "\":" + setting.toJson();
+ if(iterator.hasNext()) {
+ ret+=",";
+ }
+ }
+ ret+="}";
+ return ret;
+ }
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the isCustomForwarding - Call Presentation
+ */
+ public boolean isCustomForwarding() {
+ return isCustomForwarding;
+ }
+
+ /**
+ * @return the disabledForwardingIds
+ */
+ public List getDisabledForwardingIds() {
+ return disabledForwardingIds;
+ }
+
+ /**
+ * @return the isCustomDirectConnect
+ */
+ public boolean isCustomDirectConnect() {
+ return isCustomDirectConnect;
+ }
+
+ /**
+ * @return the directConnect
+ */
+ public boolean isDirectConnect() {
+ return directConnect;
+ }
+
+ /**
+ * @return the isCustomGreeting
+ */
+ public boolean isCustomGreeting() {
+ return isCustomGreeting;
+ }
+
+
+
+ /**
+ * @return the greetingId
+ */
+ public int getGreetingId() {
+ return greetingId;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @param isCustomForwarding the isCustomForwarding to set
+ */
+ public void setCustomForwarding(boolean isCustomForwarding) {
+ this.isCustomForwarding = isCustomForwarding;
+ }
+
+ /**
+ * @param disabledForwardingIds the disabledForwardingIds to set
+ */
+ public void setDisabledForwardingIds(
+ List disabledForwardingIds) {
+ this.disabledForwardingIds = disabledForwardingIds;
+ }
+
+ /**
+ * @param isCustomDirectConnect the isCustomDirectConnect to set
+ */
+ public void setCustomDirectConnect(boolean isCustomDirectConnect) {
+ this.isCustomDirectConnect = isCustomDirectConnect;
+ }
+
+ /**
+ * @param directConnect the directConnect to set
+ */
+ public void setDirectConnect(boolean directConnect) {
+ this.directConnect = directConnect;
+ }
+
+ /**
+ * @param isCustomGreeting the isCustomGreeting to set
+ */
+ public void setCustomGreeting(boolean isCustomGreeting) {
+ this.isCustomGreeting = isCustomGreeting;
+ }
+
+ /**
+ * @param greetingId the greetingId to set
+ */
+ public void setGreetingId(int greetingId) {
+ this.greetingId = greetingId;
+ }
+
+
+ //TODO dotn create list first, direct transform
+ public final static Group[] createArrayFromJsonObject(JSONObject groupsJSON) throws JSONException {
+ JSONArray groupNames = groupsJSON.names();
+ Group[] result = new Group[groupsJSON.length()];
+ for (int i = 0; i < groupNames.length(); i++) {
+ result[i] = new Group(groupsJSON.getJSONObject(groupNames.getString(i)));
+ }
+ return result;
+ }
+
+ public final static JSONObject[] createJSONObjectArrayFromJsonObject(JSONObject settingsJSON) throws JSONException {
+ Group[] lGroupsArray = Group.createArrayFromJsonObject(settingsJSON);
+ JSONObject[] result = new JSONObject[lGroupsArray.length];
+ for (int i = 0; i < lGroupsArray.length; i++) {
+ result[i] = new JSONObject();
+ result[i].put(lGroupsArray[i].getId(), lGroupsArray[i]);
+ }
+ return result;
+ }
+
+ public final static JSONObject createJSONObjectFromJsonObject(JSONObject settingsJSON) throws JSONException {
+ Group[] lGroupsArray = Group.createArrayFromJsonObject(settingsJSON);
+ JSONObject result = new JSONObject();
+ for (int i = 0; i < lGroupsArray.length; i++) {
+ result = new JSONObject();
+ result.put(lGroupsArray[i].getId(), lGroupsArray[i]);
+ }
+ return result;
+ }
+
+ /**
+ * Groups array to json object.
+ *
+ * @param groups the groups
+ * @return the object
+ * @throws JSONException the jSON exception
+ */
+ public static Object groupsArrayToJsonObject(Group[] groups) throws JSONException {
+ JSONObject groupO = new JSONObject();
+ for (int i = 0; i < groups.length; i++) {
+ groupO.put(groups[i].getId()+"",groups[i].toJsonObject());
+ }
+ return groupO;
+ }
+
+ /**
+ * Query disabled status - if id not found, then it returns false, which means enabled.
+ *
+ * @param phoneId the phone id
+ * @return true, if is phone disabled
+ */
+ public boolean isPhoneDisabled(int phoneId) {
+ boolean ret = false;
+ try {
+ if(disabledForwardingIds!=null) {
+ for (int i = 0; i < disabledForwardingIds.size(); i++) {
+ if(disabledForwardingIds.get(i).getId().equals(phoneId+"")) {
+ ret = true;
+ }
+ }
+ } else {
+ // list is null, so we return false
+ ret = false;
+ }
+ } catch (NullPointerException e) {
+ ret = false;
+ }
+ return ret;
+ }
+
+}
diff --git a/src/com/techventus/server/voice/datatypes/Phone.java b/src/main/java/com/techventus/server/voice/datatypes/Phone.java
similarity index 60%
rename from src/com/techventus/server/voice/datatypes/Phone.java
rename to src/main/java/com/techventus/server/voice/datatypes/Phone.java
index a7ee7c0..bfd661d 100644
--- a/src/com/techventus/server/voice/datatypes/Phone.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/Phone.java
@@ -1,559 +1,559 @@
-
-package com.techventus.server.voice.datatypes;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import com.techventus.server.voice.util.ParsingUtil;
-
-public class Phone implements Comparable{
- //TODO - implement
-
- private boolean saveMode;
-
- private boolean active;
- private int behaviorOnRedirect;
- private String carrier;
- private int customOverrideState;
- private boolean dEPRECATEDDisabled;
- private boolean enabledForOthers;
- private String formattedNumber;
- private int id;
- private String incomingAccessNumber;
- private String name;
- private String phoneNumber;
- private int policyBitmask;
- private boolean redirectToVoicemail;
- private boolean scheduleSet;
- private boolean smsEnabled;
- private boolean telephonyVerified;
- private int type;
- private boolean verified;
- private boolean voicemailForwardingVerified;
- private Wd wd; //TODO
- private We we; //TODO
- private boolean weekdayAllDay;
- private String[] weekdayTimes;
- private boolean weekendAllDay;
- private String[] weekendTimes;
-
- public Phone(int id, String name, String phoneNumber) {
- this.id = id;
- this.name = name;
- this.phoneNumber = phoneNumber;
- }
-
- /**
- *
- * saveMode is off
- *
- * @param phonesJSON
- *
- */
- public Phone(JSONObject phonesJSON) throws JSONException {
- this(phonesJSON, false);
- }
-
- /**
- * Instantiates a new Phone Object.
- *
- * @param phonesJSON the JSON representation of the Phone object
- * @param pSaveMode the Save Mode boolean
- * @throws JSONException the JSONException
- */
- public Phone(JSONObject phonesJSON, boolean pSaveMode) throws JSONException {
- if(!saveMode || (saveMode && phonesJSON.has("id")) ) id = phonesJSON.getInt("id");
- if(!saveMode || (saveMode && phonesJSON.has("name")) ) name = phonesJSON.getString("name");
- if(!saveMode || (saveMode && phonesJSON.has("phoneNumber")) ) phoneNumber = phonesJSON.getString("phoneNumber");
- if(!saveMode || (saveMode && phonesJSON.has("active")) ) active = phonesJSON.getBoolean("active");
- if(!saveMode || (saveMode && phonesJSON.has("behaviorOnRedirect")) ) behaviorOnRedirect = phonesJSON.getInt("behaviorOnRedirect");
- if(!saveMode || (saveMode && phonesJSON.has("carrier")) ) carrier = phonesJSON.getString("carrier");
- if(!saveMode || (saveMode && phonesJSON.has("customOverrideState")) ) customOverrideState = phonesJSON.getInt("customOverrideState");
- if(!saveMode || (saveMode && phonesJSON.has("dEPRECATEDDisabled")) ) dEPRECATEDDisabled = phonesJSON.getBoolean("dEPRECATEDDisabled");
- if(!saveMode || (saveMode && phonesJSON.has("enabledForOthers")) ) enabledForOthers = phonesJSON.getBoolean("enabledForOthers");
- if(!saveMode || (saveMode && phonesJSON.has("formattedNumber")) ) formattedNumber = phonesJSON.getString("formattedNumber");
- if(!saveMode || (saveMode && phonesJSON.has("incomingAccessNumber")) ) incomingAccessNumber = phonesJSON.getString("incomingAccessNumber");
- if(!saveMode || (saveMode && phonesJSON.has("phoneNumber")) ) phoneNumber = phonesJSON.getString("phoneNumber");
- if(!saveMode || (saveMode && phonesJSON.has("policyBitmask")) ) policyBitmask = phonesJSON.getInt("policyBitmask");
- if(!saveMode || (saveMode && phonesJSON.has("redirectToVoicemail")) ) redirectToVoicemail = phonesJSON.getBoolean("redirectToVoicemail");
- if(!saveMode || (saveMode && phonesJSON.has("scheduleSet")) ) {
- try {
- // if not set, this value is "false", but if active it's 1 !! - this is not true... maybe
- scheduleSet = phonesJSON.getBoolean("scheduleSet");
- } catch (JSONException jsE) {
-// int positive = phonesJSON.getInt("scheduleSet");
-// if(positive==1) scheduleSet = true;
- // we will just set false on error
- scheduleSet = false;
- }
- }
- if(!saveMode || (saveMode && phonesJSON.has("smsEnabled")) ) smsEnabled = phonesJSON.getBoolean("smsEnabled");
- if(!saveMode || (saveMode && phonesJSON.has("telephonyVerified")) ) telephonyVerified = phonesJSON.getBoolean("telephonyVerified");
- if(!saveMode || (saveMode && phonesJSON.has("type")) ) type = phonesJSON.getInt("type");
- if(!saveMode || (saveMode && phonesJSON.has("verified")) ) verified = phonesJSON.getBoolean("verified");
- if(!saveMode || (saveMode && phonesJSON.has("voicemailForwardingVerified")) ) voicemailForwardingVerified = phonesJSON.getBoolean("voicemailForwardingVerified");
-// if(!saveMode || (saveMode && phonesJSON.has("wd")) ) wd = phonesJSON.getInt("id"); //TODO
-// if(!saveMode || (saveMode && phonesJSON.has("we")) ) wd = phonesJSON.getInt("id"); //TODO
- if(!saveMode || (saveMode && phonesJSON.has("weekdayAllDay")) ) weekdayAllDay = phonesJSON.getBoolean("weekdayAllDay");
- if(!saveMode || (saveMode && phonesJSON.has("weekdayTimes")) ) weekdayTimes = ParsingUtil.jsonStringArrayToStringArray(phonesJSON.getJSONArray("weekdayTimes"));//Type correct??
- if(!saveMode || (saveMode && phonesJSON.has("weekendAllDay")) ) weekendAllDay = phonesJSON.getBoolean("weekendAllDay");
- if(!saveMode || (saveMode && phonesJSON.has("weekendTimes")) ) weekendTimes = ParsingUtil.jsonStringArrayToStringArray(phonesJSON.getJSONArray("weekendTimes"));//Type correct??
- }
-
- public static final Phone[] createArrayFromJsonObject(JSONObject phonesJSON) throws JSONException {
- JSONArray phoneNames = phonesJSON.names();
- Phone[] result = new Phone[phoneNames.length()];
- for (int i = 0; i < phoneNames.length(); i++) {
- result[i] = new Phone(phonesJSON.getJSONObject(phoneNames.getString(i)));
- }
- return result;
- }
-
- /**
- * Make a JSON text of the Settings. For compactness, no whitespace
- * is added. If this would not result in a syntactically correct JSON text,
- * then null will be returned instead.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return a printable, displayable, portable, transmittable
- * representation of the object, beginning
- * with { (left brace) and ending
- * with } (right brace).
- */
- public String toJson(){
- return toJsonObject().toString();
- }
-
- public JSONObject toJsonObject(){
- JSONObject resultO = new JSONObject();
- try {
- resultO.putOpt("id", id);
- resultO.putOpt("name", name);
- resultO.putOpt("active", active);
- resultO.putOpt("behaviorOnRedirect", behaviorOnRedirect);
- resultO.putOpt("carrier", carrier);
- resultO.putOpt("customOverrideState", customOverrideState);
- resultO.putOpt("dEPRECATEDDisabled", dEPRECATEDDisabled);
- resultO.putOpt("enabledForOthers", enabledForOthers);
- resultO.putOpt("formattedNumber", formattedNumber);
- resultO.putOpt("id", id);
- resultO.putOpt("incomingAccessNumber", incomingAccessNumber);
- resultO.putOpt("name", name);
- resultO.putOpt("phoneNumber", phoneNumber);
- resultO.putOpt("policyBitmask", policyBitmask);
- resultO.putOpt("redirectToVoicemail", redirectToVoicemail);
- //Google json expects false or 1 - not anymore
-// if(scheduleSet) {
-// resultO.putOpt("scheduleSet", 1);
-// } else {
-// resultO.putOpt("scheduleSet", false);
-// }
- resultO.putOpt("scheduleSet", scheduleSet);
- resultO.putOpt("smsEnabled", smsEnabled);
- resultO.putOpt("telephonyVerified", telephonyVerified);
- resultO.putOpt("type", type);
- resultO.putOpt("verified", verified);
- resultO.putOpt("voicemailForwardingVerified", voicemailForwardingVerified);
-// private Wd wd", ); //TODO
-// private We we", ); //TODO
- resultO.putOpt("weekdayAllDay", weekdayAllDay);
- resultO.putOpt("weekdayTimes", weekdayTimes);//Type correct??
- resultO.putOpt("weekendAllDay", weekendAllDay);
- resultO.putOpt("weekendTimes", weekendTimes);//Type correct??
- } catch (JSONException e) {
- return null;
- }
-
- return resultO;
- }
-
- /**
- * @param phones
- * @return Json Object
- * @throws JSONException
- */
- public static Object phonesArrayToJsonObject(Phone[] phones) throws JSONException {
- JSONObject phoneO = new JSONObject();
- for (int i = 0; i < phones.length; i++) {
- phoneO.accumulate(phones[i].getId()+"",phones[i].toJsonObject());
- }
- return phoneO;
- }
-
- /**
- * @return the active
- */
- public boolean isActive() {
- return active;
- }
-
- /**
- * @return the behaviorOnRedirect
- */
- public int getBehaviorOnRedirect() {
- return behaviorOnRedirect;
- }
-
- /**
- * @return the carrier
- */
- public String getCarrier() {
- return carrier;
- }
-
- /**
- * @return the customOverrideState
- */
- public int getCustomOverrideState() {
- return customOverrideState;
- }
-
- /**
- * @return the dEPRECATEDDisabled
- */
- public boolean isdEPRECATEDDisabled() {
- return dEPRECATEDDisabled;
- }
-
- /**
- * @return the enabledForOthers
- */
- public boolean isEnabledForOthers() {
- return enabledForOthers;
- }
-
- /**
- * @return the formattedNumber
- */
- public String getFormattedNumber() {
- return formattedNumber;
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * returns the value for smsEnabled for this phone
- * @return
- */
- public boolean getSmsEnabled() {
- return smsEnabled;
- }
-
- /**
- * @return the incomingAccessNumber
- */
- public String getIncomingAccessNumber() {
- return incomingAccessNumber;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the phoneNumber
- */
- public String getPhoneNumber() {
- return phoneNumber;
- }
-
- /**
- * @return the policyBitmask
- */
- public int getPolicyBitmask() {
- return policyBitmask;
- }
-
- /**
- * @return the redirectToVoicemail
- */
- public boolean isRedirectToVoicemail() {
- return redirectToVoicemail;
- }
-
- /**
- * @return the scheduleSet
- */
- public boolean isScheduleSet() {
- return scheduleSet;
- }
-
- /**
- * @return the smsEnabled
- */
- public boolean isSmsEnabled() {
- return smsEnabled;
- }
-
- /**
- * @return the telephonyVerified
- */
- public boolean isTelephonyVerified() {
- return telephonyVerified;
- }
-
- /**
- * @return the type
- */
- public int getType() {
- return type;
- }
-
- /**
- * @return the verified
- */
- public boolean isVerified() {
- return verified;
- }
-
- /**
- * @return the voicemailForwardingVerified
- */
- public boolean isVoicemailForwardingVerified() {
- return voicemailForwardingVerified;
- }
-
- /**
- * @return the wd
- */
- public Wd getWd() {
- return wd;
- }
-
- /**
- * @return the we
- */
- public We getWe() {
- return we;
- }
-
- /**
- * @return the weekdayAllDay
- */
- public boolean isWeekdayAllDay() {
- return weekdayAllDay;
- }
-
- /**
- * @return the weekdayTimes
- */
- public String[] getWeekdayTimes() {
- return weekdayTimes;
- }
-
- /**
- * @return the weekendAllDay
- */
- public boolean isWeekendAllDay() {
- return weekendAllDay;
- }
-
- /**
- * @return the weekendTimes
- */
- public String[] getWeekendTimes() {
- return weekendTimes;
- }
-
-
-
- /**
- * @param active the active to set
- */
- public void setActive(boolean active) {
- this.active = active;
- }
-
- /**
- * @param behaviorOnRedirect the behaviorOnRedirect to set
- */
- public void setBehaviorOnRedirect(int behaviorOnRedirect) {
- this.behaviorOnRedirect = behaviorOnRedirect;
- }
-
- /**
- * @param carrier the carrier to set
- */
- public void setCarrier(String carrier) {
- this.carrier = carrier;
- }
-
- /**
- * @param customOverrideState the customOverrideState to set
- */
- public void setCustomOverrideState(int customOverrideState) {
- this.customOverrideState = customOverrideState;
- }
-
- /**
- * @param dEPRECATEDDisabled the dEPRECATEDDisabled to set
- */
- public void setdEPRECATEDDisabled(boolean dEPRECATEDDisabled) {
- this.dEPRECATEDDisabled = dEPRECATEDDisabled;
- }
-
- /**
- * @param enabledForOthers the enabledForOthers to set
- */
- public void setEnabledForOthers(boolean enabledForOthers) {
- this.enabledForOthers = enabledForOthers;
- }
-
- /**
- * @param formattedNumber the formattedNumber to set
- */
- public void setFormattedNumber(String formattedNumber) {
- this.formattedNumber = formattedNumber;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @param incomingAccessNumber the incomingAccessNumber to set
- */
- public void setIncomingAccessNumber(String incomingAccessNumber) {
- this.incomingAccessNumber = incomingAccessNumber;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @param phoneNumber the phoneNumber to set
- */
- public void setPhoneNumber(String phoneNumber) {
- this.phoneNumber = phoneNumber;
- }
-
- /**
- * @param policyBitmask the policyBitmask to set
- */
- public void setPolicyBitmask(int policyBitmask) {
- this.policyBitmask = policyBitmask;
- }
-
- /**
- * @param redirectToVoicemail the redirectToVoicemail to set
- */
- public void setRedirectToVoicemail(boolean redirectToVoicemail) {
- this.redirectToVoicemail = redirectToVoicemail;
- }
-
- /**
- * @param scheduleSet the scheduleSet to set
- */
- public void setScheduleSet(boolean scheduleSet) {
- this.scheduleSet = scheduleSet;
- }
-
- /**
- * @param smsEnabled the smsEnabled to set
- */
- public void setSmsEnabled(boolean smsEnabled) {
- this.smsEnabled = smsEnabled;
- }
-
- /**
- * @param telephonyVerified the telephonyVerified to set
- */
- public void setTelephonyVerified(boolean telephonyVerified) {
- this.telephonyVerified = telephonyVerified;
- }
-
- /**
- * @param type the type to set
- */
- public void setType(int type) {
- this.type = type;
- }
-
- /**
- * @param verified the verified to set
- */
- public void setVerified(boolean verified) {
- this.verified = verified;
- }
-
- /**
- * @param voicemailForwardingVerified the voicemailForwardingVerified to set
- */
- public void setVoicemailForwardingVerified(boolean voicemailForwardingVerified) {
- this.voicemailForwardingVerified = voicemailForwardingVerified;
- }
-
- /**
- * @param wd the wd to set
- */
- public void setWd(Wd wd) {
- this.wd = wd;
- }
-
- /**
- * @param we the we to set
- */
- public void setWe(We we) {
- this.we = we;
- }
-
- /**
- * @param weekdayAllDay the weekdayAllDay to set
- */
- public void setWeekdayAllDay(boolean weekdayAllDay) {
- this.weekdayAllDay = weekdayAllDay;
- }
-
- /**
- * @param weekdayTimes the weekdayTimes to set
- */
- public void setWeekdayTimes(String[] weekdayTimes) {
- this.weekdayTimes = weekdayTimes;
- }
-
- /**
- * @param weekendAllDay the weekendAllDay to set
- */
- public void setWeekendAllDay(boolean weekendAllDay) {
- this.weekendAllDay = weekendAllDay;
- }
-
- /**
- * @param weekendTimes the weekendTimes to set
- */
- public void setWeekendTimes(String[] weekendTimes) {
- this.weekendTimes = weekendTimes;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- @Override
- public int compareTo(Phone o) {
- if( id < o.getId() )
- return -1;
- if( id > o.getId() )
- return 1;
-
- return 0;
- }
-
-
-}
+
+package com.techventus.server.voice.datatypes;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import com.techventus.server.voice.util.ParsingUtil;
+
+public class Phone implements Comparable{
+ //TODO - implement
+
+ private boolean saveMode;
+
+ private boolean active;
+ private int behaviorOnRedirect;
+ private String carrier;
+ private int customOverrideState;
+ private boolean dEPRECATEDDisabled;
+ private boolean enabledForOthers;
+ private String formattedNumber;
+ private int id;
+ private String incomingAccessNumber;
+ private String name;
+ private String phoneNumber;
+ private int policyBitmask;
+ private boolean redirectToVoicemail;
+ private boolean scheduleSet;
+ private boolean smsEnabled;
+ private boolean telephonyVerified;
+ private int type;
+ private boolean verified;
+ private boolean voicemailForwardingVerified;
+ private Wd wd; //TODO
+ private We we; //TODO
+ private boolean weekdayAllDay;
+ private String[] weekdayTimes;
+ private boolean weekendAllDay;
+ private String[] weekendTimes;
+
+ public Phone(int id, String name, String phoneNumber) {
+ this.id = id;
+ this.name = name;
+ this.phoneNumber = phoneNumber;
+ }
+
+ /**
+ *
+ * saveMode is off
+ *
+ * @param phonesJSON
+ *
+ */
+ public Phone(JSONObject phonesJSON) throws JSONException {
+ this(phonesJSON, false);
+ }
+
+ /**
+ * Instantiates a new Phone Object.
+ *
+ * @param phonesJSON the JSON representation of the Phone object
+ * @param pSaveMode the Save Mode boolean
+ * @throws JSONException the JSONException
+ */
+ public Phone(JSONObject phonesJSON, boolean pSaveMode) throws JSONException {
+ if(!saveMode || (saveMode && phonesJSON.has("id")) ) id = phonesJSON.getInt("id");
+ if(!saveMode || (saveMode && phonesJSON.has("name")) ) name = phonesJSON.getString("name");
+ if(!saveMode || (saveMode && phonesJSON.has("phoneNumber")) ) phoneNumber = phonesJSON.getString("phoneNumber");
+ if(!saveMode || (saveMode && phonesJSON.has("active")) ) active = phonesJSON.getBoolean("active");
+ if(!saveMode || (saveMode && phonesJSON.has("behaviorOnRedirect")) ) behaviorOnRedirect = phonesJSON.getInt("behaviorOnRedirect");
+ if(!saveMode || (saveMode && phonesJSON.has("carrier")) ) carrier = phonesJSON.getString("carrier");
+ if(!saveMode || (saveMode && phonesJSON.has("customOverrideState")) ) customOverrideState = phonesJSON.getInt("customOverrideState");
+ if(!saveMode || (saveMode && phonesJSON.has("dEPRECATEDDisabled")) ) dEPRECATEDDisabled = phonesJSON.getBoolean("dEPRECATEDDisabled");
+ if(!saveMode || (saveMode && phonesJSON.has("enabledForOthers")) ) enabledForOthers = phonesJSON.getBoolean("enabledForOthers");
+ if(!saveMode || (saveMode && phonesJSON.has("formattedNumber")) ) formattedNumber = phonesJSON.getString("formattedNumber");
+ if(!saveMode || (saveMode && phonesJSON.has("incomingAccessNumber")) ) incomingAccessNumber = phonesJSON.getString("incomingAccessNumber");
+ if(!saveMode || (saveMode && phonesJSON.has("phoneNumber")) ) phoneNumber = phonesJSON.getString("phoneNumber");
+ if(!saveMode || (saveMode && phonesJSON.has("policyBitmask")) ) policyBitmask = phonesJSON.getInt("policyBitmask");
+ if(!saveMode || (saveMode && phonesJSON.has("redirectToVoicemail")) ) redirectToVoicemail = phonesJSON.getBoolean("redirectToVoicemail");
+ if(!saveMode || (saveMode && phonesJSON.has("scheduleSet")) ) {
+ try {
+ // if not set, this value is "false", but if active it's 1 !! - this is not true... maybe
+ scheduleSet = phonesJSON.getBoolean("scheduleSet");
+ } catch (JSONException jsE) {
+// int positive = phonesJSON.getInt("scheduleSet");
+// if(positive==1) scheduleSet = true;
+ // we will just set false on error
+ scheduleSet = false;
+ }
+ }
+ if(!saveMode || (saveMode && phonesJSON.has("smsEnabled")) ) smsEnabled = phonesJSON.getBoolean("smsEnabled");
+ if(!saveMode || (saveMode && phonesJSON.has("telephonyVerified")) ) telephonyVerified = phonesJSON.getBoolean("telephonyVerified");
+ if(!saveMode || (saveMode && phonesJSON.has("type")) ) type = phonesJSON.getInt("type");
+ if(!saveMode || (saveMode && phonesJSON.has("verified")) ) verified = phonesJSON.getBoolean("verified");
+ if(!saveMode || (saveMode && phonesJSON.has("voicemailForwardingVerified")) ) voicemailForwardingVerified = phonesJSON.getBoolean("voicemailForwardingVerified");
+// if(!saveMode || (saveMode && phonesJSON.has("wd")) ) wd = phonesJSON.getInt("id"); //TODO
+// if(!saveMode || (saveMode && phonesJSON.has("we")) ) wd = phonesJSON.getInt("id"); //TODO
+ if(!saveMode || (saveMode && phonesJSON.has("weekdayAllDay")) ) weekdayAllDay = phonesJSON.getBoolean("weekdayAllDay");
+ if(!saveMode || (saveMode && phonesJSON.has("weekdayTimes")) ) weekdayTimes = ParsingUtil.jsonStringArrayToStringArray(phonesJSON.getJSONArray("weekdayTimes"));//Type correct??
+ if(!saveMode || (saveMode && phonesJSON.has("weekendAllDay")) ) weekendAllDay = phonesJSON.getBoolean("weekendAllDay");
+ if(!saveMode || (saveMode && phonesJSON.has("weekendTimes")) ) weekendTimes = ParsingUtil.jsonStringArrayToStringArray(phonesJSON.getJSONArray("weekendTimes"));//Type correct??
+ }
+
+ public static final Phone[] createArrayFromJsonObject(JSONObject phonesJSON) throws JSONException {
+ JSONArray phoneNames = phonesJSON.names();
+ Phone[] result = new Phone[phoneNames.length()];
+ for (int i = 0; i < phoneNames.length(); i++) {
+ result[i] = new Phone(phonesJSON.getJSONObject(phoneNames.getString(i)));
+ }
+ return result;
+ }
+
+ /**
+ * Make a JSON text of the Settings. For compactness, no whitespace
+ * is added. If this would not result in a syntactically correct JSON text,
+ * then null will be returned instead.
+ *
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, portable, transmittable
+ * representation of the object, beginning
+ * with { (left brace) and ending
+ * with } (right brace).
+ */
+ public String toJson(){
+ return toJsonObject().toString();
+ }
+
+ public JSONObject toJsonObject(){
+ JSONObject resultO = new JSONObject();
+ try {
+ resultO.putOpt("id", id);
+ resultO.putOpt("name", name);
+ resultO.putOpt("active", active);
+ resultO.putOpt("behaviorOnRedirect", behaviorOnRedirect);
+ resultO.putOpt("carrier", carrier);
+ resultO.putOpt("customOverrideState", customOverrideState);
+ resultO.putOpt("dEPRECATEDDisabled", dEPRECATEDDisabled);
+ resultO.putOpt("enabledForOthers", enabledForOthers);
+ resultO.putOpt("formattedNumber", formattedNumber);
+ resultO.putOpt("id", id);
+ resultO.putOpt("incomingAccessNumber", incomingAccessNumber);
+ resultO.putOpt("name", name);
+ resultO.putOpt("phoneNumber", phoneNumber);
+ resultO.putOpt("policyBitmask", policyBitmask);
+ resultO.putOpt("redirectToVoicemail", redirectToVoicemail);
+ //Google json expects false or 1 - not anymore
+// if(scheduleSet) {
+// resultO.putOpt("scheduleSet", 1);
+// } else {
+// resultO.putOpt("scheduleSet", false);
+// }
+ resultO.putOpt("scheduleSet", scheduleSet);
+ resultO.putOpt("smsEnabled", smsEnabled);
+ resultO.putOpt("telephonyVerified", telephonyVerified);
+ resultO.putOpt("type", type);
+ resultO.putOpt("verified", verified);
+ resultO.putOpt("voicemailForwardingVerified", voicemailForwardingVerified);
+// private Wd wd", ); //TODO
+// private We we", ); //TODO
+ resultO.putOpt("weekdayAllDay", weekdayAllDay);
+ resultO.putOpt("weekdayTimes", weekdayTimes);//Type correct??
+ resultO.putOpt("weekendAllDay", weekendAllDay);
+ resultO.putOpt("weekendTimes", weekendTimes);//Type correct??
+ } catch (JSONException e) {
+ return null;
+ }
+
+ return resultO;
+ }
+
+ /**
+ * @param phones
+ * @return Json Object
+ * @throws JSONException
+ */
+ public static Object phonesArrayToJsonObject(Phone[] phones) throws JSONException {
+ JSONObject phoneO = new JSONObject();
+ for (int i = 0; i < phones.length; i++) {
+ phoneO.accumulate(phones[i].getId()+"",phones[i].toJsonObject());
+ }
+ return phoneO;
+ }
+
+ /**
+ * @return the active
+ */
+ public boolean isActive() {
+ return active;
+ }
+
+ /**
+ * @return the behaviorOnRedirect
+ */
+ public int getBehaviorOnRedirect() {
+ return behaviorOnRedirect;
+ }
+
+ /**
+ * @return the carrier
+ */
+ public String getCarrier() {
+ return carrier;
+ }
+
+ /**
+ * @return the customOverrideState
+ */
+ public int getCustomOverrideState() {
+ return customOverrideState;
+ }
+
+ /**
+ * @return the dEPRECATEDDisabled
+ */
+ public boolean isdEPRECATEDDisabled() {
+ return dEPRECATEDDisabled;
+ }
+
+ /**
+ * @return the enabledForOthers
+ */
+ public boolean isEnabledForOthers() {
+ return enabledForOthers;
+ }
+
+ /**
+ * @return the formattedNumber
+ */
+ public String getFormattedNumber() {
+ return formattedNumber;
+ }
+
+ /**
+ * @return the id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * returns the value for smsEnabled for this phone
+ * @return
+ */
+ public boolean getSmsEnabled() {
+ return smsEnabled;
+ }
+
+ /**
+ * @return the incomingAccessNumber
+ */
+ public String getIncomingAccessNumber() {
+ return incomingAccessNumber;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the phoneNumber
+ */
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ /**
+ * @return the policyBitmask
+ */
+ public int getPolicyBitmask() {
+ return policyBitmask;
+ }
+
+ /**
+ * @return the redirectToVoicemail
+ */
+ public boolean isRedirectToVoicemail() {
+ return redirectToVoicemail;
+ }
+
+ /**
+ * @return the scheduleSet
+ */
+ public boolean isScheduleSet() {
+ return scheduleSet;
+ }
+
+ /**
+ * @return the smsEnabled
+ */
+ public boolean isSmsEnabled() {
+ return smsEnabled;
+ }
+
+ /**
+ * @return the telephonyVerified
+ */
+ public boolean isTelephonyVerified() {
+ return telephonyVerified;
+ }
+
+ /**
+ * @return the type
+ */
+ public int getType() {
+ return type;
+ }
+
+ /**
+ * @return the verified
+ */
+ public boolean isVerified() {
+ return verified;
+ }
+
+ /**
+ * @return the voicemailForwardingVerified
+ */
+ public boolean isVoicemailForwardingVerified() {
+ return voicemailForwardingVerified;
+ }
+
+ /**
+ * @return the wd
+ */
+ public Wd getWd() {
+ return wd;
+ }
+
+ /**
+ * @return the we
+ */
+ public We getWe() {
+ return we;
+ }
+
+ /**
+ * @return the weekdayAllDay
+ */
+ public boolean isWeekdayAllDay() {
+ return weekdayAllDay;
+ }
+
+ /**
+ * @return the weekdayTimes
+ */
+ public String[] getWeekdayTimes() {
+ return weekdayTimes;
+ }
+
+ /**
+ * @return the weekendAllDay
+ */
+ public boolean isWeekendAllDay() {
+ return weekendAllDay;
+ }
+
+ /**
+ * @return the weekendTimes
+ */
+ public String[] getWeekendTimes() {
+ return weekendTimes;
+ }
+
+
+
+ /**
+ * @param active the active to set
+ */
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+ /**
+ * @param behaviorOnRedirect the behaviorOnRedirect to set
+ */
+ public void setBehaviorOnRedirect(int behaviorOnRedirect) {
+ this.behaviorOnRedirect = behaviorOnRedirect;
+ }
+
+ /**
+ * @param carrier the carrier to set
+ */
+ public void setCarrier(String carrier) {
+ this.carrier = carrier;
+ }
+
+ /**
+ * @param customOverrideState the customOverrideState to set
+ */
+ public void setCustomOverrideState(int customOverrideState) {
+ this.customOverrideState = customOverrideState;
+ }
+
+ /**
+ * @param dEPRECATEDDisabled the dEPRECATEDDisabled to set
+ */
+ public void setdEPRECATEDDisabled(boolean dEPRECATEDDisabled) {
+ this.dEPRECATEDDisabled = dEPRECATEDDisabled;
+ }
+
+ /**
+ * @param enabledForOthers the enabledForOthers to set
+ */
+ public void setEnabledForOthers(boolean enabledForOthers) {
+ this.enabledForOthers = enabledForOthers;
+ }
+
+ /**
+ * @param formattedNumber the formattedNumber to set
+ */
+ public void setFormattedNumber(String formattedNumber) {
+ this.formattedNumber = formattedNumber;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ /**
+ * @param incomingAccessNumber the incomingAccessNumber to set
+ */
+ public void setIncomingAccessNumber(String incomingAccessNumber) {
+ this.incomingAccessNumber = incomingAccessNumber;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @param phoneNumber the phoneNumber to set
+ */
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+
+ /**
+ * @param policyBitmask the policyBitmask to set
+ */
+ public void setPolicyBitmask(int policyBitmask) {
+ this.policyBitmask = policyBitmask;
+ }
+
+ /**
+ * @param redirectToVoicemail the redirectToVoicemail to set
+ */
+ public void setRedirectToVoicemail(boolean redirectToVoicemail) {
+ this.redirectToVoicemail = redirectToVoicemail;
+ }
+
+ /**
+ * @param scheduleSet the scheduleSet to set
+ */
+ public void setScheduleSet(boolean scheduleSet) {
+ this.scheduleSet = scheduleSet;
+ }
+
+ /**
+ * @param smsEnabled the smsEnabled to set
+ */
+ public void setSmsEnabled(boolean smsEnabled) {
+ this.smsEnabled = smsEnabled;
+ }
+
+ /**
+ * @param telephonyVerified the telephonyVerified to set
+ */
+ public void setTelephonyVerified(boolean telephonyVerified) {
+ this.telephonyVerified = telephonyVerified;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(int type) {
+ this.type = type;
+ }
+
+ /**
+ * @param verified the verified to set
+ */
+ public void setVerified(boolean verified) {
+ this.verified = verified;
+ }
+
+ /**
+ * @param voicemailForwardingVerified the voicemailForwardingVerified to set
+ */
+ public void setVoicemailForwardingVerified(boolean voicemailForwardingVerified) {
+ this.voicemailForwardingVerified = voicemailForwardingVerified;
+ }
+
+ /**
+ * @param wd the wd to set
+ */
+ public void setWd(Wd wd) {
+ this.wd = wd;
+ }
+
+ /**
+ * @param we the we to set
+ */
+ public void setWe(We we) {
+ this.we = we;
+ }
+
+ /**
+ * @param weekdayAllDay the weekdayAllDay to set
+ */
+ public void setWeekdayAllDay(boolean weekdayAllDay) {
+ this.weekdayAllDay = weekdayAllDay;
+ }
+
+ /**
+ * @param weekdayTimes the weekdayTimes to set
+ */
+ public void setWeekdayTimes(String[] weekdayTimes) {
+ this.weekdayTimes = weekdayTimes;
+ }
+
+ /**
+ * @param weekendAllDay the weekendAllDay to set
+ */
+ public void setWeekendAllDay(boolean weekendAllDay) {
+ this.weekendAllDay = weekendAllDay;
+ }
+
+ /**
+ * @param weekendTimes the weekendTimes to set
+ */
+ public void setWeekendTimes(String[] weekendTimes) {
+ this.weekendTimes = weekendTimes;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ @Override
+ public int compareTo(Phone o) {
+ if( id < o.getId() )
+ return -1;
+ if( id > o.getId() )
+ return 1;
+
+ return 0;
+ }
+
+
+}
diff --git a/src/com/techventus/server/voice/datatypes/Setting.java b/src/main/java/com/techventus/server/voice/datatypes/Setting.java
similarity index 95%
rename from src/com/techventus/server/voice/datatypes/Setting.java
rename to src/main/java/com/techventus/server/voice/datatypes/Setting.java
index e97f9bc..8637f20 100644
--- a/src/com/techventus/server/voice/datatypes/Setting.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/Setting.java
@@ -1,537 +1,537 @@
-package com.techventus.server.voice.datatypes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import com.techventus.server.voice.util.ParsingUtil;
-/**
- * Accountsettings - subtype of AllSettings
- *
- * @author tobias eisentraeger
- *
- */
-public class Setting {
-
- private final static boolean saveMode = true;
-
- // Settings in order of the json
- private int[] mActiveForwardingList;
- private String baseUrl;
- private int credits;
- private int defaultGreetingId;
- private String[] mDidInfos;
- private boolean directConnect;
- private DisabledId[] mDisabledIdMap;
- private boolean doNotDisturb;
- private EmailAddress[] emailAddresses;
- private boolean emailNotificationActive;
- private String emailNotificationAddress;
- private Greeting[] greetings;
- private String[] groupList;
- private Group[] groups;
- private String language;
- private String primaryDid;
- private int screenBehavior;
- private boolean showTranscripts;
- private String[] smsNotifications;
- private boolean smsToEmailActive;
- private boolean smsToEmailSubject;
- private String spam;
- private String timezone;
- private boolean useDidAsCallerId;
- private boolean useDidAsSource;
-
- public Setting(JSONObject settingsJSON) throws JSONException {
- if(!saveMode || saveMode && settingsJSON.has("activeForwardingIds")) mActiveForwardingList = ParsingUtil.jsonIntArrayToIntArray(settingsJSON.getJSONArray("activeForwardingIds"));
- if(!saveMode || saveMode && settingsJSON.has("baseUrl")) baseUrl = settingsJSON.getString("baseUrl");
- if(!saveMode || saveMode && settingsJSON.has("credits")) credits = settingsJSON.getInt("credits");
- if(!saveMode || saveMode && settingsJSON.has("defaultGreetingId")) defaultGreetingId = settingsJSON.getInt("defaultGreetingId");
- if(!saveMode || saveMode && settingsJSON.has("didInfos")) mDidInfos = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("didInfos"));
- if(!saveMode || saveMode && settingsJSON.has("directConnect")) directConnect = settingsJSON.getBoolean("directConnect");
- if(!saveMode || saveMode && settingsJSON.has("disabledIdMap")) mDisabledIdMap = DisabledId.createArrayFromJsonObject(settingsJSON);
- if(!saveMode || saveMode && settingsJSON.has("doNotDisturb")) doNotDisturb = settingsJSON.getBoolean("doNotDisturb");
- if(!saveMode || saveMode && settingsJSON.has("emailAddresses")) emailAddresses = EmailAddress.createArrayFromJsonObject(settingsJSON);
- if(!saveMode || saveMode && settingsJSON.has("emailNotificationActive")) emailNotificationActive = settingsJSON.getBoolean("emailNotificationActive");
- if(!saveMode || saveMode && settingsJSON.has("emailNotificationAddress")) emailNotificationAddress = settingsJSON.getString("emailNotificationAddress");
- if(!saveMode || saveMode && settingsJSON.has("greetings")) greetings = Greeting.createArrayFromJsonObject(settingsJSON);
- if(!saveMode || saveMode && settingsJSON.has("groupList")) groupList = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("groupList"));
- if(!saveMode || saveMode && settingsJSON.has("groups")) groups = Group.createArrayFromJsonObject(settingsJSON.getJSONObject("groups"));
- if(!saveMode || saveMode && settingsJSON.has("language")) language = settingsJSON.getString("language");
- if(!saveMode || saveMode && settingsJSON.has("primaryDid")) primaryDid = settingsJSON.getString("primaryDid");
- if(!saveMode || saveMode && settingsJSON.has("screenBehavior")) screenBehavior = settingsJSON.getInt("screenBehavior");
- if(!saveMode || saveMode && settingsJSON.has("showTranscripts")) showTranscripts = settingsJSON.getBoolean("showTranscripts");
- if(!saveMode || saveMode && settingsJSON.has("smsNotifications")) smsNotifications = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("smsNotifications"));
- if(!saveMode || saveMode && settingsJSON.has("smsToEmailActive")) smsToEmailActive = settingsJSON.getBoolean("smsToEmailActive");
- if(!saveMode || saveMode && settingsJSON.has("smsToEmailSubject")) smsToEmailSubject = settingsJSON.getBoolean("smsToEmailSubject");
- if(!saveMode || saveMode && settingsJSON.has("spam")) spam = settingsJSON.getString("spam");
- if(!saveMode || saveMode && settingsJSON.has("timezone")) timezone = settingsJSON.getString("timezone");
- if(!saveMode || saveMode && settingsJSON.has("useDidAsCallerId")) useDidAsCallerId = settingsJSON.getBoolean("useDidAsCallerId");
- if(!saveMode || saveMode && settingsJSON.has("useDidAsSource")) useDidAsSource = settingsJSON.getBoolean("useDidAsSource");
- //TODO webCallButtons
- }
-
- /**
- * Make a JSON text of the Settings. For compactness, no whitespace
- * is added. If this would not result in a syntactically correct JSON text,
- * then null will be returned instead.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return a printable, displayable, portable, transmittable
- * representation of the object, beginning
- * with { (left brace) and ending
- * with } (right brace).
- */
- public String toJson(){
- return toJsonObject().toString();
- }
-
- /**
- * Convert this Settings Object to its JsonObject Representation.
- *
- * @return the jSON object
- */
- public JSONObject toJsonObject(){
- JSONObject settingsO = new JSONObject();
- try {
- //JSONObject settingsO = new JSONObject();
-
- settingsO.putOpt("activeForwardingIds", mActiveForwardingList);
- settingsO.putOpt("baseUrl", baseUrl);
- settingsO.putOpt("credits", credits);
- settingsO.putOpt("defaultGreetingId", defaultGreetingId);
- settingsO.putOpt("didInfos", mDidInfos);
- settingsO.putOpt("directConnect", directConnect);
- if(mDisabledIdMap!=null) {
- Map disMap = new HashMap();
- for (DisabledId disId : mDisabledIdMap) {
- disMap.put(disId.getId(), disId.isDisabled());
- }
- settingsO.putOpt("disabledIdMap", disMap);
- } else {
- // need to put this "disabledIdMap": {}
- }
- settingsO.putOpt("doNotDisturb", doNotDisturb);
- if(emailAddresses!=null) {
- for (int i = 0; i < emailAddresses.length; i++) {
- settingsO.accumulate("emailAddresses", emailAddresses[i].getAddress());
- }
- } else {
- // need to put this "emailAddresses": {}
- }
- settingsO.putOpt("emailNotificationActive", emailNotificationActive);
- settingsO.putOpt("emailNotificationAddress", emailNotificationAddress);
- settingsO.putOpt("greetings", greetings); // An Object Array uses the Bean get Methods - no toJson() needed in Greeting
- settingsO.putOpt("groupList", groupList);
-
- settingsO.accumulate("groups", Group.groupsArrayToJsonObject(groups));
-
-// JSONObject groupObject = new JSONObject();
-// JSONArray groupNames = groups.names();
-// if(groupNames!=null && groupNames.length()>0) {
-// for (int i = 0; i < groupNames.length(); i++) {
-// JSONObject oneGroupObject = groups;
-// groupObject.putOpt(groupNames.getString(i), oneGroupObject);
-// }
-// }
-
- settingsO.putOpt("language", language);
- settingsO.putOpt("primaryDid", primaryDid);
- settingsO.putOpt("screenBehavior", screenBehavior);
- settingsO.putOpt("showTranscripts", showTranscripts);
- settingsO.putOpt("smsNotifications", smsNotifications);
- settingsO.putOpt("smsToEmailActive", smsToEmailActive);
- settingsO.putOpt("smsToEmailSubject", smsToEmailSubject);
- settingsO.putOpt("spam", spam);
- settingsO.putOpt("timezone", timezone);
- settingsO.putOpt("useDidAsCallerId", useDidAsCallerId);
- settingsO.putOpt("useDidAsSource", useDidAsSource);
-
- //resultO.put("settings", settingsO);
- } catch (JSONException e) {
- System.out.println(e.getLocalizedMessage());
- return null;
- }
-
- return settingsO;
- }
-
- /**
- * @return the mActiveForwardingList
- */
- public int[] getmActiveForwardingList() {
- return mActiveForwardingList;
- }
-
- /**
- * @return the baseUrl
- */
- public String getBaseUrl() {
- return baseUrl;
- }
-
- /**
- * @return the credits
- */
- public int getCredits() {
- return credits;
- }
-
- /**
- * @return the defaultGreetingId
- */
- public int getDefaultGreetingId() {
- return defaultGreetingId;
- }
-
- /**
- * @return the mDidInfos
- */
- public String[] getmDidInfos() {
- return mDidInfos;
- }
-
- /**
- * @return the directConnect
- */
- public boolean isDirectConnect() {
- return directConnect;
- }
-
- /**
- * @return the mDisabledIdMap
- */
- public DisabledId[] getmDisabledIdList() {
- return mDisabledIdMap;
- }
-
- /**
- * @return the doNotDisturb
- */
- public boolean isDoNotDisturb() {
- return doNotDisturb;
- }
-
- /**
- * @return the emailAddresses
- */
- public EmailAddress[] getEmailAddresses() {
- return emailAddresses;
- }
-
- /**
- * @return the emailNotificationActive
- */
- public boolean isEmailNotificationActive() {
- return emailNotificationActive;
- }
-
- /**
- * @return the emailNotificationAddress
- */
- public String getEmailNotificationAddress() {
- return emailNotificationAddress;
- }
-
- /**
- * @return the greetings
- */
- public Greeting[] getGreetings() {
- return greetings;
- }
- /**
- * @return the greetings
- */
- public Greeting[] getGreetingsSorted() {
- Arrays.sort(greetings);
- return greetings;
- }
-
- /**
- * @return the groupList
- */
- public String[] getGroupList() {
- return groupList;
- }
-
- /**
- * @return the groupList as List
- */
- public List getGroupListAsList() {
- List lresult = new ArrayList();
- for (int i = 0; i < groupList.length; i++) {
- lresult.add(groupList[i]);
- }
- return lresult;
- }
-
- /**
- * @return the groups
- */
- public Group[] getGroups() {
- return groups;
- }
-
-
- /**
- * @return the language
- */
- public String getLanguage() {
- return language;
- }
-
- /**
- * @return the primaryDid
- */
- public String getPrimaryDid() {
- return primaryDid;
- }
-
- /**
- * @return the screenBehavior
- */
- public int getScreenBehavior() {
- return screenBehavior;
- }
-
- /**
- * @return the showTranscripts
- */
- public boolean isShowTranscripts() {
- return showTranscripts;
- }
-
- /**
- * @return the smsNotifications
- */
- public String[] getSmsNotifications() {
- return smsNotifications;
- }
-
- /**
- * @return the smsToEmailActive
- */
- public boolean isSmsToEmailActive() {
- return smsToEmailActive;
- }
-
- /**
- * @return the smsToEmailSubject
- */
- public boolean isSmsToEmailSubject() {
- return smsToEmailSubject;
- }
-
- /**
- * @return the spam
- */
- public String getSpam() {
- return spam;
- }
-
- /**
- * @return the timezone
- */
- public String getTimezone() {
- return timezone;
- }
-
- /**
- * @return the useDidAsCallerId
- */
- public boolean isUseDidAsCallerId() {
- return useDidAsCallerId;
- }
-
- /**
- * @return the useDidAsSource
- */
- public boolean isUseDidAsSource() {
- return useDidAsSource;
- }
-
- /**
- * @param mActiveForwardingList the mActiveForwardingList to set
- */
- public void setmActiveForwardingList(int[] mActiveForwardingList) {
- this.mActiveForwardingList = mActiveForwardingList;
- }
-
- /**
- * @param baseUrl the baseUrl to set
- */
- public void setBaseUrl(String baseUrl) {
- this.baseUrl = baseUrl;
- }
-
- /**
- * @param credits the credits to set
- */
- public void setCredits(int credits) {
- this.credits = credits;
- }
-
- /**
- * @param defaultGreetingId the defaultGreetingId to set
- */
- public void setDefaultGreetingId(int defaultGreetingId) {
- this.defaultGreetingId = defaultGreetingId;
- }
-
- /**
- * @param mDidInfos the mDidInfos to set
- */
- public void setmDidInfos(String[] mDidInfos) {
- this.mDidInfos = mDidInfos;
- }
-
- /**
- * @param directConnect the directConnect to set
- */
- public void setDirectConnect(boolean directConnect) {
- this.directConnect = directConnect;
- }
-
- /**
- * @param mDisabledIdMap the mDisabledIdMap to set
- */
- public void setmDisabledIdList(DisabledId[] mDisabledIdList) {
- this.mDisabledIdMap = mDisabledIdList;
- }
-
- /**
- * @param doNotDisturb the doNotDisturb to set
- */
- public void setDoNotDisturb(boolean doNotDisturb) {
- this.doNotDisturb = doNotDisturb;
- }
-
- /**
- * @param emailAddresses the emailAddresses to set
- */
- public void setEmailAddresses(EmailAddress[] emailAddresses) {
- this.emailAddresses = emailAddresses;
- }
-
- /**
- * @param emailNotificationActive the emailNotificationActive to set
- */
- public void setEmailNotificationActive(boolean emailNotificationActive) {
- this.emailNotificationActive = emailNotificationActive;
- }
-
- /**
- * @param emailNotificationAddress the emailNotificationAddress to set
- */
- public void setEmailNotificationAddress(String emailNotificationAddress) {
- this.emailNotificationAddress = emailNotificationAddress;
- }
-
- /**
- * @param greetings the greetings to set
- */
- public void setGreetings(Greeting[] greetings) {
- this.greetings = greetings;
- }
-
- /**
- * @param groupList the groupList to set
- */
- public void setGroupList(String[] groupList) {
- this.groupList = groupList;
- }
-
- /**
- * @param groups the groups to set
- */
- public void setGroups(Group[] groups) {
- this.groups = groups;
- }
-
- /**
- * @param language the language to set
- */
- public void setLanguage(String language) {
- this.language = language;
- }
-
- /**
- * @param primaryDid the primaryDid to set
- */
- public void setPrimaryDid(String primaryDid) {
- this.primaryDid = primaryDid;
- }
-
- /**
- * @param screenBehavior the screenBehavior to set
- */
- public void setScreenBehavior(int screenBehavior) {
- this.screenBehavior = screenBehavior;
- }
-
- /**
- * @param showTranscripts the showTranscripts to set
- */
- public void setShowTranscripts(boolean showTranscripts) {
- this.showTranscripts = showTranscripts;
- }
-
- /**
- * @param smsNotifications the smsNotifications to set
- */
- public void setSmsNotifications(String[] smsNotifications) {
- this.smsNotifications = smsNotifications;
- }
-
- /**
- * @param smsToEmailActive the smsToEmailActive to set
- */
- public void setSmsToEmailActive(boolean smsToEmailActive) {
- this.smsToEmailActive = smsToEmailActive;
- }
-
- /**
- * @param smsToEmailSubject the smsToEmailSubject to set
- */
- public void setSmsToEmailSubject(boolean smsToEmailSubject) {
- this.smsToEmailSubject = smsToEmailSubject;
- }
-
- /**
- * @param spam the spam to set
- */
- public void setSpam(String spam) {
- this.spam = spam;
- }
-
- /**
- * @param timezone the timezone to set
- */
- public void setTimezone(String timezone) {
- this.timezone = timezone;
- }
-
- /**
- * @param useDidAsCallerId the useDidAsCallerId to set
- */
- public void setUseDidAsCallerId(boolean useDidAsCallerId) {
- this.useDidAsCallerId = useDidAsCallerId;
- }
-
- /**
- * @param useDidAsSource the useDidAsSource to set
- */
- public void setUseDidAsSource(boolean useDidAsSource) {
- this.useDidAsSource = useDidAsSource;
- }
-
-
-
-}
+package com.techventus.server.voice.datatypes;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import com.techventus.server.voice.util.ParsingUtil;
+/**
+ * Accountsettings - subtype of AllSettings
+ *
+ * @author tobias eisentraeger
+ *
+ */
+public class Setting {
+
+ private final static boolean saveMode = true;
+
+ // Settings in order of the json
+ private int[] mActiveForwardingList;
+ private String baseUrl;
+ private int credits;
+ private int defaultGreetingId;
+ private String[] mDidInfos;
+ private boolean directConnect;
+ private DisabledId[] mDisabledIdMap;
+ private boolean doNotDisturb;
+ private EmailAddress[] emailAddresses;
+ private boolean emailNotificationActive;
+ private String emailNotificationAddress;
+ private Greeting[] greetings;
+ private String[] groupList;
+ private Group[] groups;
+ private String language;
+ private String primaryDid;
+ private int screenBehavior;
+ private boolean showTranscripts;
+ private String[] smsNotifications;
+ private boolean smsToEmailActive;
+ private boolean smsToEmailSubject;
+ private String spam;
+ private String timezone;
+ private boolean useDidAsCallerId;
+ private boolean useDidAsSource;
+
+ public Setting(JSONObject settingsJSON) throws JSONException {
+ if(!saveMode || saveMode && settingsJSON.has("activeForwardingIds")) mActiveForwardingList = ParsingUtil.jsonIntArrayToIntArray(settingsJSON.getJSONArray("activeForwardingIds"));
+ if(!saveMode || saveMode && settingsJSON.has("baseUrl")) baseUrl = settingsJSON.getString("baseUrl");
+ if(!saveMode || saveMode && settingsJSON.has("credits")) credits = settingsJSON.getInt("credits");
+ if(!saveMode || saveMode && settingsJSON.has("defaultGreetingId")) defaultGreetingId = settingsJSON.getInt("defaultGreetingId");
+ if(!saveMode || saveMode && settingsJSON.has("didInfos")) mDidInfos = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("didInfos"));
+ if(!saveMode || saveMode && settingsJSON.has("directConnect")) directConnect = settingsJSON.getBoolean("directConnect");
+ if(!saveMode || saveMode && settingsJSON.has("disabledIdMap")) mDisabledIdMap = DisabledId.createArrayFromJsonObject(settingsJSON);
+ if(!saveMode || saveMode && settingsJSON.has("doNotDisturb")) doNotDisturb = settingsJSON.getBoolean("doNotDisturb");
+ if(!saveMode || saveMode && settingsJSON.has("emailAddresses")) emailAddresses = EmailAddress.createArrayFromJsonObject(settingsJSON);
+ if(!saveMode || saveMode && settingsJSON.has("emailNotificationActive")) emailNotificationActive = settingsJSON.getBoolean("emailNotificationActive");
+ if(!saveMode || saveMode && settingsJSON.has("emailNotificationAddress")) emailNotificationAddress = settingsJSON.getString("emailNotificationAddress");
+ if(!saveMode || saveMode && settingsJSON.has("greetings")) greetings = Greeting.createArrayFromJsonObject(settingsJSON);
+ if(!saveMode || saveMode && settingsJSON.has("groupList")) groupList = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("groupList"));
+ if(!saveMode || saveMode && settingsJSON.has("groups")) groups = Group.createArrayFromJsonObject(settingsJSON.getJSONObject("groups"));
+ if(!saveMode || saveMode && settingsJSON.has("language")) language = settingsJSON.getString("language");
+ if(!saveMode || saveMode && settingsJSON.has("primaryDid")) primaryDid = settingsJSON.getString("primaryDid");
+ if(!saveMode || saveMode && settingsJSON.has("screenBehavior")) screenBehavior = settingsJSON.getInt("screenBehavior");
+ if(!saveMode || saveMode && settingsJSON.has("showTranscripts")) showTranscripts = settingsJSON.getBoolean("showTranscripts");
+ if(!saveMode || saveMode && settingsJSON.has("smsNotifications")) smsNotifications = ParsingUtil.jsonStringArrayToStringArray(settingsJSON.getJSONArray("smsNotifications"));
+ if(!saveMode || saveMode && settingsJSON.has("smsToEmailActive")) smsToEmailActive = settingsJSON.getBoolean("smsToEmailActive");
+ if(!saveMode || saveMode && settingsJSON.has("smsToEmailSubject")) smsToEmailSubject = settingsJSON.getBoolean("smsToEmailSubject");
+ if(!saveMode || saveMode && settingsJSON.has("spam")) spam = settingsJSON.getString("spam");
+ if(!saveMode || saveMode && settingsJSON.has("timezone")) timezone = settingsJSON.getString("timezone");
+ if(!saveMode || saveMode && settingsJSON.has("useDidAsCallerId")) useDidAsCallerId = settingsJSON.getBoolean("useDidAsCallerId");
+ if(!saveMode || saveMode && settingsJSON.has("useDidAsSource")) useDidAsSource = settingsJSON.getBoolean("useDidAsSource");
+ //TODO webCallButtons
+ }
+
+ /**
+ * Make a JSON text of the Settings. For compactness, no whitespace
+ * is added. If this would not result in a syntactically correct JSON text,
+ * then null will be returned instead.
+ *
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, portable, transmittable
+ * representation of the object, beginning
+ * with { (left brace) and ending
+ * with } (right brace).
+ */
+ public String toJson(){
+ return toJsonObject().toString();
+ }
+
+ /**
+ * Convert this Settings Object to its JsonObject Representation.
+ *
+ * @return the jSON object
+ */
+ public JSONObject toJsonObject(){
+ JSONObject settingsO = new JSONObject();
+ try {
+ //JSONObject settingsO = new JSONObject();
+
+ settingsO.putOpt("activeForwardingIds", mActiveForwardingList);
+ settingsO.putOpt("baseUrl", baseUrl);
+ settingsO.putOpt("credits", credits);
+ settingsO.putOpt("defaultGreetingId", defaultGreetingId);
+ settingsO.putOpt("didInfos", mDidInfos);
+ settingsO.putOpt("directConnect", directConnect);
+ if(mDisabledIdMap!=null) {
+ Map disMap = new HashMap();
+ for (DisabledId disId : mDisabledIdMap) {
+ disMap.put(disId.getId(), disId.isDisabled());
+ }
+ settingsO.putOpt("disabledIdMap", disMap);
+ } else {
+ // need to put this "disabledIdMap": {}
+ }
+ settingsO.putOpt("doNotDisturb", doNotDisturb);
+ if(emailAddresses!=null) {
+ for (int i = 0; i < emailAddresses.length; i++) {
+ settingsO.accumulate("emailAddresses", emailAddresses[i].getAddress());
+ }
+ } else {
+ // need to put this "emailAddresses": {}
+ }
+ settingsO.putOpt("emailNotificationActive", emailNotificationActive);
+ settingsO.putOpt("emailNotificationAddress", emailNotificationAddress);
+ settingsO.putOpt("greetings", greetings); // An Object Array uses the Bean get Methods - no toJson() needed in Greeting
+ settingsO.putOpt("groupList", groupList);
+
+ settingsO.accumulate("groups", Group.groupsArrayToJsonObject(groups));
+
+// JSONObject groupObject = new JSONObject();
+// JSONArray groupNames = groups.names();
+// if(groupNames!=null && groupNames.length()>0) {
+// for (int i = 0; i < groupNames.length(); i++) {
+// JSONObject oneGroupObject = groups;
+// groupObject.putOpt(groupNames.getString(i), oneGroupObject);
+// }
+// }
+
+ settingsO.putOpt("language", language);
+ settingsO.putOpt("primaryDid", primaryDid);
+ settingsO.putOpt("screenBehavior", screenBehavior);
+ settingsO.putOpt("showTranscripts", showTranscripts);
+ settingsO.putOpt("smsNotifications", smsNotifications);
+ settingsO.putOpt("smsToEmailActive", smsToEmailActive);
+ settingsO.putOpt("smsToEmailSubject", smsToEmailSubject);
+ settingsO.putOpt("spam", spam);
+ settingsO.putOpt("timezone", timezone);
+ settingsO.putOpt("useDidAsCallerId", useDidAsCallerId);
+ settingsO.putOpt("useDidAsSource", useDidAsSource);
+
+ //resultO.put("settings", settingsO);
+ } catch (JSONException e) {
+ System.out.println(e.getLocalizedMessage());
+ return null;
+ }
+
+ return settingsO;
+ }
+
+ /**
+ * @return the mActiveForwardingList
+ */
+ public int[] getmActiveForwardingList() {
+ return mActiveForwardingList;
+ }
+
+ /**
+ * @return the baseUrl
+ */
+ public String getBaseUrl() {
+ return baseUrl;
+ }
+
+ /**
+ * @return the credits
+ */
+ public int getCredits() {
+ return credits;
+ }
+
+ /**
+ * @return the defaultGreetingId
+ */
+ public int getDefaultGreetingId() {
+ return defaultGreetingId;
+ }
+
+ /**
+ * @return the mDidInfos
+ */
+ public String[] getmDidInfos() {
+ return mDidInfos;
+ }
+
+ /**
+ * @return the directConnect
+ */
+ public boolean isDirectConnect() {
+ return directConnect;
+ }
+
+ /**
+ * @return the mDisabledIdMap
+ */
+ public DisabledId[] getmDisabledIdList() {
+ return mDisabledIdMap;
+ }
+
+ /**
+ * @return the doNotDisturb
+ */
+ public boolean isDoNotDisturb() {
+ return doNotDisturb;
+ }
+
+ /**
+ * @return the emailAddresses
+ */
+ public EmailAddress[] getEmailAddresses() {
+ return emailAddresses;
+ }
+
+ /**
+ * @return the emailNotificationActive
+ */
+ public boolean isEmailNotificationActive() {
+ return emailNotificationActive;
+ }
+
+ /**
+ * @return the emailNotificationAddress
+ */
+ public String getEmailNotificationAddress() {
+ return emailNotificationAddress;
+ }
+
+ /**
+ * @return the greetings
+ */
+ public Greeting[] getGreetings() {
+ return greetings;
+ }
+ /**
+ * @return the greetings
+ */
+ public Greeting[] getGreetingsSorted() {
+ Arrays.sort(greetings);
+ return greetings;
+ }
+
+ /**
+ * @return the groupList
+ */
+ public String[] getGroupList() {
+ return groupList;
+ }
+
+ /**
+ * @return the groupList as List
+ */
+ public List getGroupListAsList() {
+ List lresult = new ArrayList();
+ for (int i = 0; i < groupList.length; i++) {
+ lresult.add(groupList[i]);
+ }
+ return lresult;
+ }
+
+ /**
+ * @return the groups
+ */
+ public Group[] getGroups() {
+ return groups;
+ }
+
+
+ /**
+ * @return the language
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ /**
+ * @return the primaryDid
+ */
+ public String getPrimaryDid() {
+ return primaryDid;
+ }
+
+ /**
+ * @return the screenBehavior
+ */
+ public int getScreenBehavior() {
+ return screenBehavior;
+ }
+
+ /**
+ * @return the showTranscripts
+ */
+ public boolean isShowTranscripts() {
+ return showTranscripts;
+ }
+
+ /**
+ * @return the smsNotifications
+ */
+ public String[] getSmsNotifications() {
+ return smsNotifications;
+ }
+
+ /**
+ * @return the smsToEmailActive
+ */
+ public boolean isSmsToEmailActive() {
+ return smsToEmailActive;
+ }
+
+ /**
+ * @return the smsToEmailSubject
+ */
+ public boolean isSmsToEmailSubject() {
+ return smsToEmailSubject;
+ }
+
+ /**
+ * @return the spam
+ */
+ public String getSpam() {
+ return spam;
+ }
+
+ /**
+ * @return the timezone
+ */
+ public String getTimezone() {
+ return timezone;
+ }
+
+ /**
+ * @return the useDidAsCallerId
+ */
+ public boolean isUseDidAsCallerId() {
+ return useDidAsCallerId;
+ }
+
+ /**
+ * @return the useDidAsSource
+ */
+ public boolean isUseDidAsSource() {
+ return useDidAsSource;
+ }
+
+ /**
+ * @param mActiveForwardingList the mActiveForwardingList to set
+ */
+ public void setmActiveForwardingList(int[] mActiveForwardingList) {
+ this.mActiveForwardingList = mActiveForwardingList;
+ }
+
+ /**
+ * @param baseUrl the baseUrl to set
+ */
+ public void setBaseUrl(String baseUrl) {
+ this.baseUrl = baseUrl;
+ }
+
+ /**
+ * @param credits the credits to set
+ */
+ public void setCredits(int credits) {
+ this.credits = credits;
+ }
+
+ /**
+ * @param defaultGreetingId the defaultGreetingId to set
+ */
+ public void setDefaultGreetingId(int defaultGreetingId) {
+ this.defaultGreetingId = defaultGreetingId;
+ }
+
+ /**
+ * @param mDidInfos the mDidInfos to set
+ */
+ public void setmDidInfos(String[] mDidInfos) {
+ this.mDidInfos = mDidInfos;
+ }
+
+ /**
+ * @param directConnect the directConnect to set
+ */
+ public void setDirectConnect(boolean directConnect) {
+ this.directConnect = directConnect;
+ }
+
+ /**
+ * @param mDisabledIdMap the mDisabledIdMap to set
+ */
+ public void setmDisabledIdList(DisabledId[] mDisabledIdList) {
+ this.mDisabledIdMap = mDisabledIdList;
+ }
+
+ /**
+ * @param doNotDisturb the doNotDisturb to set
+ */
+ public void setDoNotDisturb(boolean doNotDisturb) {
+ this.doNotDisturb = doNotDisturb;
+ }
+
+ /**
+ * @param emailAddresses the emailAddresses to set
+ */
+ public void setEmailAddresses(EmailAddress[] emailAddresses) {
+ this.emailAddresses = emailAddresses;
+ }
+
+ /**
+ * @param emailNotificationActive the emailNotificationActive to set
+ */
+ public void setEmailNotificationActive(boolean emailNotificationActive) {
+ this.emailNotificationActive = emailNotificationActive;
+ }
+
+ /**
+ * @param emailNotificationAddress the emailNotificationAddress to set
+ */
+ public void setEmailNotificationAddress(String emailNotificationAddress) {
+ this.emailNotificationAddress = emailNotificationAddress;
+ }
+
+ /**
+ * @param greetings the greetings to set
+ */
+ public void setGreetings(Greeting[] greetings) {
+ this.greetings = greetings;
+ }
+
+ /**
+ * @param groupList the groupList to set
+ */
+ public void setGroupList(String[] groupList) {
+ this.groupList = groupList;
+ }
+
+ /**
+ * @param groups the groups to set
+ */
+ public void setGroups(Group[] groups) {
+ this.groups = groups;
+ }
+
+ /**
+ * @param language the language to set
+ */
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ /**
+ * @param primaryDid the primaryDid to set
+ */
+ public void setPrimaryDid(String primaryDid) {
+ this.primaryDid = primaryDid;
+ }
+
+ /**
+ * @param screenBehavior the screenBehavior to set
+ */
+ public void setScreenBehavior(int screenBehavior) {
+ this.screenBehavior = screenBehavior;
+ }
+
+ /**
+ * @param showTranscripts the showTranscripts to set
+ */
+ public void setShowTranscripts(boolean showTranscripts) {
+ this.showTranscripts = showTranscripts;
+ }
+
+ /**
+ * @param smsNotifications the smsNotifications to set
+ */
+ public void setSmsNotifications(String[] smsNotifications) {
+ this.smsNotifications = smsNotifications;
+ }
+
+ /**
+ * @param smsToEmailActive the smsToEmailActive to set
+ */
+ public void setSmsToEmailActive(boolean smsToEmailActive) {
+ this.smsToEmailActive = smsToEmailActive;
+ }
+
+ /**
+ * @param smsToEmailSubject the smsToEmailSubject to set
+ */
+ public void setSmsToEmailSubject(boolean smsToEmailSubject) {
+ this.smsToEmailSubject = smsToEmailSubject;
+ }
+
+ /**
+ * @param spam the spam to set
+ */
+ public void setSpam(String spam) {
+ this.spam = spam;
+ }
+
+ /**
+ * @param timezone the timezone to set
+ */
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
+ }
+
+ /**
+ * @param useDidAsCallerId the useDidAsCallerId to set
+ */
+ public void setUseDidAsCallerId(boolean useDidAsCallerId) {
+ this.useDidAsCallerId = useDidAsCallerId;
+ }
+
+ /**
+ * @param useDidAsSource the useDidAsSource to set
+ */
+ public void setUseDidAsSource(boolean useDidAsSource) {
+ this.useDidAsSource = useDidAsSource;
+ }
+
+
+
+}
diff --git a/src/com/techventus/server/voice/datatypes/Wd.java b/src/main/java/com/techventus/server/voice/datatypes/Wd.java
similarity index 68%
rename from src/com/techventus/server/voice/datatypes/Wd.java
rename to src/main/java/com/techventus/server/voice/datatypes/Wd.java
index e864615..60db504 100644
--- a/src/com/techventus/server/voice/datatypes/Wd.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/Wd.java
@@ -1,25 +1,25 @@
-
-package com.techventus.server.voice.datatypes;
-
-import java.util.List;
-/**
- * Weekday setting of a phone
- *
- */
-public class Wd{
- private boolean allDay;
- private List times;
-
- public boolean getAllDay(){
- return this.allDay;
- }
- public void setAllDay(boolean allDay){
- this.allDay = allDay;
- }
- public List getTimes(){
- return this.times;
- }
- public void setTimes(List times){
- this.times = times;
- }
-}
+
+package com.techventus.server.voice.datatypes;
+
+import java.util.List;
+/**
+ * Weekday setting of a phone
+ *
+ */
+public class Wd{
+ private boolean allDay;
+ private List times;
+
+ public boolean getAllDay(){
+ return this.allDay;
+ }
+ public void setAllDay(boolean allDay){
+ this.allDay = allDay;
+ }
+ public List getTimes(){
+ return this.times;
+ }
+ public void setTimes(List times){
+ this.times = times;
+ }
+}
diff --git a/src/com/techventus/server/voice/datatypes/We.java b/src/main/java/com/techventus/server/voice/datatypes/We.java
similarity index 67%
rename from src/com/techventus/server/voice/datatypes/We.java
rename to src/main/java/com/techventus/server/voice/datatypes/We.java
index 49fafe8..bdf70be 100644
--- a/src/com/techventus/server/voice/datatypes/We.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/We.java
@@ -1,26 +1,26 @@
-
-package com.techventus.server.voice.datatypes;
-
-import java.util.List;
-/**
- *
- * Weekend setting of a phone
- *
- */
-public class We{
- private boolean allDay;
- private List times;
-
- public boolean getAllDay(){
- return this.allDay;
- }
- public void setAllDay(boolean allDay){
- this.allDay = allDay;
- }
- public List getTimes(){
- return this.times;
- }
- public void setTimes(List times){
- this.times = times;
- }
-}
+
+package com.techventus.server.voice.datatypes;
+
+import java.util.List;
+/**
+ *
+ * Weekend setting of a phone
+ *
+ */
+public class We{
+ private boolean allDay;
+ private List times;
+
+ public boolean getAllDay(){
+ return this.allDay;
+ }
+ public void setAllDay(boolean allDay){
+ this.allDay = allDay;
+ }
+ public List getTimes(){
+ return this.times;
+ }
+ public void setTimes(List times){
+ this.times = times;
+ }
+}
diff --git a/src/com/techventus/server/voice/datatypes/WebCallButton.java b/src/main/java/com/techventus/server/voice/datatypes/WebCallButton.java
similarity index 96%
rename from src/com/techventus/server/voice/datatypes/WebCallButton.java
rename to src/main/java/com/techventus/server/voice/datatypes/WebCallButton.java
index 1930d4a..1e16027 100644
--- a/src/com/techventus/server/voice/datatypes/WebCallButton.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/WebCallButton.java
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package com.techventus.server.voice.datatypes;
diff --git a/src/com/techventus/server/voice/datatypes/records/Call.java b/src/main/java/com/techventus/server/voice/datatypes/records/Call.java
similarity index 99%
rename from src/com/techventus/server/voice/datatypes/records/Call.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/Call.java
index fc4cd28..f4c4fbc 100644
--- a/src/com/techventus/server/voice/datatypes/records/Call.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/Call.java
@@ -20,7 +20,7 @@ public Call(String id, String title, Date date, Contact contact, boolean read) {
super(id, title, date, contact, read);
// TODO Auto-generated constructor stub
}
-
+
@Override
public String toString() {
String ret = "";
@@ -40,5 +40,5 @@ public String toString() {
return ret;
}
-
+
}
diff --git a/src/com/techventus/server/voice/datatypes/records/Record.java b/src/main/java/com/techventus/server/voice/datatypes/records/Record.java
similarity index 98%
rename from src/com/techventus/server/voice/datatypes/records/Record.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/Record.java
index 8b172e5..9bdb503 100644
--- a/src/com/techventus/server/voice/datatypes/records/Record.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/Record.java
@@ -6,12 +6,12 @@
/**
- *
+ *
* A Record is one entry in a Voice record list(like the Inbox)
- * An implemented Class is a call entry or an SMS or a Voicemail
- *
+ * An implemented Class is a call entry or an SMS or a Voicemail
+ *
* TODO give better name?
- *
+ *
* @author Tobias Eisentraeger
*
*/
@@ -26,7 +26,7 @@ public abstract class Record {
protected Contact contact;
/** true if the message is read, false if not **/
protected boolean read;
-
+
public Record(String id, String title, Date date, Contact contact, boolean read) {
super();
this.id = id;
@@ -35,7 +35,7 @@ public Record(String id, String title, Date date, Contact contact, boolean read)
this.contact = contact;
this.read = read;
}
-
+
/**
* @return the id
*/
@@ -51,7 +51,7 @@ public String getId() {
public void setId(String id) {
this.id = id;
}
-
+
/**
* Gets a boolean for whether or not the conversation has been read.
*
@@ -99,7 +99,7 @@ public void setContact(Contact pContact) {
}
/** Returns a String representation **/
public abstract String toString();
-
+
public boolean isVoicemail() {
if(this instanceof Voicemail) {
return true;
@@ -121,5 +121,5 @@ public boolean isShortMessage() {
return false;
}
}
-
+
}
diff --git a/src/com/techventus/server/voice/datatypes/records/SMS.java b/src/main/java/com/techventus/server/voice/datatypes/records/SMS.java
similarity index 98%
rename from src/com/techventus/server/voice/datatypes/records/SMS.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/SMS.java
index c46962a..fe06e27 100644
--- a/src/com/techventus/server/voice/datatypes/records/SMS.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/SMS.java
@@ -6,9 +6,9 @@
/**
* Represents a SMS message.
- *
+ *
* @author Tiago Proenca (tproenca)
- *
+ *
*/
public class SMS implements Comparable {
@@ -23,7 +23,7 @@ public class SMS implements Comparable {
/**
* Creates a SMS instance.
- *
+ *
* @param from
* the contact that sent the message
* @param the
@@ -39,7 +39,7 @@ public SMS(Contact from, String content, Date dateTime) {
/**
* Returns the contact that sent the message.
- *
+ *
* @return the contact that sent the message
*/
public Contact getFrom() {
@@ -48,7 +48,7 @@ public Contact getFrom() {
/**
* Returns the message's content.
- *
+ *
* @return the message's content
*/
public String getContent() {
@@ -57,7 +57,7 @@ public String getContent() {
/**
* Returns the message's timestamp.
- *
+ *
* @return the message's timestamp
*/
public Date getDateTime() {
@@ -66,7 +66,7 @@ public Date getDateTime() {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/src/com/techventus/server/voice/datatypes/records/SMSThread.java b/src/main/java/com/techventus/server/voice/datatypes/records/SMSThread.java
similarity index 97%
rename from src/com/techventus/server/voice/datatypes/records/SMSThread.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/SMSThread.java
index 7fbfed0..d84536f 100644
--- a/src/com/techventus/server/voice/datatypes/records/SMSThread.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/SMSThread.java
@@ -9,9 +9,9 @@
/**
* Represents a thread of SMS messages.
- *
+ *
* @author Tiago Proenca (tproenca)
- *
+ *
*/
public class SMSThread extends Record {
@@ -23,7 +23,7 @@ public class SMSThread extends Record {
/**
* Creates a SMSThread instance.
- *
+ *
* @param id
* the thread's ID
* @param note
@@ -45,7 +45,7 @@ public SMSThread(String id, String note, Date date, Contact contact,
/**
* Adds a SMS object to this thread.
- *
+ *
* @param sms
* a SMS object.
*/
@@ -55,7 +55,7 @@ public void addSMS(SMS sms) {
/**
* Removes a SMS object from this thread.
- *
+ *
* @param sms
* a SMS object.
*/
@@ -65,7 +65,7 @@ public void removeSMS(SMS sms) {
/**
* Returns all SMS that exist in this thread.
- *
+ *
* @return all SMS objects.
*/
public Collection getAllSMS() {
@@ -74,7 +74,7 @@ public Collection getAllSMS() {
/**
* Returns the thread's note.
- *
+ *
* @return the thread's note.
*/
public String getNote() {
@@ -83,7 +83,7 @@ public String getNote() {
/**
* Returns whether this thread is starred.
- *
+ *
* @return whether this thread is starred
*/
public boolean isStarred() {
@@ -92,7 +92,7 @@ public boolean isStarred() {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/src/com/techventus/server/voice/datatypes/records/ShortMessage.java b/src/main/java/com/techventus/server/voice/datatypes/records/ShortMessage.java
similarity index 99%
rename from src/com/techventus/server/voice/datatypes/records/ShortMessage.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/ShortMessage.java
index d33bfab..a851239 100644
--- a/src/com/techventus/server/voice/datatypes/records/ShortMessage.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/ShortMessage.java
@@ -20,7 +20,7 @@ public ShortMessage(String id, String title, Date date, Contact contact, boolean
super(id, title, date, contact, read);
// TODO Auto-generated constructor stub
}
-
+
@Override
public String toString() {
String ret = "";
@@ -41,5 +41,5 @@ public String toString() {
}
-
+
}
diff --git a/src/com/techventus/server/voice/datatypes/records/Transcript.java b/src/main/java/com/techventus/server/voice/datatypes/records/Transcript.java
similarity index 100%
rename from src/com/techventus/server/voice/datatypes/records/Transcript.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/Transcript.java
diff --git a/src/com/techventus/server/voice/datatypes/records/TranscriptElement.java b/src/main/java/com/techventus/server/voice/datatypes/records/TranscriptElement.java
similarity index 97%
rename from src/com/techventus/server/voice/datatypes/records/TranscriptElement.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/TranscriptElement.java
index 45d271d..2098fef 100644
--- a/src/com/techventus/server/voice/datatypes/records/TranscriptElement.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/TranscriptElement.java
@@ -4,9 +4,9 @@
/**
* One Element in a Transcript - normally a word.
- * Each Element has a ReccognitionLevel indicating how sure google is
+ * Each Element has a ReccognitionLevel indicating how sure google is
* that the word is recognised correctly.
- *
+ *
* @author Tobias Eisentraeger
*
*/
@@ -20,7 +20,7 @@ public enum RecognitionLevel {
HIGH,
UNKNOWN;
}
-
+
/**
* Standard constructor
* @param text
@@ -32,7 +32,7 @@ public TranscriptElement(String text, String id, RecognitionLevel level) {
this.id = id;
this.level = level;
}
-
+
/**
* Creates a TranscriptElement based on the html, for example:
* Hello World!
@@ -41,26 +41,26 @@ public TranscriptElement(String text, String id, RecognitionLevel level) {
public static TranscriptElement extractTransscriptElement(String html) {
String lId;
try {
- lId = ParsingUtil.removeUninterestingParts(html,"id=\"","\"",false);
+ lId = ParsingUtil.removeUninterestingParts(html,"id=\"","\"",false);
} catch (Exception e) {
lId = "";
}
-
+
String levelSt;
try {
- levelSt = ParsingUtil.removeUninterestingParts(html,"class=\"gc-word-","\"",false);
+ levelSt = ParsingUtil.removeUninterestingParts(html,"class=\"gc-word-","\"",false);
} catch (Exception e) {
levelSt = "";
}
-
+
String ltext;
try {
- ltext = ParsingUtil.removeUninterestingParts(html,">","",false);
+ ltext = ParsingUtil.removeUninterestingParts(html,">","",false);
ltext = ParsingUtil.htmlEntitiesDecode(ltext);
} catch (Exception e) {
ltext = "";
}
-
+
if(levelSt!=null) {
if(levelSt.equals("med1")) {
return new TranscriptElement(ltext, lId, RecognitionLevel.MED1);
@@ -117,6 +117,6 @@ public RecognitionLevel getLevel() {
public void setLevel(RecognitionLevel level) {
this.level = level;
}
-
-
+
+
}
diff --git a/src/com/techventus/server/voice/datatypes/records/Voicemail.java b/src/main/java/com/techventus/server/voice/datatypes/records/Voicemail.java
similarity index 98%
rename from src/com/techventus/server/voice/datatypes/records/Voicemail.java
rename to src/main/java/com/techventus/server/voice/datatypes/records/Voicemail.java
index 79bd717..a19cbd4 100644
--- a/src/com/techventus/server/voice/datatypes/records/Voicemail.java
+++ b/src/main/java/com/techventus/server/voice/datatypes/records/Voicemail.java
@@ -6,7 +6,7 @@
/**
- *
+ *
* @author Tobias Eisentraeger
*
*/
@@ -16,9 +16,9 @@ public class Voicemail extends Record {
private Transcript transcript;
/** The url of the mp3 file with the voicemail **/
private String mp3Url;
-
+
/**
- *
+ *
* @param title
* @param date
* @param contact
@@ -29,7 +29,7 @@ public Voicemail(String id, String title, Date date, Contact contact, Transcript
this.transcript = transcript;
this.mp3Url = "https://www.google.com/voice/media/send_voicemail/"+id;
}
-
+
@Override
public void setId(String id) {
this.id = id;
@@ -63,8 +63,8 @@ public String getMp3Url() {
public void setMp3Url(String mp3Url) {
this.mp3Url = mp3Url;
}
-
-
+
+
@Override
public String toString() {
String ret = "";
@@ -89,9 +89,9 @@ public String toString() {
ret+="read="+read+";";
return ret;
}
-
-
-
-
+
+
+
+
}
diff --git a/src/com/techventus/server/voice/exception/AccountDeletedException.java b/src/main/java/com/techventus/server/voice/exception/AccountDeletedException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/AccountDeletedException.java
rename to src/main/java/com/techventus/server/voice/exception/AccountDeletedException.java
diff --git a/src/com/techventus/server/voice/exception/AccountDisabledException.java b/src/main/java/com/techventus/server/voice/exception/AccountDisabledException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/AccountDisabledException.java
rename to src/main/java/com/techventus/server/voice/exception/AccountDisabledException.java
diff --git a/src/com/techventus/server/voice/exception/AuthenticationException.java b/src/main/java/com/techventus/server/voice/exception/AuthenticationException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/AuthenticationException.java
rename to src/main/java/com/techventus/server/voice/exception/AuthenticationException.java
diff --git a/src/com/techventus/server/voice/exception/BadAuthenticationException.java b/src/main/java/com/techventus/server/voice/exception/BadAuthenticationException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/BadAuthenticationException.java
rename to src/main/java/com/techventus/server/voice/exception/BadAuthenticationException.java
diff --git a/src/com/techventus/server/voice/exception/CaptchaRequiredException.java b/src/main/java/com/techventus/server/voice/exception/CaptchaRequiredException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/CaptchaRequiredException.java
rename to src/main/java/com/techventus/server/voice/exception/CaptchaRequiredException.java
diff --git a/src/com/techventus/server/voice/exception/ERROR_CODE.java b/src/main/java/com/techventus/server/voice/exception/ERROR_CODE.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/ERROR_CODE.java
rename to src/main/java/com/techventus/server/voice/exception/ERROR_CODE.java
diff --git a/src/com/techventus/server/voice/exception/NotVerifiedException.java b/src/main/java/com/techventus/server/voice/exception/NotVerifiedException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/NotVerifiedException.java
rename to src/main/java/com/techventus/server/voice/exception/NotVerifiedException.java
diff --git a/src/com/techventus/server/voice/exception/ServiceDisabledException.java b/src/main/java/com/techventus/server/voice/exception/ServiceDisabledException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/ServiceDisabledException.java
rename to src/main/java/com/techventus/server/voice/exception/ServiceDisabledException.java
diff --git a/src/com/techventus/server/voice/exception/ServiceUnavailableException.java b/src/main/java/com/techventus/server/voice/exception/ServiceUnavailableException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/ServiceUnavailableException.java
rename to src/main/java/com/techventus/server/voice/exception/ServiceUnavailableException.java
diff --git a/src/com/techventus/server/voice/exception/TermsNotAgreedException.java b/src/main/java/com/techventus/server/voice/exception/TermsNotAgreedException.java
similarity index 100%
rename from src/com/techventus/server/voice/exception/TermsNotAgreedException.java
rename to src/main/java/com/techventus/server/voice/exception/TermsNotAgreedException.java
diff --git a/src/main/java/com/techventus/server/voice/util/ArrayUtil.java b/src/main/java/com/techventus/server/voice/util/ArrayUtil.java
new file mode 100644
index 0000000..ccc76f2
--- /dev/null
+++ b/src/main/java/com/techventus/server/voice/util/ArrayUtil.java
@@ -0,0 +1,73 @@
+package com.techventus.server.voice.util;
+
+import java.util.Collection;
+
+/**
+ * Created by josephmalone on 2016-11-18.
+ */
+public class ArrayUtil {
+ public static boolean isNullOrContainsEmpty(T[] array)
+ {
+ if (array == null || array.length == 0)
+ {
+ return true;
+ }
+
+ for (T val : array)
+ {
+ if (val == null)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static boolean isNullOrEmpty(Collection collection)
+ {
+ return collection == null || collection.isEmpty();
+ }
+
+ /**
+ * Checks if a CharSequence is empty ("") or null.
+ *
+ *
+ * StringUtils.isEmpty(null) = true
+ * StringUtils.isEmpty("") = true
+ * StringUtils.isEmpty(" ") = false
+ * StringUtils.isEmpty("bob") = false
+ * StringUtils.isEmpty(" bob ") = false
+ *
+ *
+ * NOTE: This method changed in Lang version 2.0.
+ * It no longer trims the CharSequence.
+ * That functionality is available in isBlank().
+ *
+ * @param cs the CharSequence to check, may be null
+ * @return {@code true} if the CharSequence is empty or null
+ * @since 3.0 Changed signature from isEmpty(String) to isEmpty(CharSequence)
+ */
+ public static boolean isEmpty(final CharSequence cs) {
+ return cs == null || cs.length() == 0;
+ }
+
+ /**
+ * Checks if a CharSequence is not empty ("") and not null.
+ *
+ *
+ * StringUtils.isNotEmpty(null) = false
+ * StringUtils.isNotEmpty("") = false
+ * StringUtils.isNotEmpty(" ") = true
+ * StringUtils.isNotEmpty("bob") = true
+ * StringUtils.isNotEmpty(" bob ") = true
+ *
+ *
+ * @param cs the CharSequence to check, may be null
+ * @return {@code true} if the CharSequence is not empty and not null
+ * @since 3.0 Changed signature from isNotEmpty(String) to isNotEmpty(CharSequence)
+ */
+ public static boolean isNotEmpty(final CharSequence cs) {
+ return !isEmpty(cs);
+ }
+}
diff --git a/src/com/techventus/server/voice/util/JSONContants.java b/src/main/java/com/techventus/server/voice/util/JSONContants.java
similarity index 100%
rename from src/com/techventus/server/voice/util/JSONContants.java
rename to src/main/java/com/techventus/server/voice/util/JSONContants.java
diff --git a/src/com/techventus/server/voice/util/ParsingUtil.java b/src/main/java/com/techventus/server/voice/util/ParsingUtil.java
similarity index 97%
rename from src/com/techventus/server/voice/util/ParsingUtil.java
rename to src/main/java/com/techventus/server/voice/util/ParsingUtil.java
index dd94e99..32aad7b 100644
--- a/src/com/techventus/server/voice/util/ParsingUtil.java
+++ b/src/main/java/com/techventus/server/voice/util/ParsingUtil.java
@@ -9,7 +9,7 @@
/**
* Collection of useful html parsing methods
- *
+ *
* @author Tobias Eisentraeger
*
*/
@@ -35,7 +35,7 @@ public static final String removeUninterestingParts(String text, String startBor
String ret="";
try {
if(text!=null&&startBorder!=null&&endBorder!=null&&(text.indexOf(startBorder)!=-1)&&(text.indexOf(endBorder)!=-1) ) {
-
+
if(includeBorders) {
text = text.substring(text.indexOf(startBorder));
if(text!=null) {
@@ -51,7 +51,7 @@ public static final String removeUninterestingParts(String text, String startBor
ret = null;
}
}
-
+
} else {
ret = null;
}
@@ -65,8 +65,8 @@ public static final String removeUninterestingParts(String text, String startBor
}
return ret;
}
-
-
+
+
//TODO use Apache commons StringEscapeUtils.unescapeHTML() ?
/**
* Replaces some speciel htmlEntities with a corresponding String.
@@ -75,13 +75,13 @@ public static final String removeUninterestingParts(String text, String startBor
* @return the Decoded HTML in String format
*/
public static String htmlEntitiesDecode(String s) {
- s=s.replaceAll("'", "'");
+ s=s.replaceAll("'", "'");
return s;
}
-
+
/**
* Json int array to int array.
- *
+ *
* @param array the array
* @return the int[]
*/
@@ -96,10 +96,10 @@ public static final int[] jsonIntArrayToIntArray(JSONArray array) {
}
return result;
}
-
+
/**
* Json string array to string array.
- *
+ *
* @param array the array
* @return the string[]
*/
@@ -114,10 +114,10 @@ public static final String[] jsonStringArrayToStringArray(JSONArray array) {
}
return result;
}
-
+
/**
* Json string array to string list.
- *
+ *
* @param settingsJSON the settings json
* @param stringList the string list
* @param key the key
@@ -131,10 +131,10 @@ public static final List jsonStringArrayToStringList(JSONObject settings
}
return stringList;
}
-
+
/**
* Converts a Json Integer array to an ArrayList of Integers.
- *
+ *
* @param settingsJSON the settings json
* @param integerList the integer list
* @param key the key corresponding to the JSON formatted integer array
@@ -149,18 +149,18 @@ public static final List jsonIntArrayToIntegerList(JSONObject settingsJ
}
return integerList;
}
-
+
/**
* String list to JSON array.
- *
+ *
* @param stringList the string list input
* @return the JSON array
* @throws JSONException the JSON exception
*/
- public static final JSONArray stringListToJsonArray(List stringList) throws JSONException {
+ public static final JSONArray stringListToJsonArray(List stringList) throws JSONException {
String[] lArray = (String[]) stringList.toArray(new String[stringList.size()]);
return new JSONArray(lArray);
}
-
-
+
+
}
\ No newline at end of file
diff --git a/src/com/techventus/server/voice/util/SMSParser.java b/src/main/java/com/techventus/server/voice/util/SMSParser.java
similarity index 97%
rename from src/com/techventus/server/voice/util/SMSParser.java
rename to src/main/java/com/techventus/server/voice/util/SMSParser.java
index 92749b9..a835787 100644
--- a/src/com/techventus/server/voice/util/SMSParser.java
+++ b/src/main/java/com/techventus/server/voice/util/SMSParser.java
@@ -7,12 +7,7 @@
import java.io.StringReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.dom4j.Document;
import org.dom4j.Element;
@@ -26,9 +21,9 @@
/**
* This class parses the SMS messages from the Google Voice XML response.
- *
+ *
* @author Tiago Proenca (tproenca)
- *
+ *
*/
public class SMSParser {
@@ -40,7 +35,7 @@ public class SMSParser {
/**
* Creates a SMSParser instance.
- *
+ *
* @param response
* the server's HTML response.
* @param me
@@ -53,7 +48,7 @@ public SMSParser(String response, Contact me) {
/**
* Creates a SMSParser instance.
- *
+ *
* @param response
* the server's HTML response.
* @param myPhoneNumber
@@ -66,7 +61,7 @@ public SMSParser(String response, String myPhoneNumber) {
/**
* Returns the SMS threads.
- *
+ *
* @return the SMS threads.
*/
public Collection getSMSThreads() {
@@ -120,7 +115,7 @@ public void write(int b) {
// }
// if(contact==null){
// System.err.println("NULL CONTACT "+element);
-//
+//
// }
SMSThread smsthread = threadMap.get(element.attribute(
GoogleVoice.THREAD_ID).getText());
@@ -133,7 +128,7 @@ public void write(int b) {
/**
* Parses the contact information from the DOM Element.
- *
+ *
* @param element
* the DOM Element
* @return the Contact
@@ -147,13 +142,13 @@ private Contact parseContact(Element element) {
.selectSingleNode(XPathQuery.MESSAGE_PORTRAIT));
String phoneNumber = phoneNumberNode == null ? name
: parsePhoneNumber(phoneNumberNode.getText());
-
-
+
+
//TODO TEST SIMPLIFY
// System.out.println("Parsing Contact...");
//JLM Phone Number Correction
List e = element.selectNodes(XPathQuery.MESSAGE_QUICKCALL);
-
+
for(Object o:e){
Node n = (Node)o;
String res = n.selectSingleNode(XPathQuery.MESSAGE_BOLD).getText();
@@ -164,16 +159,16 @@ private Contact parseContact(Element element) {
phoneNumber = "+1" + phoneNumber;
}
// System.out.println(phoneNumber);
-
- }
-
-
+
+ }
+
+
return new Contact(name, "", phoneNumber, imgURL);
}
/**
* Adds SMSs to their respective thread.
- *
+ *
* @param thread
* the SMSThread object.
* @param messages
@@ -181,9 +176,10 @@ private Contact parseContact(Element element) {
*/
private void addSMSsToThread(SMSThread thread, Element messages) {
SimpleDateFormat dateFormat = new SimpleDateFormat(
- GoogleVoice.DATE_FORMAT);
+ GoogleVoice.DATE_FORMAT, Locale.US);
SimpleDateFormat dateTimeFormat = new SimpleDateFormat(
- GoogleVoice.DATETIME_FORMAT);
+ GoogleVoice.DATETIME_FORMAT,Locale.US);
+
@SuppressWarnings("unchecked")
List elements = messages
.selectNodes(XPathQuery.MESSAGE_SMS_ROW);
@@ -206,6 +202,10 @@ private void addSMSsToThread(SMSThread thread, Element messages) {
&& from.equals(GoogleVoice.CONTACT_ME)) {
contact = me;
}
+ Date t = new Date();
+ System.out.println("parse datetimeformat "+dateTimeFormat.format(t));
+ System.out.println("parse dateFormat "+dateFormat.format(t));
+
Date time = dateTimeFormat.parse(dateFormat.format(thread
.getDate())
+ " " + dateTime);
@@ -224,7 +224,7 @@ private void addSMSsToThread(SMSThread thread, Element messages) {
* Builds a map between the thread id and a SMSThread object. Since we need
* to look for a SMSThread object quite often, this approach is preferable
* than a List, since it reduces the lookup operations from O(n) to O(1).
- *
+ *
* @param response
* the server's HTML response.
* @return a map between the thread id and a SMSThread object.
@@ -266,7 +266,7 @@ private Map buildSMSThreadMap(String response) {
/**
* Parses the contact's phone number from the server's HTML response.
- *
+ *
* @param phoneNumber
* the phone number from the server's HTML response.
* @return the contact's phone number.
@@ -281,7 +281,7 @@ private String parsePhoneNumber(String phoneNumber) {
/**
* Parses the contact's image URL from the DOM Element.
- *
+ *
* @param element
* the DOM Element
* @return the contact's image URL.
diff --git a/src/main/kotlin/.gitkeep b/src/main/kotlin/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/.gitkeep b/src/main/resources/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/test/java/.gitkeep b/src/test/java/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/test/java/com/techventus/server/voice/GVCookieManagerTest.java b/src/test/java/com/techventus/server/voice/GVCookieManagerTest.java
new file mode 100644
index 0000000..02e0d70
--- /dev/null
+++ b/src/test/java/com/techventus/server/voice/GVCookieManagerTest.java
@@ -0,0 +1,108 @@
+package com.techventus.server.voice;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.Properties;
+
+public class GVCookieManagerTest {
+
+ private static final String TEST_PROPERTIES_FILENAME = "google-auth.properties";
+ // Store the properties file in the same directory as the test class,
+ // assuming the build system adds this to the classpath.
+ private static final File TEST_PROPERTIES_FILE = new File("src/test/com/techventus/server/voice/" + TEST_PROPERTIES_FILENAME);
+
+ @Before
+ public void setUp() throws IOException {
+ // Create a dummy google-auth.properties file for testing
+ Properties props = new Properties();
+ props.setProperty("COOKIE_ONE", "VALUE_ONE");
+ props.setProperty("COOKIE_TWO", "VALUE_TWO");
+ props.setProperty("SID", "TEST_SID_VALUE");
+
+ OutputStream output = null;
+ try {
+ // Ensure parent directory exists
+ TEST_PROPERTIES_FILE.getParentFile().mkdirs();
+ output = new FileOutputStream(TEST_PROPERTIES_FILE);
+ props.store(output, "Test cookies for GVCookieManagerTest");
+ } finally {
+ if (output != null) {
+ try {
+ output.close();
+ } catch (IOException e) {
+ // Ignore
+ }
+ }
+ }
+
+ // Reset GVCookieManager's cookies before each test.
+ // This is a simplified approach. A more robust way might involve
+ // resetting the singleton instance or having a dedicated clear/reload method.
+ if (GVCookieManager.getInstance() != null) {
+ GVCookieManager.getInstance().clearCookies();
+ // Manually trigger reload for the test, as the constructor might not re-run
+ // or might not find the file if classpath issues exist during test execution.
+ // This relies on the fact that COOKIE_MAP is static or the instance is a singleton.
+ // The actual GVCookieManager.loadCookiesFromFile() is private, so we can't call it directly.
+ // We rely on the constructor calling it. For testing, we might need to expose a reload method
+ // or use reflection if this proves insufficient.
+ // For now, clearing and getting a new instance (if possible) or just re-evaluating after clear.
+ // The current GVCookieManager loads in its constructor, so clearing and then
+ // re-accessing the map via getInstance() should show the effects of the new file
+ // IF the classloader picks up the new file.
+ // The most reliable way is that GVCookieManager's constructor is called again
+ // or it has a public method to reload.
+ // Let's assume for now clearing existing cookies and then relying on a fresh load
+ // when getInstance() is called if the instance was null, or that the existing instance's map is tested.
+ // The critical part is that loadCookiesFromFile() populates COOKIE_MAP.
+ }
+ }
+
+ @Test
+ public void testLoadCookiesFromFile() {
+ // Force GVCookieManager to load from the properties file by getting the instance.
+ // The setUp method should have cleared previous state and created the new properties file.
+ // We need to ensure GVCookieManager re-initializes or re-loads.
+ // One way: If GVCookieManager.mInstance could be set to null (e.g. via reflection or a test-only method)
+ // For now, we assume that if the properties file is in the classpath, a new instantiation
+ // or the existing one's loadMap (if called on init) will pick it up.
+ // The current GVCookieManager loads in its constructor.
+ // Let's try to force re-initialization by clearing the static map and calling load again.
+ // This is a bit of a hack due to the singleton nature and private load method.
+
+ GVCookieManager manager = GVCookieManager.getInstance(); // Should trigger load if not already loaded
+ // or if load is part of constructor logic.
+
+ // If the load happens only once in the constructor and the instance is a singleton,
+ // we need a way to force a reload or test the map directly after setup.
+ // The GVCookieManager was modified to call loadCookiesFromFile() in its constructor.
+ // So, getting the instance *should* have loaded it if it was the first time,
+ // or if the class was reloaded.
+
+ Map cookies = manager.getCookies();
+
+ assertNotNull("Cookie map should not be null", cookies);
+ assertEquals("Should load COOKIE_ONE", "VALUE_ONE", cookies.get("COOKIE_ONE"));
+ assertEquals("Should load COOKIE_TWO", "VALUE_TWO", cookies.get("COOKIE_TWO"));
+ assertEquals("Should load SID", "TEST_SID_VALUE", cookies.get("SID"));
+ assertEquals("Should have loaded 3 cookies", 3, cookies.size());
+ }
+
+ @After
+ public void tearDown() {
+ // Delete the dummy properties file
+ if (TEST_PROPERTIES_FILE.exists()) {
+ TEST_PROPERTIES_FILE.delete();
+ }
+ // Clean up GVCookieManager state if necessary
+ GVCookieManager.getInstance().clearCookies();
+ }
+}
diff --git a/src/test/datatypes/ActiveForwardingIdTest.java b/src/test/java/datatypes/ActiveForwardingIdTest.java
similarity index 100%
rename from src/test/datatypes/ActiveForwardingIdTest.java
rename to src/test/java/datatypes/ActiveForwardingIdTest.java
diff --git a/src/test/datatypes/AllSettingsTest.java b/src/test/java/datatypes/AllSettingsTest.java
similarity index 100%
rename from src/test/datatypes/AllSettingsTest.java
rename to src/test/java/datatypes/AllSettingsTest.java
diff --git a/src/test/datatypes/ContactTest.java b/src/test/java/datatypes/ContactTest.java
similarity index 100%
rename from src/test/datatypes/ContactTest.java
rename to src/test/java/datatypes/ContactTest.java
diff --git a/src/test/datatypes/DisabledForwardingIdTest.java b/src/test/java/datatypes/DisabledForwardingIdTest.java
similarity index 100%
rename from src/test/datatypes/DisabledForwardingIdTest.java
rename to src/test/java/datatypes/DisabledForwardingIdTest.java
diff --git a/src/test/datatypes/DisabledIdTest.java b/src/test/java/datatypes/DisabledIdTest.java
similarity index 94%
rename from src/test/datatypes/DisabledIdTest.java
rename to src/test/java/datatypes/DisabledIdTest.java
index d84a260..9cd3640 100644
--- a/src/test/datatypes/DisabledIdTest.java
+++ b/src/test/java/datatypes/DisabledIdTest.java
@@ -1,140 +1,140 @@
-package test.datatypes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import org.junit.Test;
-
-import com.techventus.server.voice.datatypes.DisabledId;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-public class DisabledIdTest {
-
- // Golden DisabledId Object
- final DisabledId goldDisabledID = new DisabledId("1", false);
-
- // Test Object
- DisabledId testDisabledID;
- JSONObject tesJSONtDId = new JSONObject();
- String testString;
- List testList = new ArrayList();
-
- @Test
- public void testDisabledIDJSONNullObjectSaveModeTrue()
- throws JSONException {
-
- final JSONObject testJSONDId = new JSONObject();
-
- testDisabledID = new DisabledId(testJSONDId, true);
-
- Assert.assertNotNull(testDisabledID);
- }
-
- @Test
- public void testDisabledIDJSONNullObjectSaveModeFalse() {
-
- try {
- testDisabledID = new DisabledId(tesJSONtDId, false);
- } catch (Exception e) {
- testDisabledID = goldDisabledID;
- }
-
- Assert.assertEquals(goldDisabledID, testDisabledID);
- }
-
- @Test
- public void testDisabledIdJSONSaveModeFalse() throws JSONException {
-
- tesJSONtDId.put("id", "1");
- tesJSONtDId.put("disabled", false);
-
- testDisabledID = new DisabledId(tesJSONtDId, false);
-
- final boolean test = goldDisabledID.toString().equals(
- testDisabledID.toString());
-
- Assert.assertEquals(true, test);
- }
-
- @Test
- public void testDisabledIdJSONSaveModeTrue() throws JSONException {
-
- tesJSONtDId.put("id", "1");
- tesJSONtDId.put("disabled", false);
-
- testDisabledID = new DisabledId(tesJSONtDId, true);
-
- final boolean test = goldDisabledID.toString().equals(
- testDisabledID.toString());
-
- Assert.assertEquals(true, test);
- }
-
- @Test
- public void testCreateDisabledIdListFromJsonPartResponseEmptyString() {
-
- testString = "";
-
- Assert.assertEquals(testList, DisabledId.createDisabledIdListFromJsonPartResponse(testString));
-
- }
-
- @Test
- public void testCreateDisabledIdListFromJsonPartResponseNullString() {
-
- List testNullString = new ArrayList();
-
- try {
- testNullString = DisabledId.createDisabledIdListFromJsonPartResponse(testString);
- }
- catch(Exception e) {
- testString = "exception Caught";
- }
-
- Assert.assertEquals(testString = "exception Caught", testString);
- Assert.assertEquals(testList, testNullString);
-
- }
-
- @Test
- public void testCreateDisabledIdListFromJsonPartResponse() throws JSONException {
-
- final JSONArray testArray = new JSONArray();
- testArray.put("1");
- final JSONObject testObject = testArray.toJSONObject(testArray);
- testString = testObject.toString();
- testList.add(goldDisabledID);
-
- Assert.assertEquals(testList.toString(), DisabledId.createDisabledIdListFromJsonPartResponse(testString).toString());
-
- }
-
- @Test
- public void testCreateDisabledIdListFromJsonObjectNullObject() throws JSONException {
-
- Assert.assertEquals(testList.toString(), DisabledId.createListFromJsonObject(tesJSONtDId).toString());
-
- }
-
- @Test
- public void testCreateDisabledIdListFromJsonObject() throws JSONException {
-
- tesJSONtDId.put("1", false);
- testList.add(goldDisabledID);
-
- Assert.assertEquals(testList.toString(), DisabledId.createListFromJsonObject(tesJSONtDId).toString());
-
- }
-
-
-}
+package test.datatypes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import org.junit.Test;
+
+import com.techventus.server.voice.datatypes.DisabledId;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+public class DisabledIdTest {
+
+ // Golden DisabledId Object
+ final DisabledId goldDisabledID = new DisabledId("1", false);
+
+ // Test Object
+ DisabledId testDisabledID;
+ JSONObject tesJSONtDId = new JSONObject();
+ String testString;
+ List testList = new ArrayList();
+
+ @Test
+ public void testDisabledIDJSONNullObjectSaveModeTrue()
+ throws JSONException {
+
+ final JSONObject testJSONDId = new JSONObject();
+
+ testDisabledID = new DisabledId(testJSONDId, true);
+
+ Assert.assertNotNull(testDisabledID);
+ }
+
+ @Test
+ public void testDisabledIDJSONNullObjectSaveModeFalse() {
+
+ try {
+ testDisabledID = new DisabledId(tesJSONtDId, false);
+ } catch (Exception e) {
+ testDisabledID = goldDisabledID;
+ }
+
+ Assert.assertEquals(goldDisabledID, testDisabledID);
+ }
+
+ @Test
+ public void testDisabledIdJSONSaveModeFalse() throws JSONException {
+
+ tesJSONtDId.put("id", "1");
+ tesJSONtDId.put("disabled", false);
+
+ testDisabledID = new DisabledId(tesJSONtDId, false);
+
+ final boolean test = goldDisabledID.toString().equals(
+ testDisabledID.toString());
+
+ Assert.assertEquals(true, test);
+ }
+
+ @Test
+ public void testDisabledIdJSONSaveModeTrue() throws JSONException {
+
+ tesJSONtDId.put("id", "1");
+ tesJSONtDId.put("disabled", false);
+
+ testDisabledID = new DisabledId(tesJSONtDId, true);
+
+ final boolean test = goldDisabledID.toString().equals(
+ testDisabledID.toString());
+
+ Assert.assertEquals(true, test);
+ }
+
+ @Test
+ public void testCreateDisabledIdListFromJsonPartResponseEmptyString() {
+
+ testString = "";
+
+ Assert.assertEquals(testList, DisabledId.createDisabledIdListFromJsonPartResponse(testString));
+
+ }
+
+ @Test
+ public void testCreateDisabledIdListFromJsonPartResponseNullString() {
+
+ List testNullString = new ArrayList();
+
+ try {
+ testNullString = DisabledId.createDisabledIdListFromJsonPartResponse(testString);
+ }
+ catch(Exception e) {
+ testString = "exception Caught";
+ }
+
+ Assert.assertEquals(testString = "exception Caught", testString);
+ Assert.assertEquals(testList, testNullString);
+
+ }
+
+ @Test
+ public void testCreateDisabledIdListFromJsonPartResponse() throws JSONException {
+
+ final JSONArray testArray = new JSONArray();
+ testArray.put("1");
+ final JSONObject testObject = testArray.toJSONObject(testArray);
+ testString = testObject.toString();
+ testList.add(goldDisabledID);
+
+ Assert.assertEquals(testList.toString(), DisabledId.createDisabledIdListFromJsonPartResponse(testString).toString());
+
+ }
+
+ @Test
+ public void testCreateDisabledIdListFromJsonObjectNullObject() throws JSONException {
+
+ Assert.assertEquals(testList.toString(), DisabledId.createListFromJsonObject(tesJSONtDId).toString());
+
+ }
+
+ @Test
+ public void testCreateDisabledIdListFromJsonObject() throws JSONException {
+
+ tesJSONtDId.put("1", false);
+ testList.add(goldDisabledID);
+
+ Assert.assertEquals(testList.toString(), DisabledId.createListFromJsonObject(tesJSONtDId).toString());
+
+ }
+
+
+}
diff --git a/src/test/datatypes/EmailAddressTest.java b/src/test/java/datatypes/EmailAddressTest.java
similarity index 100%
rename from src/test/datatypes/EmailAddressTest.java
rename to src/test/java/datatypes/EmailAddressTest.java
diff --git a/src/test/datatypes/GreetingTest.java b/src/test/java/datatypes/GreetingTest.java
similarity index 100%
rename from src/test/datatypes/GreetingTest.java
rename to src/test/java/datatypes/GreetingTest.java
diff --git a/src/test/datatypes/GroupTest.java b/src/test/java/datatypes/GroupTest.java
similarity index 95%
rename from src/test/datatypes/GroupTest.java
rename to src/test/java/datatypes/GroupTest.java
index 5363e9e..84a46e6 100644
--- a/src/test/datatypes/GroupTest.java
+++ b/src/test/java/datatypes/GroupTest.java
@@ -1,265 +1,265 @@
-package test.datatypes;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.techventus.server.voice.datatypes.DisabledForwardingId;
-import com.techventus.server.voice.datatypes.Group;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-public class GroupTest {
- // testGroups
- Group testGroup;
- Group testGroup1;
- Group testGroup2;
- Group testGroup3;
-
- String testString;
- String resultString;
- private final static String TEST_ID = "testID";
-
- // DisabledForwardingIDs
- final DisabledForwardingId testDFId = new DisabledForwardingId(
- "2", true);
- final DisabledForwardingId testDFId1 = new DisabledForwardingId(
- "3", true);
-
- List testList = new ArrayList();
- List testList1 = new ArrayList();
- List resultList = new ArrayList();
- List testGrouplist = new ArrayList();
-
- JSONArray testJSArray1 = new JSONArray();
- JSONObject disabledFIDs = new JSONObject();
- JSONObject testJSONOb1 = new JSONObject();
- JSONObject testJSONOb3 = new JSONObject();
- JSONObject testGroupObject = new JSONObject();
-
- @Before
- public void setUp() throws Exception {
-
- // Populate DFID List1
- testList1.add(testDFId1);
- testList1.add(testDFId);
-
- // JSON Array to attempt to mirror populated list.
- testJSArray1.put(3);
- testJSArray1.put(2);
-
- // New JSON objects to mirror lists above.
- final JSONObject disabledFIDs1 = testJSArray1.toJSONObject(testJSArray1);
-
- // Construct Object 1
- testJSONOb1.put("id", TEST_ID);
- testJSONOb1.put("name", "testName");
- testJSONOb1.put("isCustomForwarding", false);
- testJSONOb1.put("isCustomGreeting", false);
- testJSONOb1.put("isCustomDirectConnect", false);
- testJSONOb1.put("directConnect", false);
- testJSONOb1.put("greetingId", 0);
- testJSONOb1.put("disabledForwardingIds", disabledFIDs);
-
- // Construct Object 3
- testJSONOb3.put("id", "testID1");
- testJSONOb3.put("name", "testName1");
- testJSONOb3.put("isCustomForwarding", false);
- testJSONOb3.put("isCustomGreeting", false);
- testJSONOb3.put("isCustomDirectConnect", false);
- testJSONOb3.put("directConnect", false);
- testJSONOb3.put("greetingId", 0);
- testJSONOb3.put("disabledForwardingIds", disabledFIDs1);
-
- // Instantiate testGroups
- testGroup = new Group(TEST_ID, "testName", false, testList, false,
- false, false, 0);
- testGroup1 = new Group(testJSONOb1);
- testGroup2 = new Group("testID1", "testName1", false, testList1, false,
- false, false, 0);
- testGroup3 = new Group(testJSONOb3);
-
- }
-
- @Test
- public void testJSONNullGroupObject() throws JSONException {
-
-
- final Group nullGroup = new Group(testGroupObject);
-
- resultString = "{id=null;name=null;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=null}";
-
- Assert.assertEquals(resultString, nullGroup.toString());
-
- }
-
- @Test
- public void testJSONGroupObjectEqualsJavaGroupObject() {
-
- final boolean test = testGroup.toString().equals(testGroup1.toString());
-
- Assert.assertEquals(true, test);
- }
-
- @Test
- public void testCreateGroupSettingsFromJsonResponse() {
-
- resultList.add(testGroup);
-
- testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"disabledForwardingIds\":{1},\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
-
- testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
-
- Assert.assertEquals(resultList.toString(), testGrouplist.toString());
- }
-
- @Test
- public void testCreateGroupSettingsFromJsonResponseNullDisabledForwardingID() {
-
- testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
-
- try {
- testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
- }
- catch(Exception e) {
- testGrouplist = resultList;
- }
- Assert.assertEquals(resultList, testGrouplist);
- }
-
- @Test
- public void testCreateGroupSettingsFromJsonResponseEmptyDisabledForwardingID() {
-
- resultList.add(testGroup);
-
- testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"disabledForwardingIds\":{},\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
-
- testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
-
- Assert.assertEquals(resultList.toString(), testGrouplist.toString());
- }
-
- @Test
- public void testListToJson() {
-
- testGrouplist.add(testGroup1);
- testGrouplist.add(testGroup3);
-
- resultString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false},\"testID1\":{\"id\":\"testID1\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{\"3\":true,\"2\":true},\"name\":\"testName1\",\"isCustomDirectConnect\":false,\"directConnect\":false}}";
-
- Assert.assertEquals(resultString, Group.listToJson(testGrouplist).toString());
-
- }
-
- @Test
- public void testCreateArrayFromJsonObject() throws JSONException {
-
- testGroupObject.put(TEST_ID,testJSONOb1);
-
- final Group[] resultGroupArray = {testGroup};
- final Group[] testGroupArray = Group.createArrayFromJsonObject(testGroupObject);
-
- Assert.assertEquals(resultGroupArray[0].toString(), testGroupArray[0].toString());
-
- }
-
- @Test
- public void testCreateJSONObjectArrayFromJsonObject() throws JSONException {
-
- resultString = "{\"testID\":\"{id=testID;name=testName;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=[]}\"}";
-
- testGroupObject.put("obj1", testJSONOb1);
-
- final JSONObject[] testObjectArray = Group.createJSONObjectArrayFromJsonObject(testGroupObject);
-
- Assert.assertEquals(resultString, testObjectArray[0].toString());
- }
-
- @Test
- public void testCreateJSONObjectFromJsonObject() throws JSONException {
-
- resultString = "{\"testID\":\"{id=testID;name=testName;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=[]}\"}";
-
- testGroupObject.put("obj1", testJSONOb1);
-
- final JSONObject testObject = Group.createJSONObjectFromJsonObject(testGroupObject);
-
- Assert.assertEquals(resultString, testObject.toString());
-
- }
-
- @Test
- public void testGroupsArrayToJsonObject() throws JSONException {
-
- resultString = "{\"testID\":{\"id\":\"testID\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}}";
-
- final Group[] testObjectArray = {testGroup};
-
- Assert.assertEquals(resultString, Group.groupsArrayToJsonObject(testObjectArray).toString());
- }
-
- @Test
- public void testIsPhoneDisabledFalseNullList() throws JSONException {
-
-
-
- final JSONObject testJSONOb4 = new JSONObject();
- testJSONOb4.put("id", TEST_ID);
- testJSONOb4.put("name", "testName");
- testJSONOb4.put("isCustomForwarding", false);
- testJSONOb4.put("isCustomGreeting", false);
- testJSONOb4.put("isCustomDirectConnect", false);
- testJSONOb4.put("directConnect", false);
- testJSONOb4.put("greetingId", 0);
-
- final Group testGroup4 = new Group(testJSONOb4);
-
- final boolean testNullList = testGroup4.isPhoneDisabled(1);
-
- Assert.assertEquals(false, testNullList);
-
-
- }
-
- @Test
- public void testIsPhoneDisabledFalseEmptyList() {
-
- final boolean test = testGroup.isPhoneDisabled(1);
- final boolean test1 = testGroup1.isPhoneDisabled(1);
-
- Assert.assertEquals(false, test);
- Assert.assertEquals(false, test1);
- }
-
- @Test
- public void testIsPhoneDisabledFalseNotInList() throws JSONException {
-
- final boolean test = testGroup2.isPhoneDisabled(1);
- final boolean test1 = testGroup3.isPhoneDisabled(1);
-
- Assert.assertEquals(false, test);
- Assert.assertEquals(false, test1);
- }
-
- @Test
- public void testIsPhoneDisabledTrue() throws JSONException {
-
- final boolean test = testGroup2.isPhoneDisabled(2);
- final boolean test1 = testGroup3.isPhoneDisabled(2);
-
- Assert.assertEquals(true, test);
- Assert.assertEquals(true, test1);
- }
-
-}
+package test.datatypes;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.techventus.server.voice.datatypes.DisabledForwardingId;
+import com.techventus.server.voice.datatypes.Group;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+public class GroupTest {
+ // testGroups
+ Group testGroup;
+ Group testGroup1;
+ Group testGroup2;
+ Group testGroup3;
+
+ String testString;
+ String resultString;
+ private final static String TEST_ID = "testID";
+
+ // DisabledForwardingIDs
+ final DisabledForwardingId testDFId = new DisabledForwardingId(
+ "2", true);
+ final DisabledForwardingId testDFId1 = new DisabledForwardingId(
+ "3", true);
+
+ List testList = new ArrayList();
+ List testList1 = new ArrayList();
+ List resultList = new ArrayList();
+ List testGrouplist = new ArrayList();
+
+ JSONArray testJSArray1 = new JSONArray();
+ JSONObject disabledFIDs = new JSONObject();
+ JSONObject testJSONOb1 = new JSONObject();
+ JSONObject testJSONOb3 = new JSONObject();
+ JSONObject testGroupObject = new JSONObject();
+
+ @Before
+ public void setUp() throws Exception {
+
+ // Populate DFID List1
+ testList1.add(testDFId1);
+ testList1.add(testDFId);
+
+ // JSON Array to attempt to mirror populated list.
+ testJSArray1.put(3);
+ testJSArray1.put(2);
+
+ // New JSON objects to mirror lists above.
+ final JSONObject disabledFIDs1 = testJSArray1.toJSONObject(testJSArray1);
+
+ // Construct Object 1
+ testJSONOb1.put("id", TEST_ID);
+ testJSONOb1.put("name", "testName");
+ testJSONOb1.put("isCustomForwarding", false);
+ testJSONOb1.put("isCustomGreeting", false);
+ testJSONOb1.put("isCustomDirectConnect", false);
+ testJSONOb1.put("directConnect", false);
+ testJSONOb1.put("greetingId", 0);
+ testJSONOb1.put("disabledForwardingIds", disabledFIDs);
+
+ // Construct Object 3
+ testJSONOb3.put("id", "testID1");
+ testJSONOb3.put("name", "testName1");
+ testJSONOb3.put("isCustomForwarding", false);
+ testJSONOb3.put("isCustomGreeting", false);
+ testJSONOb3.put("isCustomDirectConnect", false);
+ testJSONOb3.put("directConnect", false);
+ testJSONOb3.put("greetingId", 0);
+ testJSONOb3.put("disabledForwardingIds", disabledFIDs1);
+
+ // Instantiate testGroups
+ testGroup = new Group(TEST_ID, "testName", false, testList, false,
+ false, false, 0);
+ testGroup1 = new Group(testJSONOb1);
+ testGroup2 = new Group("testID1", "testName1", false, testList1, false,
+ false, false, 0);
+ testGroup3 = new Group(testJSONOb3);
+
+ }
+
+ @Test
+ public void testJSONNullGroupObject() throws JSONException {
+
+
+ final Group nullGroup = new Group(testGroupObject);
+
+ resultString = "{id=null;name=null;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=null}";
+
+ Assert.assertEquals(resultString, nullGroup.toString());
+
+ }
+
+ @Test
+ public void testJSONGroupObjectEqualsJavaGroupObject() {
+
+ final boolean test = testGroup.toString().equals(testGroup1.toString());
+
+ Assert.assertEquals(true, test);
+ }
+
+ @Test
+ public void testCreateGroupSettingsFromJsonResponse() {
+
+ resultList.add(testGroup);
+
+ testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"disabledForwardingIds\":{1},\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
+
+ testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
+
+ Assert.assertEquals(resultList.toString(), testGrouplist.toString());
+ }
+
+ @Test
+ public void testCreateGroupSettingsFromJsonResponseNullDisabledForwardingID() {
+
+ testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
+
+ try {
+ testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
+ }
+ catch(Exception e) {
+ testGrouplist = resultList;
+ }
+ Assert.assertEquals(resultList, testGrouplist);
+ }
+
+ @Test
+ public void testCreateGroupSettingsFromJsonResponseEmptyDisabledForwardingID() {
+
+ resultList.add(testGroup);
+
+ testString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"name\":\"testName\",\"disabledForwardingIds\":{},\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"isCustomDirectConnect\":false,\"directConnect\":false,\"greetingId\":0,\"isCircle\":true,\"isCustomTranscriptionLanguage\":false,\"transcriptionLanguage\":\"\"},\"groupList\"";
+
+ testGrouplist = Group.createGroupSettingsFromJsonResponse(testString);
+
+ Assert.assertEquals(resultList.toString(), testGrouplist.toString());
+ }
+
+ @Test
+ public void testListToJson() {
+
+ testGrouplist.add(testGroup1);
+ testGrouplist.add(testGroup3);
+
+ resultString = "\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false},\"testID1\":{\"id\":\"testID1\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{\"3\":true,\"2\":true},\"name\":\"testName1\",\"isCustomDirectConnect\":false,\"directConnect\":false}}";
+
+ Assert.assertEquals(resultString, Group.listToJson(testGrouplist).toString());
+
+ }
+
+ @Test
+ public void testCreateArrayFromJsonObject() throws JSONException {
+
+ testGroupObject.put(TEST_ID,testJSONOb1);
+
+ final Group[] resultGroupArray = {testGroup};
+ final Group[] testGroupArray = Group.createArrayFromJsonObject(testGroupObject);
+
+ Assert.assertEquals(resultGroupArray[0].toString(), testGroupArray[0].toString());
+
+ }
+
+ @Test
+ public void testCreateJSONObjectArrayFromJsonObject() throws JSONException {
+
+ resultString = "{\"testID\":\"{id=testID;name=testName;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=[]}\"}";
+
+ testGroupObject.put("obj1", testJSONOb1);
+
+ final JSONObject[] testObjectArray = Group.createJSONObjectArrayFromJsonObject(testGroupObject);
+
+ Assert.assertEquals(resultString, testObjectArray[0].toString());
+ }
+
+ @Test
+ public void testCreateJSONObjectFromJsonObject() throws JSONException {
+
+ resultString = "{\"testID\":\"{id=testID;name=testName;isCustomDirectConnect=false;directConnect=false;isCustomGreeting=false;isCustomForwarding=false;greetingId=0;disabledForwardingIds=[]}\"}";
+
+ testGroupObject.put("obj1", testJSONOb1);
+
+ final JSONObject testObject = Group.createJSONObjectFromJsonObject(testGroupObject);
+
+ Assert.assertEquals(resultString, testObject.toString());
+
+ }
+
+ @Test
+ public void testGroupsArrayToJsonObject() throws JSONException {
+
+ resultString = "{\"testID\":{\"id\":\"testID\",\"greetingId\":0,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}}";
+
+ final Group[] testObjectArray = {testGroup};
+
+ Assert.assertEquals(resultString, Group.groupsArrayToJsonObject(testObjectArray).toString());
+ }
+
+ @Test
+ public void testIsPhoneDisabledFalseNullList() throws JSONException {
+
+
+
+ final JSONObject testJSONOb4 = new JSONObject();
+ testJSONOb4.put("id", TEST_ID);
+ testJSONOb4.put("name", "testName");
+ testJSONOb4.put("isCustomForwarding", false);
+ testJSONOb4.put("isCustomGreeting", false);
+ testJSONOb4.put("isCustomDirectConnect", false);
+ testJSONOb4.put("directConnect", false);
+ testJSONOb4.put("greetingId", 0);
+
+ final Group testGroup4 = new Group(testJSONOb4);
+
+ final boolean testNullList = testGroup4.isPhoneDisabled(1);
+
+ Assert.assertEquals(false, testNullList);
+
+
+ }
+
+ @Test
+ public void testIsPhoneDisabledFalseEmptyList() {
+
+ final boolean test = testGroup.isPhoneDisabled(1);
+ final boolean test1 = testGroup1.isPhoneDisabled(1);
+
+ Assert.assertEquals(false, test);
+ Assert.assertEquals(false, test1);
+ }
+
+ @Test
+ public void testIsPhoneDisabledFalseNotInList() throws JSONException {
+
+ final boolean test = testGroup2.isPhoneDisabled(1);
+ final boolean test1 = testGroup3.isPhoneDisabled(1);
+
+ Assert.assertEquals(false, test);
+ Assert.assertEquals(false, test1);
+ }
+
+ @Test
+ public void testIsPhoneDisabledTrue() throws JSONException {
+
+ final boolean test = testGroup2.isPhoneDisabled(2);
+ final boolean test1 = testGroup3.isPhoneDisabled(2);
+
+ Assert.assertEquals(true, test);
+ Assert.assertEquals(true, test1);
+ }
+
+}
diff --git a/src/test/datatypes/PhoneTest.java b/src/test/java/datatypes/PhoneTest.java
similarity index 100%
rename from src/test/datatypes/PhoneTest.java
rename to src/test/java/datatypes/PhoneTest.java
diff --git a/src/test/datatypes/SettingTest.java b/src/test/java/datatypes/SettingTest.java
similarity index 95%
rename from src/test/datatypes/SettingTest.java
rename to src/test/java/datatypes/SettingTest.java
index 82e9878..e2d4c19 100644
--- a/src/test/datatypes/SettingTest.java
+++ b/src/test/java/datatypes/SettingTest.java
@@ -1,295 +1,295 @@
-/**
- *
- */
-package test.datatypes;
-
-import junit.framework.Assert;
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.techventus.server.voice.datatypes.DisabledId;
-import com.techventus.server.voice.datatypes.Group;
-import com.techventus.server.voice.datatypes.Setting;
-
-/**
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-public class SettingTest {
-
- Setting testSetting;
- Setting testSetting1;
- Setting testSetting2;
- Group testGroup;
- String resultString;
-
- final static String DIRECT_CONNECT = "directConnect";
- final static String A_F_IDS = "activeForwardingIds";
- final static String BASE_URL = "baseUrl";
- final static String TEST_URL = "testURL";
- final static String CREDITS = "credits";
- final static String DFID = "defaultGreetingId";
- final static String DID_INFOS = "didInfos";
- final static String DID_MAP = "disabledIdMap";
- final static String D_N_D = "doNotDisturb";
- final static String EMAIL_ADD = "emailAddresses";
- final static String EMAIL_NOTE_ACTIVE = "emailNotificationActive";
- final static String TEST_E_ADDRESS = "testEmailAddress";
- final static String EMAIL_NOTE_ADD = "emailNotificationAddress";
- final static String GREETINGS = "greetings";
- final static String GROUPLIST = "groupList";
- final static String GROUPS = "groups";
- final static String LANGUAGE = "language";
- final static String ENGLISH = "English";
- final static String PRIME_DID = "primaryDid";
- final static String TEST_DID = "testDiD";
- final static String SCREEN_BEHAVE = "screenBehavior";
- final static String SHOW_TRANS = "showTranscripts";
- final static String SMS_NOTE = "smsNotifications";
- final static String SMS_EMAIL_ACTIVE = "smsToEmailActive";
- final static String SMS_EMAIL_SUB = "smsToEmailSubject";
- final static String SPAM = "spam";
- final static String TIME_ZONE = "timezone";
- final static String TEST_T_ZONE = "testTimeZone";
- final static String USE_DID_CID = "useDidAsCallerId";
- final static String USE_DID_SOURCE = "useDidAsSource";
-
- final JSONArray emptyJSONArray = new JSONArray();
- JSONArray testGroupList = new JSONArray();
- JSONArray testGroupArray = new JSONArray();
-
- final JSONObject emptyJSONObject = new JSONObject();
- final static JSONObject TEST_NULL_OBJECT = null;
- JSONObject testJSONGroupOb = new JSONObject();
- JSONObject testJSONGroupOb1 = new JSONObject();
- JSONObject jsonPreSetting = new JSONObject();
- JSONObject jsonSetting = new JSONObject();
- JSONObject testJSONObject = new JSONObject();
-
- final DisabledId testDisabledID = new DisabledId("3", true);
- final DisabledId testDisabledID1 = new DisabledId("4", true);
-
- DisabledId[] testDisArray = { testDisabledID, testDisabledID1 };
-
- @Before
- public void setUp() throws Exception {
-
- // Build groups
- testJSONGroupOb.put("id", "testID");
- testJSONGroupOb.put("name", "testName");
- testJSONGroupOb.put("isCustomForwarding", false);
- testJSONGroupOb.put("isCustomGreeting", false);
- testJSONGroupOb.put("isCustomDirectConnect", false);
- testJSONGroupOb.put(DIRECT_CONNECT, false);
- testJSONGroupOb.put("greetingId", 1);
- testJSONGroupOb.put("disabledForwardingIds", emptyJSONObject);
- testGroup = new Group(testJSONGroupOb);
- // Insert testGroup into an array
- testGroupArray.put(testGroup);
- // And move it into a new Object
- testJSONGroupOb1.put("testID", testJSONGroupOb);
-
- testGroupList.put("testID");
- testGroupList.put("testID1");
-
- jsonPreSetting.put(A_F_IDS, emptyJSONArray);
- jsonPreSetting.put(BASE_URL, TEST_URL);
- jsonPreSetting.put(CREDITS, 1);
- jsonPreSetting.put(DFID, 1);
- jsonPreSetting.put(DID_INFOS, emptyJSONArray);
- jsonPreSetting.put(DIRECT_CONNECT, true);
- jsonPreSetting.put(DID_MAP, emptyJSONObject);
- jsonPreSetting.put(D_N_D, false);
- jsonPreSetting.put(EMAIL_ADD, emptyJSONObject);
- jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
- jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
- jsonPreSetting.put(GREETINGS, emptyJSONObject);
- jsonPreSetting.put(GROUPLIST, testGroupList);
- jsonPreSetting.put(GROUPS, testJSONGroupOb1);
- jsonPreSetting.put(LANGUAGE, ENGLISH);
- jsonPreSetting.put(PRIME_DID, TEST_DID);
- jsonPreSetting.put(SCREEN_BEHAVE, 1);
- jsonPreSetting.put(SHOW_TRANS, false);
- jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
- jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
- jsonPreSetting.put(SMS_EMAIL_SUB, false);
- jsonPreSetting.put(SPAM, SPAM);
- jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
- jsonPreSetting.put(USE_DID_CID, true);
- jsonPreSetting.put(USE_DID_SOURCE, false);
- testSetting = new Setting(jsonPreSetting);
- testSetting.setmDisabledIdList(null);
-
- }
-
- /**
- * Test method for
- * {@link com.techventus.server.voice.datatypes.Setting#Setting(gvjava.org.json.JSONObject)}
- * .
- *
- * @throws JSONException
- */
- @Test
- public void testSettingNullObject() throws JSONException {
-
- testSetting = new Setting(testJSONObject);
-
- Assert.assertNull(testSetting.getmActiveForwardingList());
-
- }
-
- @Test
- public void testSettings() throws JSONException {
-
- Assert.assertEquals(1,testSetting.getCredits());
-
- }
-
- /**
- * Test method for
- * {@link com.techventus.server.voice.datatypes.Setting#toJsonObject()}.
- * @throws JSONException
- */
- @Test
- public void testToJsonObjectNullEmailAndDiD() throws JSONException {
-
- jsonPreSetting.put(A_F_IDS, emptyJSONArray);
- jsonPreSetting.put(BASE_URL, TEST_URL);
- jsonPreSetting.put(CREDITS, 1);
- jsonPreSetting.put(DFID, 1);
- jsonPreSetting.put(DID_INFOS, emptyJSONArray);
- jsonPreSetting.put(DIRECT_CONNECT, true);
- jsonPreSetting.put(DID_MAP, emptyJSONObject);
- jsonPreSetting.put(D_N_D, false);
- jsonPreSetting.put(EMAIL_ADD, TEST_NULL_OBJECT);
- jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
- jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
- jsonPreSetting.put(GREETINGS, emptyJSONObject);
- jsonPreSetting.put(GROUPLIST, testGroupList);
- jsonPreSetting.put(GROUPS, testJSONGroupOb1);
- jsonPreSetting.put(LANGUAGE, ENGLISH);
- jsonPreSetting.put(PRIME_DID, TEST_DID);
- jsonPreSetting.put(SCREEN_BEHAVE, 1);
- jsonPreSetting.put(SHOW_TRANS, false);
- jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
- jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
- jsonPreSetting.put(SMS_EMAIL_SUB, false);
- jsonPreSetting.put(SPAM, SPAM);
- jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
- jsonPreSetting.put(USE_DID_CID, true);
- jsonPreSetting.put(USE_DID_SOURCE, false);
-
- testSetting = new Setting(jsonPreSetting);
- testSetting.setmDisabledIdList(null);
-
- testJSONObject = testSetting.toJsonObject();
-
- resultString = "{\"primaryDid\":\"testDiD\",\"defaultGreetingId\":1,\"useDidAsSource\":false,\"doNotDisturb\":false,\"smsNotifications\":[],\"emailNotificationActive\":true,\"credits\":1,\"activeForwardingIds\":[],\"emailNotificationAddress\":\"testEmailAddress\",\"smsToEmailSubject\":false,\"baseUrl\":\"testURL\",\"timezone\":\"testTimeZone\",\"groupList\":[\"testID\",\"testID1\"],\"didInfos\":[],\"greetings\":[],\"showTranscripts\":false,\"directConnect\":true,\"screenBehavior\":1,\"language\":\"English\",\"spam\":\"spam\",\"useDidAsCallerId\":true,\"smsToEmailActive\":true,\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":1,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}}}";
-
- Assert.assertEquals(resultString, testJSONObject.toString());
-
- }
-
- /**
- * Test method for
- * {@link com.techventus.server.voice.datatypes.Setting#toJsonObject()}.
- * @throws JSONException
- */
- @Test
- public void testToJsonObject() throws JSONException {
-
- final JSONArray testEmailArray = new JSONArray();
- testEmailArray.put("test@email.com");
-
- final JSONObject testDiDObject = new JSONObject();
- testDiDObject.put("1", true);
-
- jsonPreSetting.put(A_F_IDS, emptyJSONArray);
- jsonPreSetting.put(BASE_URL, TEST_URL);
- jsonPreSetting.put(CREDITS, 1);
- jsonPreSetting.put(DFID, 1);
- jsonPreSetting.put(DID_INFOS, emptyJSONArray);
- jsonPreSetting.put(DIRECT_CONNECT, true);
- jsonPreSetting.put(DID_MAP, testDiDObject);
- jsonPreSetting.put(D_N_D, false);
- jsonPreSetting.put(EMAIL_ADD, testEmailArray);
- jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
- jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
- jsonPreSetting.put(GREETINGS, emptyJSONObject);
- jsonPreSetting.put(GROUPLIST, testGroupList);
- jsonPreSetting.put(GROUPS, testJSONGroupOb1);
- jsonPreSetting.put(LANGUAGE, ENGLISH);
- jsonPreSetting.put(PRIME_DID, TEST_DID);
- jsonPreSetting.put(SCREEN_BEHAVE, 1);
- jsonPreSetting.put(SHOW_TRANS, false);
- jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
- jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
- jsonPreSetting.put(SMS_EMAIL_SUB, false);
- jsonPreSetting.put(SPAM, SPAM);
- jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
- jsonPreSetting.put(USE_DID_CID, true);
- jsonPreSetting.put(USE_DID_SOURCE, false);
-
- testSetting = new Setting(jsonPreSetting);
-
- testJSONObject = testSetting.toJsonObject();
-
- resultString = "{\"doNotDisturb\":false,\"disabledIdMap\":{\"1\":true},\"smsNotifications\":[],\"credits\":1,\"baseUrl\":\"testURL\",\"groupList\":[\"testID\",\"testID1\"],\"timezone\":\"testTimeZone\",\"greetings\":[],\"showTranscripts\":false,\"useDidAsCallerId\":true,\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":1,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}},\"primaryDid\":\"testDiD\",\"defaultGreetingId\":1,\"useDidAsSource\":false,\"emailNotificationActive\":true,\"emailNotificationAddress\":\"testEmailAddress\",\"activeForwardingIds\":[],\"smsToEmailSubject\":false,\"didInfos\":[],\"directConnect\":true,\"screenBehavior\":1,\"language\":\"English\",\"spam\":\"spam\",\"smsToEmailActive\":true,\"emailAddresses\":\"test@email.com\"}";
-
- Assert.assertEquals(resultString, testJSONObject.toString());
-
- }
-
- /**
- * Test method for
- * {@link com.techventus.server.voice.datatypes.Setting#getGroupListAsList()}
- * .
- * @throws JSONException
- */
- @Test
- public void testGetGroupListAsList() throws JSONException {
-
- final JSONArray testEmailArray = new JSONArray();
- testEmailArray.put("test@email.com");
-
- final JSONObject testDiDObject = new JSONObject();
- testDiDObject.put("1", true);
-
- jsonPreSetting.put(A_F_IDS, emptyJSONArray);
- jsonPreSetting.put(BASE_URL, TEST_URL);
- jsonPreSetting.put(CREDITS, 1);
- jsonPreSetting.put(DFID, 1);
- jsonPreSetting.put(DID_INFOS, emptyJSONArray);
- jsonPreSetting.put(DIRECT_CONNECT, true);
- jsonPreSetting.put(DID_MAP, testDiDObject);
- jsonPreSetting.put(D_N_D, false);
- jsonPreSetting.put(EMAIL_ADD, testEmailArray);
- jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
- jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
- jsonPreSetting.put(GREETINGS, emptyJSONObject);
- jsonPreSetting.put(GROUPLIST, testGroupList);
- jsonPreSetting.put(GROUPS, testJSONGroupOb1);
- jsonPreSetting.put(LANGUAGE, ENGLISH);
- jsonPreSetting.put(PRIME_DID, TEST_DID);
- jsonPreSetting.put(SCREEN_BEHAVE, 1);
- jsonPreSetting.put(SHOW_TRANS, false);
- jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
- jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
- jsonPreSetting.put(SMS_EMAIL_SUB, false);
- jsonPreSetting.put(SPAM, SPAM);
- jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
- jsonPreSetting.put(USE_DID_CID, true);
- jsonPreSetting.put(USE_DID_SOURCE, false);
-
- testSetting = new Setting(jsonPreSetting);
-
- resultString = "[testID, testID1]";
-
- Assert.assertEquals(resultString, testSetting.getGroupListAsList().toString());
- }
-
-}
+/**
+ *
+ */
+package test.datatypes;
+
+import junit.framework.Assert;
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.techventus.server.voice.datatypes.DisabledId;
+import com.techventus.server.voice.datatypes.Group;
+import com.techventus.server.voice.datatypes.Setting;
+
+/**
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+public class SettingTest {
+
+ Setting testSetting;
+ Setting testSetting1;
+ Setting testSetting2;
+ Group testGroup;
+ String resultString;
+
+ final static String DIRECT_CONNECT = "directConnect";
+ final static String A_F_IDS = "activeForwardingIds";
+ final static String BASE_URL = "baseUrl";
+ final static String TEST_URL = "testURL";
+ final static String CREDITS = "credits";
+ final static String DFID = "defaultGreetingId";
+ final static String DID_INFOS = "didInfos";
+ final static String DID_MAP = "disabledIdMap";
+ final static String D_N_D = "doNotDisturb";
+ final static String EMAIL_ADD = "emailAddresses";
+ final static String EMAIL_NOTE_ACTIVE = "emailNotificationActive";
+ final static String TEST_E_ADDRESS = "testEmailAddress";
+ final static String EMAIL_NOTE_ADD = "emailNotificationAddress";
+ final static String GREETINGS = "greetings";
+ final static String GROUPLIST = "groupList";
+ final static String GROUPS = "groups";
+ final static String LANGUAGE = "language";
+ final static String ENGLISH = "English";
+ final static String PRIME_DID = "primaryDid";
+ final static String TEST_DID = "testDiD";
+ final static String SCREEN_BEHAVE = "screenBehavior";
+ final static String SHOW_TRANS = "showTranscripts";
+ final static String SMS_NOTE = "smsNotifications";
+ final static String SMS_EMAIL_ACTIVE = "smsToEmailActive";
+ final static String SMS_EMAIL_SUB = "smsToEmailSubject";
+ final static String SPAM = "spam";
+ final static String TIME_ZONE = "timezone";
+ final static String TEST_T_ZONE = "testTimeZone";
+ final static String USE_DID_CID = "useDidAsCallerId";
+ final static String USE_DID_SOURCE = "useDidAsSource";
+
+ final JSONArray emptyJSONArray = new JSONArray();
+ JSONArray testGroupList = new JSONArray();
+ JSONArray testGroupArray = new JSONArray();
+
+ final JSONObject emptyJSONObject = new JSONObject();
+ final static JSONObject TEST_NULL_OBJECT = null;
+ JSONObject testJSONGroupOb = new JSONObject();
+ JSONObject testJSONGroupOb1 = new JSONObject();
+ JSONObject jsonPreSetting = new JSONObject();
+ JSONObject jsonSetting = new JSONObject();
+ JSONObject testJSONObject = new JSONObject();
+
+ final DisabledId testDisabledID = new DisabledId("3", true);
+ final DisabledId testDisabledID1 = new DisabledId("4", true);
+
+ DisabledId[] testDisArray = { testDisabledID, testDisabledID1 };
+
+ @Before
+ public void setUp() throws Exception {
+
+ // Build groups
+ testJSONGroupOb.put("id", "testID");
+ testJSONGroupOb.put("name", "testName");
+ testJSONGroupOb.put("isCustomForwarding", false);
+ testJSONGroupOb.put("isCustomGreeting", false);
+ testJSONGroupOb.put("isCustomDirectConnect", false);
+ testJSONGroupOb.put(DIRECT_CONNECT, false);
+ testJSONGroupOb.put("greetingId", 1);
+ testJSONGroupOb.put("disabledForwardingIds", emptyJSONObject);
+ testGroup = new Group(testJSONGroupOb);
+ // Insert testGroup into an array
+ testGroupArray.put(testGroup);
+ // And move it into a new Object
+ testJSONGroupOb1.put("testID", testJSONGroupOb);
+
+ testGroupList.put("testID");
+ testGroupList.put("testID1");
+
+ jsonPreSetting.put(A_F_IDS, emptyJSONArray);
+ jsonPreSetting.put(BASE_URL, TEST_URL);
+ jsonPreSetting.put(CREDITS, 1);
+ jsonPreSetting.put(DFID, 1);
+ jsonPreSetting.put(DID_INFOS, emptyJSONArray);
+ jsonPreSetting.put(DIRECT_CONNECT, true);
+ jsonPreSetting.put(DID_MAP, emptyJSONObject);
+ jsonPreSetting.put(D_N_D, false);
+ jsonPreSetting.put(EMAIL_ADD, emptyJSONObject);
+ jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
+ jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
+ jsonPreSetting.put(GREETINGS, emptyJSONObject);
+ jsonPreSetting.put(GROUPLIST, testGroupList);
+ jsonPreSetting.put(GROUPS, testJSONGroupOb1);
+ jsonPreSetting.put(LANGUAGE, ENGLISH);
+ jsonPreSetting.put(PRIME_DID, TEST_DID);
+ jsonPreSetting.put(SCREEN_BEHAVE, 1);
+ jsonPreSetting.put(SHOW_TRANS, false);
+ jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
+ jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
+ jsonPreSetting.put(SMS_EMAIL_SUB, false);
+ jsonPreSetting.put(SPAM, SPAM);
+ jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
+ jsonPreSetting.put(USE_DID_CID, true);
+ jsonPreSetting.put(USE_DID_SOURCE, false);
+ testSetting = new Setting(jsonPreSetting);
+ testSetting.setmDisabledIdList(null);
+
+ }
+
+ /**
+ * Test method for
+ * {@link com.techventus.server.voice.datatypes.Setting#Setting(gvjava.org.json.JSONObject)}
+ * .
+ *
+ * @throws JSONException
+ */
+ @Test
+ public void testSettingNullObject() throws JSONException {
+
+ testSetting = new Setting(testJSONObject);
+
+ Assert.assertNull(testSetting.getmActiveForwardingList());
+
+ }
+
+ @Test
+ public void testSettings() throws JSONException {
+
+ Assert.assertEquals(1,testSetting.getCredits());
+
+ }
+
+ /**
+ * Test method for
+ * {@link com.techventus.server.voice.datatypes.Setting#toJsonObject()}.
+ * @throws JSONException
+ */
+ @Test
+ public void testToJsonObjectNullEmailAndDiD() throws JSONException {
+
+ jsonPreSetting.put(A_F_IDS, emptyJSONArray);
+ jsonPreSetting.put(BASE_URL, TEST_URL);
+ jsonPreSetting.put(CREDITS, 1);
+ jsonPreSetting.put(DFID, 1);
+ jsonPreSetting.put(DID_INFOS, emptyJSONArray);
+ jsonPreSetting.put(DIRECT_CONNECT, true);
+ jsonPreSetting.put(DID_MAP, emptyJSONObject);
+ jsonPreSetting.put(D_N_D, false);
+ jsonPreSetting.put(EMAIL_ADD, TEST_NULL_OBJECT);
+ jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
+ jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
+ jsonPreSetting.put(GREETINGS, emptyJSONObject);
+ jsonPreSetting.put(GROUPLIST, testGroupList);
+ jsonPreSetting.put(GROUPS, testJSONGroupOb1);
+ jsonPreSetting.put(LANGUAGE, ENGLISH);
+ jsonPreSetting.put(PRIME_DID, TEST_DID);
+ jsonPreSetting.put(SCREEN_BEHAVE, 1);
+ jsonPreSetting.put(SHOW_TRANS, false);
+ jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
+ jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
+ jsonPreSetting.put(SMS_EMAIL_SUB, false);
+ jsonPreSetting.put(SPAM, SPAM);
+ jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
+ jsonPreSetting.put(USE_DID_CID, true);
+ jsonPreSetting.put(USE_DID_SOURCE, false);
+
+ testSetting = new Setting(jsonPreSetting);
+ testSetting.setmDisabledIdList(null);
+
+ testJSONObject = testSetting.toJsonObject();
+
+ resultString = "{\"primaryDid\":\"testDiD\",\"defaultGreetingId\":1,\"useDidAsSource\":false,\"doNotDisturb\":false,\"smsNotifications\":[],\"emailNotificationActive\":true,\"credits\":1,\"activeForwardingIds\":[],\"emailNotificationAddress\":\"testEmailAddress\",\"smsToEmailSubject\":false,\"baseUrl\":\"testURL\",\"timezone\":\"testTimeZone\",\"groupList\":[\"testID\",\"testID1\"],\"didInfos\":[],\"greetings\":[],\"showTranscripts\":false,\"directConnect\":true,\"screenBehavior\":1,\"language\":\"English\",\"spam\":\"spam\",\"useDidAsCallerId\":true,\"smsToEmailActive\":true,\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":1,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}}}";
+
+ Assert.assertEquals(resultString, testJSONObject.toString());
+
+ }
+
+ /**
+ * Test method for
+ * {@link com.techventus.server.voice.datatypes.Setting#toJsonObject()}.
+ * @throws JSONException
+ */
+ @Test
+ public void testToJsonObject() throws JSONException {
+
+ final JSONArray testEmailArray = new JSONArray();
+ testEmailArray.put("test@email.com");
+
+ final JSONObject testDiDObject = new JSONObject();
+ testDiDObject.put("1", true);
+
+ jsonPreSetting.put(A_F_IDS, emptyJSONArray);
+ jsonPreSetting.put(BASE_URL, TEST_URL);
+ jsonPreSetting.put(CREDITS, 1);
+ jsonPreSetting.put(DFID, 1);
+ jsonPreSetting.put(DID_INFOS, emptyJSONArray);
+ jsonPreSetting.put(DIRECT_CONNECT, true);
+ jsonPreSetting.put(DID_MAP, testDiDObject);
+ jsonPreSetting.put(D_N_D, false);
+ jsonPreSetting.put(EMAIL_ADD, testEmailArray);
+ jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
+ jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
+ jsonPreSetting.put(GREETINGS, emptyJSONObject);
+ jsonPreSetting.put(GROUPLIST, testGroupList);
+ jsonPreSetting.put(GROUPS, testJSONGroupOb1);
+ jsonPreSetting.put(LANGUAGE, ENGLISH);
+ jsonPreSetting.put(PRIME_DID, TEST_DID);
+ jsonPreSetting.put(SCREEN_BEHAVE, 1);
+ jsonPreSetting.put(SHOW_TRANS, false);
+ jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
+ jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
+ jsonPreSetting.put(SMS_EMAIL_SUB, false);
+ jsonPreSetting.put(SPAM, SPAM);
+ jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
+ jsonPreSetting.put(USE_DID_CID, true);
+ jsonPreSetting.put(USE_DID_SOURCE, false);
+
+ testSetting = new Setting(jsonPreSetting);
+
+ testJSONObject = testSetting.toJsonObject();
+
+ resultString = "{\"doNotDisturb\":false,\"disabledIdMap\":{\"1\":true},\"smsNotifications\":[],\"credits\":1,\"baseUrl\":\"testURL\",\"groupList\":[\"testID\",\"testID1\"],\"timezone\":\"testTimeZone\",\"greetings\":[],\"showTranscripts\":false,\"useDidAsCallerId\":true,\"groups\":{\"testID\":{\"id\":\"testID\",\"greetingId\":1,\"isCustomForwarding\":false,\"isCustomGreeting\":false,\"disabledForwardingIds\":{},\"name\":\"testName\",\"isCustomDirectConnect\":false,\"directConnect\":false}},\"primaryDid\":\"testDiD\",\"defaultGreetingId\":1,\"useDidAsSource\":false,\"emailNotificationActive\":true,\"emailNotificationAddress\":\"testEmailAddress\",\"activeForwardingIds\":[],\"smsToEmailSubject\":false,\"didInfos\":[],\"directConnect\":true,\"screenBehavior\":1,\"language\":\"English\",\"spam\":\"spam\",\"smsToEmailActive\":true,\"emailAddresses\":\"test@email.com\"}";
+
+ Assert.assertEquals(resultString, testJSONObject.toString());
+
+ }
+
+ /**
+ * Test method for
+ * {@link com.techventus.server.voice.datatypes.Setting#getGroupListAsList()}
+ * .
+ * @throws JSONException
+ */
+ @Test
+ public void testGetGroupListAsList() throws JSONException {
+
+ final JSONArray testEmailArray = new JSONArray();
+ testEmailArray.put("test@email.com");
+
+ final JSONObject testDiDObject = new JSONObject();
+ testDiDObject.put("1", true);
+
+ jsonPreSetting.put(A_F_IDS, emptyJSONArray);
+ jsonPreSetting.put(BASE_URL, TEST_URL);
+ jsonPreSetting.put(CREDITS, 1);
+ jsonPreSetting.put(DFID, 1);
+ jsonPreSetting.put(DID_INFOS, emptyJSONArray);
+ jsonPreSetting.put(DIRECT_CONNECT, true);
+ jsonPreSetting.put(DID_MAP, testDiDObject);
+ jsonPreSetting.put(D_N_D, false);
+ jsonPreSetting.put(EMAIL_ADD, testEmailArray);
+ jsonPreSetting.put(EMAIL_NOTE_ACTIVE, true);
+ jsonPreSetting.put(EMAIL_NOTE_ADD, TEST_E_ADDRESS);
+ jsonPreSetting.put(GREETINGS, emptyJSONObject);
+ jsonPreSetting.put(GROUPLIST, testGroupList);
+ jsonPreSetting.put(GROUPS, testJSONGroupOb1);
+ jsonPreSetting.put(LANGUAGE, ENGLISH);
+ jsonPreSetting.put(PRIME_DID, TEST_DID);
+ jsonPreSetting.put(SCREEN_BEHAVE, 1);
+ jsonPreSetting.put(SHOW_TRANS, false);
+ jsonPreSetting.put(SMS_NOTE, emptyJSONArray);
+ jsonPreSetting.put(SMS_EMAIL_ACTIVE, true);
+ jsonPreSetting.put(SMS_EMAIL_SUB, false);
+ jsonPreSetting.put(SPAM, SPAM);
+ jsonPreSetting.put(TIME_ZONE, TEST_T_ZONE);
+ jsonPreSetting.put(USE_DID_CID, true);
+ jsonPreSetting.put(USE_DID_SOURCE, false);
+
+ testSetting = new Setting(jsonPreSetting);
+
+ resultString = "[testID, testID1]";
+
+ Assert.assertEquals(resultString, testSetting.getGroupListAsList().toString());
+ }
+
+}
diff --git a/src/test/datatypes/records/CallTest.java b/src/test/java/datatypes/records/CallTest.java
similarity index 90%
rename from src/test/datatypes/records/CallTest.java
rename to src/test/java/datatypes/records/CallTest.java
index fed233a..6afe8f2 100644
--- a/src/test/datatypes/records/CallTest.java
+++ b/src/test/java/datatypes/records/CallTest.java
@@ -1,64 +1,64 @@
-package test.datatypes.records;
-
-import java.util.Date;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import com.techventus.server.voice.datatypes.Contact;
-import com.techventus.server.voice.datatypes.records.Call;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-public class CallTest {
-
- private final static Date DATE = new Date(1321038671000l);
- private final static Contact CONTACT = new Contact("testName", "testID", "testNumber", "testURL");
-
- private Call testCall = new Call("testID", "testTitle", DATE, CONTACT, true);
-
- @Test
- public void testCallToStringOverrideFull() {
-
- Assert.assertEquals("id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
-
- }
-
- @Test
- public void testCallToStringOverrideNoID() {
-
- testCall.setId(null);
-
- Assert.assertEquals("title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
-
- }
-
- @Test
- public void testCallToStringOverrideNoTitle() {
-
- testCall.setTitle(null);
-
- Assert.assertEquals("id=testID;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
- }
-
- @Test
- public void testCallToStringOverrideNoDate() {
-
- testCall.setDate(null);
-
- Assert.assertEquals("id=testID;title=testTitle;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
- }
-
- @Test
- public void testCallToStringOverrideNoContact() {
-
- testCall.setContact(null);
-
- Assert.assertEquals("id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;read=true;", testCall.toString());
- }
-
-}
+package test.datatypes.records;
+
+import java.util.Date;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import com.techventus.server.voice.datatypes.Contact;
+import com.techventus.server.voice.datatypes.records.Call;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+public class CallTest {
+
+ private final static Date DATE = new Date(1321038671000l);
+ private final static Contact CONTACT = new Contact("testName", "testID", "testNumber", "testURL");
+
+ private Call testCall = new Call("testID", "testTitle", DATE, CONTACT, true);
+
+ @Test
+ public void testCallToStringOverrideFull() {
+
+ Assert.assertEquals("id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
+
+ }
+
+ @Test
+ public void testCallToStringOverrideNoID() {
+
+ testCall.setId(null);
+
+ Assert.assertEquals("title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
+
+ }
+
+ @Test
+ public void testCallToStringOverrideNoTitle() {
+
+ testCall.setTitle(null);
+
+ Assert.assertEquals("id=testID;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
+ }
+
+ @Test
+ public void testCallToStringOverrideNoDate() {
+
+ testCall.setDate(null);
+
+ Assert.assertEquals("id=testID;title=testTitle;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};read=true;", testCall.toString());
+ }
+
+ @Test
+ public void testCallToStringOverrideNoContact() {
+
+ testCall.setContact(null);
+
+ Assert.assertEquals("id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;read=true;", testCall.toString());
+ }
+
+}
diff --git a/src/test/datatypes/records/RecordTest.java b/src/test/java/datatypes/records/RecordTest.java
similarity index 100%
rename from src/test/datatypes/records/RecordTest.java
rename to src/test/java/datatypes/records/RecordTest.java
diff --git a/src/test/datatypes/records/SMSTest.java b/src/test/java/datatypes/records/SMSTest.java
similarity index 100%
rename from src/test/datatypes/records/SMSTest.java
rename to src/test/java/datatypes/records/SMSTest.java
diff --git a/src/test/datatypes/records/ShortMessageTest.java b/src/test/java/datatypes/records/ShortMessageTest.java
similarity index 100%
rename from src/test/datatypes/records/ShortMessageTest.java
rename to src/test/java/datatypes/records/ShortMessageTest.java
diff --git a/src/test/datatypes/records/TranscriptElementTest.java b/src/test/java/datatypes/records/TranscriptElementTest.java
similarity index 100%
rename from src/test/datatypes/records/TranscriptElementTest.java
rename to src/test/java/datatypes/records/TranscriptElementTest.java
diff --git a/src/test/datatypes/records/TranscriptTest.java b/src/test/java/datatypes/records/TranscriptTest.java
similarity index 100%
rename from src/test/datatypes/records/TranscriptTest.java
rename to src/test/java/datatypes/records/TranscriptTest.java
diff --git a/src/test/datatypes/records/VoicemailTest.java b/src/test/java/datatypes/records/VoicemailTest.java
similarity index 96%
rename from src/test/datatypes/records/VoicemailTest.java
rename to src/test/java/datatypes/records/VoicemailTest.java
index 4e3ea2e..38fb875 100644
--- a/src/test/datatypes/records/VoicemailTest.java
+++ b/src/test/java/datatypes/records/VoicemailTest.java
@@ -1,112 +1,112 @@
-package test.datatypes.records;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.techventus.server.voice.datatypes.Contact;
-import com.techventus.server.voice.datatypes.records.Transcript;
-import com.techventus.server.voice.datatypes.records.TranscriptElement;
-import com.techventus.server.voice.datatypes.records.Voicemail;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-public class VoicemailTest {
-
- Voicemail testVoicemail;
- // Params for testVoicemail
- final Date DATE = new Date(1321038671000l);
- final Contact CONTACT = new Contact("testName", "testID", "testNumber",
- "testURL");
- final TranscriptElement.RecognitionLevel testLevel = TranscriptElement.RecognitionLevel.HIGH;
- final TranscriptElement testElement = new TranscriptElement("testText",
- "testID", testLevel);
-
- @Before
- public void setUp() {
- //Params for testVoicemail
- final List testList = new ArrayList();
- testList.add(testElement);
- final Transcript TRANSCRIPT = new Transcript(testList);
- //instantiate testVoicemail
- testVoicemail = new Voicemail("testID", "testTitle", DATE, CONTACT, TRANSCRIPT,
- true);
- }
-
- @Test
- public void testToStringOverrideFull() {
-
- Assert.assertEquals(
- "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideNoID() {
-
- testVoicemail.setId(null);
-
- Assert.assertEquals(
- "title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/null;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideNoTitle() {
-
- testVoicemail.setTitle(null);
-
- Assert.assertEquals(
- "id=testID;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideNoDate() {
-
- testVoicemail.setDate(null);
-
- Assert.assertEquals(
- "id=testID;title=testTitle;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideContact() {
-
- testVoicemail.setContact(null);
-
- Assert.assertEquals(
- "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideNoTranscript() {
-
- testVoicemail.setTransscript(null);
-
- Assert.assertEquals(
- "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
- testVoicemail.toString());
- }
-
- @Test
- public void testToStringOverrideNoMP3() {
-
- testVoicemail.setMp3Url(null);
-
- Assert.assertEquals(
- "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;read=true;",
- testVoicemail.toString());
- }
-
-}
+package test.datatypes.records;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.techventus.server.voice.datatypes.Contact;
+import com.techventus.server.voice.datatypes.records.Transcript;
+import com.techventus.server.voice.datatypes.records.TranscriptElement;
+import com.techventus.server.voice.datatypes.records.Voicemail;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+public class VoicemailTest {
+
+ Voicemail testVoicemail;
+ // Params for testVoicemail
+ final Date DATE = new Date(1321038671000l);
+ final Contact CONTACT = new Contact("testName", "testID", "testNumber",
+ "testURL");
+ final TranscriptElement.RecognitionLevel testLevel = TranscriptElement.RecognitionLevel.HIGH;
+ final TranscriptElement testElement = new TranscriptElement("testText",
+ "testID", testLevel);
+
+ @Before
+ public void setUp() {
+ //Params for testVoicemail
+ final List testList = new ArrayList();
+ testList.add(testElement);
+ final Transcript TRANSCRIPT = new Transcript(testList);
+ //instantiate testVoicemail
+ testVoicemail = new Voicemail("testID", "testTitle", DATE, CONTACT, TRANSCRIPT,
+ true);
+ }
+
+ @Test
+ public void testToStringOverrideFull() {
+
+ Assert.assertEquals(
+ "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideNoID() {
+
+ testVoicemail.setId(null);
+
+ Assert.assertEquals(
+ "title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/null;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideNoTitle() {
+
+ testVoicemail.setTitle(null);
+
+ Assert.assertEquals(
+ "id=testID;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideNoDate() {
+
+ testVoicemail.setDate(null);
+
+ Assert.assertEquals(
+ "id=testID;title=testTitle;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideContact() {
+
+ testVoicemail.setContact(null);
+
+ Assert.assertEquals(
+ "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;transcript=testText;mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideNoTranscript() {
+
+ testVoicemail.setTransscript(null);
+
+ Assert.assertEquals(
+ "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};mp3Url=https://www.google.com/voice/media/send_voicemail/testID;read=true;",
+ testVoicemail.toString());
+ }
+
+ @Test
+ public void testToStringOverrideNoMP3() {
+
+ testVoicemail.setMp3Url(null);
+
+ Assert.assertEquals(
+ "id=testID;title=testTitle;date=Fri Nov 11 11:11:11 PST 2011;contact={id=testID;name=testName;number=testNumber;imageUrl=testURL;};transcript=testText;read=true;",
+ testVoicemail.toString());
+ }
+
+}
diff --git a/src/test/test.java b/src/test/java/test.java
similarity index 100%
rename from src/test/test.java
rename to src/test/java/test.java
diff --git a/src/test/util/ParsingUtilTest.java b/src/test/java/util/ParsingUtilTest.java
similarity index 92%
rename from src/test/util/ParsingUtilTest.java
rename to src/test/java/util/ParsingUtilTest.java
index dc1fded..dfda210 100644
--- a/src/test/util/ParsingUtilTest.java
+++ b/src/test/java/util/ParsingUtilTest.java
@@ -1,153 +1,153 @@
-package test.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import gvjava.org.json.JSONArray;
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.techventus.server.voice.util.ParsingUtil;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-// Coverage Holes:
-// removeUninterestingParts line 41 unable to make null.
-// removeUninterestingParts line 48 unable to make null.
-public class ParsingUtilTest {
-
- private final static String TEST_TEXT = "Hello Toby, How are you today? Fine.";
- private final static String TEST_START_BORDER = "How are";
- private final static String TEST_END_BORDER = "?";
- private final static String ARRAY_ONE = "one";
- private final static String TEST_KEY = "testKey";
-
- JSONArray testJSONArray = new JSONArray();
- JSONObject testJSONObject = new JSONObject();
-
- @Test
- public void testRemoveUninterestingPartsNullEndBorder() {
-
- Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(
- TEST_TEXT, TEST_START_BORDER, null, true));
- }
-
- @Test
- public void testRemoveUninterestingPartsNullStartBorder() {
-
- Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(
- TEST_TEXT, null, TEST_END_BORDER, true));
- }
-
- @Test
- public void testRemoveUninterestingPartsNullText() {
-
- Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(null,
- TEST_START_BORDER, TEST_END_BORDER, true));
- }
-
- @Test
- public void testRemoveUninterestingPartsIncludeBordersNoSuchStartIndex() {
-
- Assert.assertNull(ParsingUtil.removeUninterestingParts(
- TEST_TEXT, "Does Not Exist", TEST_END_BORDER,
- true));
- }
-
- @Test
- public void testRemoveUninterestingPartsIncludeBordersNoSuchEndIndex() {
-
- Assert.assertNull(ParsingUtil.removeUninterestingParts(
- TEST_TEXT, TEST_START_BORDER,
- "Does not exist", true));
- }
-
- @Test
- public void testRemoveUninterestingPartsIncludeBorders() {
-
- Assert.assertEquals("How are you today?", ParsingUtil
- .removeUninterestingParts(
- TEST_TEXT, TEST_START_BORDER, TEST_END_BORDER,
- true));
- }
-
- @Test
- public void testRemoveUninterestingPartsIncludeBordersFalse() {
-
- Assert.assertEquals(" you today", ParsingUtil.removeUninterestingParts(
- TEST_TEXT, TEST_START_BORDER, TEST_END_BORDER, false));
- }
-
- @Test
- public void testJsonIntArrayToIntArrayPass() {
-
- testJSONArray.put(1);
- testJSONArray.put(2);
-
- final int[] testArray = { 1, 2 };
-
- Assert.assertArrayEquals(testArray,
- ParsingUtil.jsonIntArrayToIntArray(testJSONArray));
-
- }
-
- @Test
- public void testJsonStringArrayToStringArrayPass() {
-
- testJSONArray.put(ARRAY_ONE);
-
- final String[] testArray = { ARRAY_ONE };
-
- final String[] testJSString = ParsingUtil
- .jsonStringArrayToStringArray(testJSONArray);
-
- Assert.assertEquals(testArray[0], testJSString[0]);
- }
-
- @Test
- public void testJsonStringArrayToStringList() throws JSONException {
-
- testJSONArray.put(ARRAY_ONE);
- testJSONArray.put("two");
-
- testJSONObject.put(TEST_KEY, testJSONArray);
-
- final List testInputList = new ArrayList();
- final List testList = new ArrayList();
- testList.add(ARRAY_ONE);
- testList.add("two");
-
- Assert.assertEquals(
- testList.toString(),
- ParsingUtil.jsonStringArrayToStringList(testJSONObject,
- testInputList, TEST_KEY).toString());
-
- }
-
- @Test
- public void testJsonIntArrayToIntegerList() throws JSONException {
-
- testJSONArray.put(1);
- testJSONArray.put(2);
-
- testJSONObject.put(TEST_KEY, testJSONArray);
-
- final List testInputList = new ArrayList();
- final List testList = new ArrayList();
- testList.add(1);
- testList.add(2);
-
- Assert.assertEquals(
- testList.toString(),
- ParsingUtil.jsonIntArrayToIntegerList(testJSONObject,
- testInputList, TEST_KEY).toString());
-
- }
-
-}
+package test.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import gvjava.org.json.JSONArray;
+import gvjava.org.json.JSONException;
+import gvjava.org.json.JSONObject;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.techventus.server.voice.util.ParsingUtil;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+// Coverage Holes:
+// removeUninterestingParts line 41 unable to make null.
+// removeUninterestingParts line 48 unable to make null.
+public class ParsingUtilTest {
+
+ private final static String TEST_TEXT = "Hello Toby, How are you today? Fine.";
+ private final static String TEST_START_BORDER = "How are";
+ private final static String TEST_END_BORDER = "?";
+ private final static String ARRAY_ONE = "one";
+ private final static String TEST_KEY = "testKey";
+
+ JSONArray testJSONArray = new JSONArray();
+ JSONObject testJSONObject = new JSONObject();
+
+ @Test
+ public void testRemoveUninterestingPartsNullEndBorder() {
+
+ Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(
+ TEST_TEXT, TEST_START_BORDER, null, true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsNullStartBorder() {
+
+ Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(
+ TEST_TEXT, null, TEST_END_BORDER, true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsNullText() {
+
+ Assert.assertEquals(null, ParsingUtil.removeUninterestingParts(null,
+ TEST_START_BORDER, TEST_END_BORDER, true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsIncludeBordersNoSuchStartIndex() {
+
+ Assert.assertNull(ParsingUtil.removeUninterestingParts(
+ TEST_TEXT, "Does Not Exist", TEST_END_BORDER,
+ true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsIncludeBordersNoSuchEndIndex() {
+
+ Assert.assertNull(ParsingUtil.removeUninterestingParts(
+ TEST_TEXT, TEST_START_BORDER,
+ "Does not exist", true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsIncludeBorders() {
+
+ Assert.assertEquals("How are you today?", ParsingUtil
+ .removeUninterestingParts(
+ TEST_TEXT, TEST_START_BORDER, TEST_END_BORDER,
+ true));
+ }
+
+ @Test
+ public void testRemoveUninterestingPartsIncludeBordersFalse() {
+
+ Assert.assertEquals(" you today", ParsingUtil.removeUninterestingParts(
+ TEST_TEXT, TEST_START_BORDER, TEST_END_BORDER, false));
+ }
+
+ @Test
+ public void testJsonIntArrayToIntArrayPass() {
+
+ testJSONArray.put(1);
+ testJSONArray.put(2);
+
+ final int[] testArray = { 1, 2 };
+
+ Assert.assertArrayEquals(testArray,
+ ParsingUtil.jsonIntArrayToIntArray(testJSONArray));
+
+ }
+
+ @Test
+ public void testJsonStringArrayToStringArrayPass() {
+
+ testJSONArray.put(ARRAY_ONE);
+
+ final String[] testArray = { ARRAY_ONE };
+
+ final String[] testJSString = ParsingUtil
+ .jsonStringArrayToStringArray(testJSONArray);
+
+ Assert.assertEquals(testArray[0], testJSString[0]);
+ }
+
+ @Test
+ public void testJsonStringArrayToStringList() throws JSONException {
+
+ testJSONArray.put(ARRAY_ONE);
+ testJSONArray.put("two");
+
+ testJSONObject.put(TEST_KEY, testJSONArray);
+
+ final List testInputList = new ArrayList();
+ final List testList = new ArrayList();
+ testList.add(ARRAY_ONE);
+ testList.add("two");
+
+ Assert.assertEquals(
+ testList.toString(),
+ ParsingUtil.jsonStringArrayToStringList(testJSONObject,
+ testInputList, TEST_KEY).toString());
+
+ }
+
+ @Test
+ public void testJsonIntArrayToIntegerList() throws JSONException {
+
+ testJSONArray.put(1);
+ testJSONArray.put(2);
+
+ testJSONObject.put(TEST_KEY, testJSONArray);
+
+ final List testInputList = new ArrayList();
+ final List testList = new ArrayList();
+ testList.add(1);
+ testList.add(2);
+
+ Assert.assertEquals(
+ testList.toString(),
+ ParsingUtil.jsonIntArrayToIntegerList(testJSONObject,
+ testInputList, TEST_KEY).toString());
+
+ }
+
+}
diff --git a/src/test/util/SMSParserTest.java b/src/test/java/util/SMSParserTest.java
similarity index 96%
rename from src/test/util/SMSParserTest.java
rename to src/test/java/util/SMSParserTest.java
index 6e3eee2..ae65f5c 100644
--- a/src/test/util/SMSParserTest.java
+++ b/src/test/java/util/SMSParserTest.java
@@ -1,135 +1,135 @@
-package test.util;
-
-import com.techventus.server.voice.datatypes.records.SMSThread;
-import com.techventus.server.voice.util.SMSParser;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author Brett Futral @ Catalyst IT Services
- *
- */
-// Holes in coverage:
-// SMSParser.parsePhoneNumber line 258 will always == -1 due to line
-// regex filter in line 257)
-// Cannot test getSMSThreads due to private method call inside method.
-// Cannot test parseContact due to private method call inside method.
-// addSMSsToThread is void
-@SuppressWarnings("rawtypes")
-public class SMSParserTest {
-
- // TestSMSParser
- final SMSParser testSMSParser = new SMSParser("test", "5030000000");
- private static final long DATE_LONG = 1334348667447L;
-
- // Reflection Setup buildSMSThreadMap
- private Method bSMSTM;
- private static final String TEST_PPN = "parsePhoneNumber";
- private static final String TEST_BSMSTM = "buildSMSThreadMap";
- private Class[] bSMSTMParamTypes = new Class[1];
- private Object[] bSMSTMParams = new Object[1];
-
- @Before
- public void setUp() throws NoSuchMethodException, SecurityException {
-
- // Reflect class/method buildSMSThreadMap
- bSMSTMParamTypes[0] = java.lang.String.class;
- bSMSTM = testSMSParser.getClass().getDeclaredMethod(TEST_BSMSTM,
- bSMSTMParamTypes);
- bSMSTM.setAccessible(true);
- }
-
- @Test
- public void testParsePhoneNumber() throws NoSuchMethodException,
- SecurityException, IllegalAccessException,
- IllegalArgumentException, InvocationTargetException {
-
- // Reflect class/method parsePhoneNumber
- Method pPN;
- Class[] pPNParamTypes = new Class[1];
- Object[] pPNParams = new Object[1];
- pPNParamTypes[0] = java.lang.String.class;
- pPN = testSMSParser.getClass().getDeclaredMethod(TEST_PPN,
- pPNParamTypes);
- pPN.setAccessible(true);
- pPNParams[0] = "5035551212";
-
- final String testPPNumber = (String) pPN.invoke(testSMSParser,
- pPNParams);
-
- Assert.assertEquals("+15035551212", testPPNumber);
-
- }
-
- @Test
- public void testBuildSMSThreadMap() throws IllegalAccessException,
- IllegalArgumentException, InvocationTargetException {
-
- // Reflect class/method parsePhoneNumber
- final String testSMSResponse = "";
- bSMSTMParams[0] = testSMSResponse;
- final Map testBSMSTMap = (Map) bSMSTM.invoke(testSMSParser,
- bSMSTMParams);
-
- // Expected object
- final Date validDate = new Date(DATE_LONG);
- final SMSThread expectedSMSThread = new SMSThread("testID",
- "test note", validDate, null, true, true);
- final Map expectedMap = new HashMap();
- expectedMap.put("testID", expectedSMSThread);
-
- Assert.assertEquals(expectedMap.toString(), testBSMSTMap.toString());
-
- }
-
- @Test
- public void testBuildSMSThreadMapNoInputs() throws IllegalAccessException,
- IllegalArgumentException, InvocationTargetException {
-
- // Reflect class/method parsePhoneNumber
- final String testSMSResponse = "";
- bSMSTMParams[0] = testSMSResponse;
- final Map testNoInputs = (Map) bSMSTM.invoke(testSMSParser,
- bSMSTMParams);
-
- // Expected object
- final Date epochDate = new Date(0);
- final SMSThread expectedSMSThread = new SMSThread("", "", epochDate,
- null, false, false);
- final Map expectedMap = new HashMap();
- expectedMap.put("", expectedSMSThread);
-
- Assert.assertEquals(expectedMap.toString(), testNoInputs.toString());
-
- }
-
-}
+package test.util;
+
+import com.techventus.server.voice.datatypes.records.SMSThread;
+import com.techventus.server.voice.util.SMSParser;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Brett Futral @ Catalyst IT Services
+ *
+ */
+// Holes in coverage:
+// SMSParser.parsePhoneNumber line 258 will always == -1 due to line
+// regex filter in line 257)
+// Cannot test getSMSThreads due to private method call inside method.
+// Cannot test parseContact due to private method call inside method.
+// addSMSsToThread is void
+@SuppressWarnings("rawtypes")
+public class SMSParserTest {
+
+ // TestSMSParser
+ final SMSParser testSMSParser = new SMSParser("test", "5030000000");
+ private static final long DATE_LONG = 1334348667447L;
+
+ // Reflection Setup buildSMSThreadMap
+ private Method bSMSTM;
+ private static final String TEST_PPN = "parsePhoneNumber";
+ private static final String TEST_BSMSTM = "buildSMSThreadMap";
+ private Class[] bSMSTMParamTypes = new Class[1];
+ private Object[] bSMSTMParams = new Object[1];
+
+ @Before
+ public void setUp() throws NoSuchMethodException, SecurityException {
+
+ // Reflect class/method buildSMSThreadMap
+ bSMSTMParamTypes[0] = java.lang.String.class;
+ bSMSTM = testSMSParser.getClass().getDeclaredMethod(TEST_BSMSTM,
+ bSMSTMParamTypes);
+ bSMSTM.setAccessible(true);
+ }
+
+ @Test
+ public void testParsePhoneNumber() throws NoSuchMethodException,
+ SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException {
+
+ // Reflect class/method parsePhoneNumber
+ Method pPN;
+ Class[] pPNParamTypes = new Class[1];
+ Object[] pPNParams = new Object[1];
+ pPNParamTypes[0] = java.lang.String.class;
+ pPN = testSMSParser.getClass().getDeclaredMethod(TEST_PPN,
+ pPNParamTypes);
+ pPN.setAccessible(true);
+ pPNParams[0] = "5035551212";
+
+ final String testPPNumber = (String) pPN.invoke(testSMSParser,
+ pPNParams);
+
+ Assert.assertEquals("+15035551212", testPPNumber);
+
+ }
+
+ @Test
+ public void testBuildSMSThreadMap() throws IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException {
+
+ // Reflect class/method parsePhoneNumber
+ final String testSMSResponse = "";
+ bSMSTMParams[0] = testSMSResponse;
+ final Map testBSMSTMap = (Map) bSMSTM.invoke(testSMSParser,
+ bSMSTMParams);
+
+ // Expected object
+ final Date validDate = new Date(DATE_LONG);
+ final SMSThread expectedSMSThread = new SMSThread("testID",
+ "test note", validDate, null, true, true);
+ final Map expectedMap = new HashMap();
+ expectedMap.put("testID", expectedSMSThread);
+
+ Assert.assertEquals(expectedMap.toString(), testBSMSTMap.toString());
+
+ }
+
+ @Test
+ public void testBuildSMSThreadMapNoInputs() throws IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException {
+
+ // Reflect class/method parsePhoneNumber
+ final String testSMSResponse = "";
+ bSMSTMParams[0] = testSMSResponse;
+ final Map testNoInputs = (Map) bSMSTM.invoke(testSMSParser,
+ bSMSTMParams);
+
+ // Expected object
+ final Date epochDate = new Date(0);
+ final SMSThread expectedSMSThread = new SMSThread("", "", epochDate,
+ null, false, false);
+ final Map expectedMap = new HashMap();
+ expectedMap.put("", expectedSMSThread);
+
+ Assert.assertEquals(expectedMap.toString(), testNoInputs.toString());
+
+ }
+
+}
diff --git a/src/test/kotlin/.gitkeep b/src/test/kotlin/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/test/resources/.gitkeep b/src/test/resources/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test/privateTestData_template.properties b/src/test/resources/test/privateTestData_template.properties
similarity index 100%
rename from test/privateTestData_template.properties
rename to src/test/resources/test/privateTestData_template.properties
diff --git a/test/test.java b/test/test.java
deleted file mode 100644
index 85260c5..0000000
--- a/test/test.java
+++ /dev/null
@@ -1,581 +0,0 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import gvjava.org.json.JSONException;
-import gvjava.org.json.JSONObject;
-
-import com.techventus.server.voice.Voice;
-import com.techventus.server.voice.datatypes.AllSettings;
-import com.techventus.server.voice.datatypes.DisabledForwardingId;
-import com.techventus.server.voice.datatypes.Group;
-import com.techventus.server.voice.datatypes.Phone;
-import com.techventus.server.voice.datatypes.Greeting;
-import com.techventus.server.voice.datatypes.records.SMS;
-import com.techventus.server.voice.datatypes.records.SMSThread;
-import com.techventus.server.voice.exception.CaptchaRequiredException;
-import com.techventus.server.voice.util.ParsingUtil;
-
-@SuppressWarnings("deprecation")
-public class test {
-
- static BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
- static String userName = null;
- static String pass = null;
- static boolean connectOnStartup = false;
- static Properties testProps = null;
- private static Voice voice;
- private static String jsonData;
-
- public static void main(String[] args){
-
- try {
- testProps = load("privateTestData.properties");
- userName = testProps.getProperty("username");
- pass = testProps.getProperty("password");
- connectOnStartup = Boolean.parseBoolean(testProps.getProperty("connectOnStartup"));
- jsonData = testProps.getProperty("jsonData");
- } catch (Exception e) {
- System.out.println("Could not read the testProps, falling back to input. ("+e.getMessage()+")");
- System.out.println("Enter Your Google Voice Username, eg user@gmail.com:");
- //Added this line, otherwise fails all tests.
- connectOnStartup = true;
- try {
- userName = br.readLine();
- } catch (IOException ioe) {
- System.out.println("IO error trying to read your name!");
- System.exit(1);
- }
-
- System.out.println("Enter Your Password:");
-
-
- try {
- pass = br.readLine();
- } catch (IOException ioe) {
- System.out.println("IO error trying to read your name!");
- System.exit(1);
- }
- }
-
- try {
- if(connectOnStartup) voice = new Voice(userName, pass,"GoogleVoiceJava",true,Voice.GOOGLE);
- } catch(CaptchaRequiredException captEx) {
- System.out.println("A captcha is required.");
- System.out.println("Image URL = "+captEx.getCaptchaUrl());
- System.out.println("Capt Token = "+captEx.getCaptchaToken());
- System.out.println("Goodbye.");
- System.exit(1);
- } catch (IOException e) {
- System.out.println("IO error creating voice! - "+e.getLocalizedMessage());
- System.out.println("Goodbye.");
- System.exit(1);
- }
-
- listTests();
-
- /*
- System.out.println("Enter A \"Source\" for the Log:");
- String source = null;
- try {
- source = br.readLine();
- } catch (IOException ioe) {
- System.out.println("IO error trying to read your name!");
- System.exit(1);
- }
-
- System.out.println("Log into Google Voice and find the _rnr_se variable in the page Source. ");
- System.out.println("Enter rnr_se_ value:");
- String rnrSee = null;
- try {
- rnrSee = br.readLine();
- } catch (IOException ioe) {
- System.out.println("IO error trying to read your name!");
- System.exit(1);
- }
- */
-
-
- }
-
- /**
- * Lets the Tester choose the Test to run
- */
- private static void listTests() {
- System.out.println("Availible Tests for "+userName);
- System.out.println("0: Exit");
- System.out.println("1: Multi phone enable / disable");
- System.out.println("2: Inbox paging");
- System.out.println("3: Call Announcement Settings (Presentation)");
- System.out.println("4: Set Default Voicemail Greeting");
- System.out.println("5: Change do not disturb setting.");
- System.out.println("6: Change Group settings.");
- System.out.println("7: Read all settings and print them (cached)");
- System.out.println("8: Read all settings and print them (uncached)");
- System.out.println("9: Read all settings - pure json driven - flat data");
- System.out.println("10: Read all settings - pure json driven - actual account data");
- System.out.println("11: Update Group Settings");
- System.out.println("12: Group settings isPhoneEnabled tests");
- System.out.println("13: List Default Phones and Enabled/Disabled Setting");
- System.out.println("14: Send SMS");
- System.out.println("15: Check SMS");
- System.out.println("16: Captcha Test");
-
- int testNr = 0;
- try {
- testNr = Integer.parseInt(br.readLine());
- } catch (Exception e) {
- System.out.println("Error trying to read the testNr!"+e.getMessage());
- System.exit(1);
- }
-
- runTest(userName, pass, testNr);
- }
-
- /**
- * @param userName
- * @param pass
- * @param testNr
- */
- private static void runTest(String userName, String pass, int testNr) {
- if(testNr==0) {// 0: Exit
- System.out.println("Exiting.");
- System.exit(1);
- }
- try {
-
-
- //Voice voice = new Voice();
-// try {
- if(connectOnStartup) System.out.println(voice.isLoggedIn());
- //Thread.sleep(2000);
-
- switch (testNr) {
- case 1: // 1: Multi phone enable / disable
- System.out.println("******** Starting Test "+testNr+" ********");
- Phone[] phones = voice.getSettings(false).getPhones();
- // create int Array from all phone ids
- int[] phonesToChangeStatus = new int[phones.length];
-
- System.out.println("Current phone status:");
- for (int j = 0; j < phones.length; j++) {
- phonesToChangeStatus[j] = phones[j].getId();
- System.out.println(phones[j].getName() + " " + phones[j].getId() + " " + !voice.getSettings(false).isPhoneDisabled(phones[j].getId()));
- }
-
- //Disable all phones
- for (int j = 0; j < phones.length; j++) {
- voice.phoneDisable(phones[j].getId());
- }
-
-
- phones = voice.getSettings(true).getPhones();
- // Output
- System.out.println("After deactivate multi:");
- for (int j = 0; j < phones.length; j++) {
- System.out.println(phones[j].getName() + " " + phones[j].getId() + " " + !voice.getSettings(false).isPhoneDisabled(phones[j].getId()));
- }
-
- //Enable all phones
- for (int j = 0; j < phones.length; j++) {
- voice.phoneEnable(phones[j].getId());
- }
-
- // Output
- phones = voice.getSettings(true).getPhones();
- System.out.println("After activate multi:");
- for (int j = 0; j < phones.length; j++) {
- System.out.println(phones[j].getName() + " " + phones[j].getId() + " " + !voice.getSettings(false).isPhoneDisabled(phones[j].getId()));
- }
-
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 2: // 2: Inbox paging
- System.out.println("******** Starting Test "+testNr+" ********");
-// Thread.sleep(2000);
- System.out.println(voice.getInboxPage(1000));
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 3: // 3: Call Announcement settings (Presentation)
- System.out.println("******** Starting Test "+testNr+" ********");
- System.out.println("Type 'true' for enable, 'false' for disable");
- boolean choice = false;
- try {
- choice = Boolean.parseBoolean(br.readLine());
- } catch (Exception e) {
- System.out.println("Error trying to read the choice!"+e.getMessage());
- System.exit(1);
- }
-// Thread.sleep(2000);
- System.out.println(voice.setCallPresentation(choice));
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 4: // 4: Caller ID in
- System.out.println("******** Starting Test "+testNr+" ********");
- for (Iterator iterator = voice.getVoicemailList(true).iterator(); iterator.hasNext();) {
- Greeting type = (Greeting) iterator.next();
- System.out.println(type.toString());
- }
- System.out.println("Choose the id of the voicemail greeting to use. ie '0' system standard or '1','2'");
- String voicemailNr = "0";
- try {
- voicemailNr = br.readLine();
- } catch (Exception e) {
- System.out.println("Error trying to read the choice!"+e.getMessage());
- System.exit(1);
- }
-// Thread.sleep(2000);
- voice.setVoicemailGreetingId(voicemailNr);
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 5: // 5: Do not disturb
- System.out.println("******** Starting Test "+testNr+" ********");
- System.out.println("Type 'true' for enable, 'false' for disable");
- boolean dndChoice = false;
- try {
- dndChoice = Boolean.parseBoolean(br.readLine());
- } catch (Exception e) {
- System.out.println("Error trying to read the choice!"+e.getMessage());
- System.exit(1);
- }
- voice.setDoNotDisturb(dndChoice);
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 6: // 6: Group settings
- System.out.println("******** Starting Test "+testNr+" ********");
- Group[] groups1 = voice.getSettings(false).getSettings().getGroups();
- String jsonGroups="";
- for (int i = 0; i < groups1.length; i++) {
- jsonGroups+=groups1[i].toJson();
- }
- System.out.println("All to json:"+jsonGroups);
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 7: // 7: Read all settings - cached
- System.out.println("******** Starting Test "+testNr+" ********");
- System.out.println(voice.getSettings(false).getSettings().toJson());
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 8: // 8: Read all settings - uncached
- System.out.println("******** Starting Test "+testNr+" ********");
- System.out.println(voice.getSettings(true).getSettings().toJson());
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 9: // 9: Read all settings - pure json driven
- System.out.println("******** Starting Test "+testNr+" ********");
- try {
- System.out.println("******** Original JSON Data ********");
- JSONObject origSettings = new JSONObject(jsonData);
- System.out.println(origSettings.toString(4));
-
- System.out.println("******* Parsed back and forth ******");
- AllSettings settings2 = new AllSettings(jsonData);
- System.out.println(settings2.toJsonObject().toString(4));
-
- System.out.println("******* Creating new AllSettings from old JSON ******");
- AllSettings settings4 = new AllSettings(settings2.toJsonObject().toString());
- System.out.println(settings4.toJsonObject().toString(4));
- } catch (JSONException e) {
- System.out.println("Error displaying json:"+e.getLocalizedMessage());
- e.printStackTrace();
- }
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 10: // 10: Read all settings - pure json driven - account data
- System.out.println("******** Starting Test "+testNr+" ********");
-// try {
- System.out.println("******** Test REMOVED FOR NOW ********");
-// System.out.println("******** Original JSON Data ********");
-// String lJson = ParsingUtil.removeUninterestingParts(voice.getONLYFORTEST("https://www.google.com/voice/settings/tab/groups"), "", false);
-// JSONObject origSettings = new JSONObject(lJson);
-// System.out.println(origSettings.toString(4));
-//
-// System.out.println("******* JsonObject from AllSettings ******");
-// AllSettings settings2 = new AllSettings(lJson);
-// JSONObject objFromAllSettings = settings2.toJsonObject();
-// System.out.println(objFromAllSettings.toString(4));
-//
-// System.out.println("******* Creating new AllSettings from old JSON ******");
-// AllSettings settings3 = new AllSettings(objFromAllSettings.toString());
-// System.out.println(settings3.toJsonObject().toString(4));
-//
-// } catch (JSONException e) {
-// System.out.println("Error displaying json:"+e.getLocalizedMessage());
-// e.printStackTrace();
-// }
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 11: // 11: Update Group settings
- System.out.println("******** Starting Test "+testNr+" ********");
- try {
- System.out.println("******** Before ********");
-
- AllSettings settings2 = voice.getSettings(false);
- JSONObject objFromAllSettings = settings2.toJsonObject();
- System.out.println(objFromAllSettings.toString(4));
-
- System.out.println("Choose group to change settings (15)");
- String groupId = "0";
- try {
- groupId = br.readLine();
- } catch (Exception e) {
- System.out.println("Error trying to read the choice!"+e.getMessage());
- System.exit(1);
- }
-
- Group[] groups = voice.getSettings(false).getSettings().getGroups();
- for (int j = 0; j < groups.length; j++) {
- /* New Settings
- "directConnect": true,
- "disabledForwardingIds": {"1": true},
- "greetingId": 2,
- "id": "15",
- "isCustomDirectConnect": true,
- "isCustomForwarding": true,
- "isCustomGreeting": true,
- */
- if(groups[j].getId().equals(groupId)) {
- System.out.println("Changing settings for Group: "+groups[j].getName());
- groups[j].setCustomDirectConnect(true);
- groups[j].setDirectConnect(true);
- groups[j].setCustomForwarding(true);
- List disList = new ArrayList();
- disList.add(new DisabledForwardingId("1", true));
- groups[j].setDisabledForwardingIds(disList);
- groups[j].setCustomGreeting(true);
- groups[j].setGreetingId(2);
- voice.setNewGroupSettings(groups[j]);
- }
- }
-
- System.out.println("******** After ********");
- AllSettings settings3 = voice.getSettings(true);
- System.out.println(settings3.toJsonObject().toString(4));
-
- } catch (JSONException e) {
- System.out.println("Error displaying json:"+e.getLocalizedMessage());
- e.printStackTrace();
- }
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 12: // 12: Group isPhoneEnabled Tests
- System.out.println("******** Starting Test "+testNr+" ********");
- try {
- AllSettings settings3 = voice.getSettings(true);
- Group[] groups = settings3.getSettings().getGroups();
- int[] phoneIds = settings3.getPhoneList();
- for (int j = 0; j < groups.length; j++) {
- System.out.println("+++ Disabled Phones in "+groups[j].getName()+" +++");
- for (int j2 = 0; j2 < phoneIds.length; j2++) {
- System.out.println(phoneIds[j2] + ":" + groups[j].isPhoneDisabled(phoneIds[j2]));
- }
-
- }
- } catch (JSONException e) {
- System.out.println("Error displaying json:"+e.getLocalizedMessage());
- e.printStackTrace();
- }
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
-
- case 13: // 13: List Default Phones and Enabled/Disabled Setting
- System.out.println("*********Starting Test "+testNr+" *******");
-
- AllSettings settings3 = voice.getSettings(true);
- List phoneList =settings3.getPhoneListAsList();
- Phone[] actualPhoneArray = settings3.getPhones();
- for(Integer phoneint:phoneList){
- inner: for(int ig=0;ig threads = voice.getSMSThreads();
- for (SMSThread thread : threads) {
- System.out.println("\tThread " + thread.getId());
- for (SMS sms : thread.getAllSMS()) {
- System.out.println("\t\tMessage: " + sms.getContent());
- }
- }
- System.out.println("******** Finished Test "+testNr+" ********");
- break;
- case 16: // 15: Captcha Test
- System.out.println("*********Starting Test "+testNr+" *******");
- System.out.println("Enter Fake Password:");
- String tempPass = br.readLine();
-
- boolean tryAgain = true;
- int counter = 0;
- while(tryAgain) {
- System.out.println("\n\rAttempting new Login... " + counter++);
- try {
- voice = null;
- /* (Toby) added here the counter to the tempPass, so that we actually get the CaptchaEx - bc without
- * it I had 300 tries only getting the IO Error, with counter (each time a different password)
- * I got the captcha after 30 tries
- */
- voice = new Voice(userName, tempPass+counter,"GoogleVoiceJavaUnitTests",true,Voice.GOOGLE);
- } catch (CaptchaRequiredException e) {
- System.out.println("Captcha found! - " + e.getLocalizedMessage());
- System.out.println("Token: " + e.getCaptchaToken());
- System.out.println("URL : " + e.getCaptchaUrl());
- System.out.println("Please enter the captcha challenge response from the URL:");
- String response = br.readLine();
- // create the voice object with the response
- voice = new Voice(userName, pass,"GoogleVoiceJavaUnitTests",true,Voice.GOOGLE,response,e.getCaptchaToken());
- tryAgain = false;
- } catch (IOException e) {
- System.out.println("IO error creating voice! - "+e.getLocalizedMessage());
-
- //System.out.println("Try Again? (Y/N):");
- //tryAgain = br.readLine().equalsIgnoreCase("Y");
- //System.out.println();
- }
-
- }
-
-
-
-
-// voice = null;
-// voice = new Voice(userName, tempPass,"GoogleVoiceJavaUnitTests",true,Voice.GOOGLE);
-
- System.out.println("");
- break;
- default:
- System.out.println("Test "+testNr+" not found, exiting.");
- System.exit(1);
- break;
- }
-
-
-// Thread.sleep(2000);
-
- //System.out.println(voice.getSMS());
- //System.out.println(voice.getInbox());
-// System.out.println(voice.getInboxPage(1000));
- //System.out.println(voice.getInboxPage(100));
- /*
- System.out.println(voice.getInbox());
- Thread.sleep(2000);
- System.out.println(voice.phoneDisable(6));
-
-
- System.out.println(voice.getInbox());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getMissed());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getPlaced());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getReceived());
- Thread.sleep(2000);
- System.out.println("**********************************");
-
- System.out.println("**********************************");
- System.out.println(voice.getRecorded());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getSMS());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getSpam());
- Thread.sleep(2000);
- System.out.println("**********************************");
- System.out.println(voice.getStarred());
- Thread.sleep(2000);
- System.out.println("**********************************");
- */
-
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
- } catch (IOException e) {
- e.printStackTrace();
- } catch (JSONException e) {
- e.printStackTrace();
- }
- listTests(); // List the Tests again
- }
-
- /**
- * Load a Properties File
- * @param propsFile
- * @return Properties
- * @throws IOException
- */
- private static Properties load(String propsFile) throws IOException {
-// Properties props = new Properties();
-//
-// ResourceBundle.getBundle(propsFile);
-// final ResourceBundle rb = ResourceBundle.getBundle(propsFile, Locale.getDefault (), ClassLoader.getSystemClassLoader());
-// for (Enumeration keys = rb.getKeys (); keys.hasMoreElements ();)
-// {
-// final String key = (String) keys.nextElement ();
-// final String value = rb.getString (key);
-//
-// props.put (key, value);
-// }
-// return props;
-
- Properties result = null;
- InputStream in = null;
-
- if (! propsFile.endsWith (".properties"))
- propsFile = propsFile.concat (".properties");
-
- // Returns null on lookup failures:
- in = ClassLoader.getSystemClassLoader().getResourceAsStream (propsFile);
- if (in != null)
- {
- result = new Properties ();
- result.load (in); // Can throw IOException
- }
- testProps = result;
- return result;
- }
-
-}
diff --git a/wiki/ApplicationGallery.wiki b/wiki/ApplicationGallery.wiki
new file mode 100644
index 0000000..cc9ed68
--- /dev/null
+++ b/wiki/ApplicationGallery.wiki
@@ -0,0 +1,12 @@
+#summary A listing of Applications which rely on Google Voice Java
+#labels Featured
+
+Please let us know about your application which uses Google Voice Java
+
+==Google Voice Locations==
+
+The Android Application built by the founder of Google-Voice-Java, [http://code.google.com/p/android-google-voice-locations/ Google Voice Locations], is now Open Source under the GPL. It was built on this Google Voice Java Library. It uses the Enable/Disable functionality of Google Voice Java to allow location aware phone activation preferences to be set on Android.
+
+==Locale Google Voice Plugin==
+
+[http://sites.google.com/site/steelgirderdevelopmentsite/home/ Steelgirder Development] has a wonderful plugin for Locale which incorporates the latest Google Voice Java API updates such as custom greeting, enable/disable, do not disturb, group settings, etc.
\ No newline at end of file
diff --git a/wiki/Changelog.wiki b/wiki/Changelog.wiki
new file mode 100644
index 0000000..bbca38b
--- /dev/null
+++ b/wiki/Changelog.wiki
@@ -0,0 +1,18 @@
+#summary A list of changes in the new version of google-voice-java
+
+= Changelog =
+
+New in version 1.4
+
+ Version 1.4 contains many upgrades. Some breaking changes may exist from 1.3 so test your code thoroughly.
+
+ *TThe Phone objects created at startup and placed in the phoneList now contain an enabled/disabled boolean parameter corresponding to whether the phones are set to ring or not.
+
+ *CCall Presentation can now be toggled on and off
+
+ *NNew Record Objects and a parser have been added for things like Voicemail, Call, SMS, Transcript
+
+
+New in version 1.3
+
+ *CCalls to Google are now "spoofed" to appear as though they originate from Google Chrome. This was done because in developing Google Voice Locations for the Android platform, it was observed that Google would not properly deliver webpage content to the API if it originated from a mobile device. Spoofing solved the problem. We have thus hard-coded the user-agent property to Chrome to make the behaviour consistent from every device.
\ No newline at end of file
diff --git a/wiki/ClassHierarchy.wiki b/wiki/ClassHierarchy.wiki
new file mode 100644
index 0000000..230fcf1
--- /dev/null
+++ b/wiki/ClassHierarchy.wiki
@@ -0,0 +1,14 @@
+#summary The class Structure of the Project.
+#labels Phase-Design
+
+= Introduction =
+
+The class Structure of the Project
+
+
+= Class Diagram only class names and relations =
+[http://google-voice-java.googlecode.com/files/class_diagram_classnames.gif http://google-voice-java.googlecode.com/files/class_diagram_classnames.gif]
+
+= Class Diagram detailed =
+Download detailed diagram with all methods and fields
+http://code.google.com/p/google-voice-java/downloads/detail?name=class_diagram_detailed.jpeg&can=2&q=#makechanges
\ No newline at end of file
diff --git a/wiki/Contributing.wiki b/wiki/Contributing.wiki
new file mode 100644
index 0000000..840ff46
--- /dev/null
+++ b/wiki/Contributing.wiki
@@ -0,0 +1,67 @@
+=Setting Up a Development Enviorment and Contributing=
+
+Are you looking to start contributing to the google-voice-java project? Or perhaps just hack some custom changes in on your own? Here are a couple tips to help you get set up.
+
+== Mailing List ==
+The easiest way to get in contact with the contributers is through the mailing list located here: http://groups.google.com/group/google-voice-java
+
+== Setting Up a Development Environment==
+
+=== Downloading the Source Code ===
+
+There are instructions on how to download the source here:
+
+[http://code.google.com/p/google-voice-java/source/checkout]
+
+For a one liner run the following command from your shell:
+
+{{{
+svn checkout http://google-voice-java.googlecode.com/svn/trunk/ google-voice-java-read-only
+}}}
+
+=== Building from Source ===
+
+Currently the project is developed in Eclipse, using its automated build tools. If you don't already have it, you will need a copy of Eclipse from:
+
+http://www.eclipse.org/downloads/
+
+The IDE for Java Developers is fine. You don't need to worry about the other versions offered.
+
+Once you have Eclipse installed, start the IDE and do the following:
+
+*File Menu > New > Java Project
+*Check the create project from existing source radio, and navigate to the folder you downloaded earlier.
+*Make sure you are using Java 1.6 or greater! You may have compile errors with a lower version.
+*Click finish.
+
+Click the round green run button. This will build the source and execute it. You may need to specify, run as "Java Application" or a startup class. Choose test/test.java.
+
+If everything has gone according to plan, you will see:
+
+{{{
+Could not read the testProps, falling back to input. (null)
+Enter Your Google Voice Username, eg user@gmail.com:
+}}}
+
+You have built from source!
+
+We're working on Eclipse independent build tools for the project such as Maven and Ant. If you prefer a different coding environment than Eclipse, you can wait for these scripts or write your own and contribute them.
+
+=== Contributing ===
+
+Remember back when we told you how to download the source... Well, it turns out that is read-only. If you want to contribute back to the project, you will need committer status on the project and a different url. You need a google account (We hope you can figure this out on your own!). Once you have an account, request commit permission from the current project maintainer. If you aren't too shady, you get commit access. Then when you visit:
+
+[http://code.google.com/p/google-voice-java/source/checkout]
+
+you will see a new url that looks like this:
+
+{{{
+# Project members authenticate over HTTPS to allow committing changes.
+svn checkout https://google-voice-java.googlecode.com/svn/trunk/ google-voice-java --username user.name@gmail.com
+
+When prompted, enter your generated googlecode.com password.
+}}}
+
+If you checkout from that, you will be able to push upstream.
+
+Happy hacking!
\ No newline at end of file
diff --git a/wiki/GettingStarted.wiki b/wiki/GettingStarted.wiki
new file mode 100644
index 0000000..30d199f
--- /dev/null
+++ b/wiki/GettingStarted.wiki
@@ -0,0 +1,175 @@
+= IMPORTANT NOTE =
+This Getting Started guide is significantly outdated, especially regarding project building and authentication.
+The project has been migrated to Gradle (from Ant) and now uses OAuth 2.0 for authentication (ClientLogin is defunct).
+
+'''Please refer to the main [Project_Root_README.md] file for current instructions on building the project and setting up authentication.'''
+
+The API usage examples below might still offer some insight but should be used with caution, keeping in mind the authentication mechanism has changed.
+
+
+#summary Simple Overview of this Simple Library.
+#labels Featured,Phase-Deploy,Phase-Implementation,Phase-Support,Phase-Requirements,Phase-Design
+
+
+(This rough guide was written for version 1.3. Much new functionality has been added to future versions. We could definitely use some updated documentation for the new functionality if anyone wishes to volunteer.)
+
+
+
+
+= Getting Started =
+
+Google Voice Java is an API. You must first have a Google Voice Account and know how to hack some Java for this to be useful.
+
+So far our tests of this library have worked well. To do a simple command line test, enter the following in your commandline:
+
+{{{
+
+ java -jar {path}/google-voice-java-{version}.jar
+
+}}}
+
+This simply logs in, displays your auth key, fetches contents of your inbox and sentbox, and displays the HTML. It runs the test.jar script. Add the jar to your classpath and access the Voice.class to do whatever you need.
+
+
+
+
+
+Now you must create a Voice object
+
+{{{
+
+import com.techventus.server.voice.Voice;
+
+...
+
+ Voice voice = new Voice(userName, pass); // Note: This constructor is legacy. See new auth flow.
+
+...
+
+}}}
+
+Now, for example, to view the Inbox, call the function:
+
+{{{
+
+ voice.getInbox();
+
+}}}
+
+
+This function, and the other similar functions return raw HTML or XML code which must be parsed by you. We may add some kind of parser in the future. Since this project is FOSS, feel free to contribute one.
+
+
+
+== Placing Calls ==
+
+
+To place a call, you simply pass the number from which you wish to call (originNumber) and the number being called (destinationNumber). Google Voice only allows you to use an Origin Number which has already been registered with them as associated with that Google Voice Account.
+
+We havent tried otherwise, but would recommend against using special characters in the phone numbers. However, we have tested using '+' with International calling and it works just fine.
+
+{{{
+...
+
+ String originNumber = "2125551234";
+
+ String destinationNumber = "4155557895";
+
+ voice.call(originNumber, destinationNumber);
+
+...
+}}}
+
+
+When this code is run, the originNumber should ring (assuming the registration checks out).
+
+
+
+
+== Sending SMS Text Messages ==
+
+
+Sending an SMS is also trivial.
+
+{{{
+...
+
+ voice.sendSMS(destinationNumber, txt);
+
+...
+}}}
+
+
+
+== Logging In (OAuth 2.0) ==
+Authentication is now handled via OAuth 2.0. This involves a one-time setup using the `initiateGoogleAuth` Gradle task, which guides you through browser-based Google login and consent.
+
+'''For detailed steps, please see the [Project_Root_README.md#authentication-oauth-20-setup---one-time Authentication Section in the README.md].'''
+
+The old method of `Voice voice = new Voice(userName, pass);` is no longer applicable for primary authentication. The library will automatically use tokens obtained through the OAuth flow, which are loaded by `GVCookieManager`. The `Voice` class constructors that accept username and password still exist but rely on the deprecated ClientLogin mechanism, which is unlikely to work and should not be the primary way to use the library.
+
+If something is off and you trigger a CAPTCHA from Google Voice, you will probably have to log back into the account manually. This API is not equipped to handle the CAPTCHA request in any meaningful way at this time. (Note: CAPTCHA issues are less common with OAuth 2.0 but can still occur in rare circumstances with Google's systems).
+
+== Enable/Disable Phones to Receive Calls ==
+
+To enable or disable a phone, you must determine the integer identification of that phone. Upon creating a successful Voice object, a list of Phone objects is created and populated from the information in your Google Voice account, phoneList. Each Phone object in the phoneList has the following protected variables
+
+{{{
+
+ protected String id;
+ protected String number;
+ protected String formattedNumber;
+ protected String type;
+ protected String name;
+ protected String carrier;
+ protected Boolean verified;
+
+}}}
+
+perhaps the easist way to determine the id of the phone you wish to enable or disable is to search the name variable of Phones in the list and then call the id variable.
+
+Once the id is determined, enable or disable with:
+
+{{{
+ voice. phoneEnable(int ID);
+
+ voice. phoneDisable(int ID);
+
+}}}
+
+A String is returned with Google's result output of this action.
+
+
+== Other Callable Functions ==
+
+A complete list of available functions to check to pull recent info from the Google Voice Account. Again, it is up to you to do the parsing. All functions return a String or throw an IOException.
+
+
+{{{
+
+ getGeneral()
+
+ getInbox()
+
+ getStarred()
+
+ getRecent()
+
+ getSpam()
+
+ getRecorded()
+
+ getPlaced()
+
+ getReceived()
+
+ getMissed()
+
+ getSMS()
+
+
+}}}
+
+== Where to get help ==
+
+You can subscribe to our mailing list at http://groups.google.com/group/google-voice-java and post your questions there.
\ No newline at end of file
diff --git a/wiki/MavenBranch.wiki b/wiki/MavenBranch.wiki
new file mode 100644
index 0000000..c79b272
--- /dev/null
+++ b/wiki/MavenBranch.wiki
@@ -0,0 +1,63 @@
+#summary Using Maven to manage project
+
+= Introduction =
+
+The Maven branch provides an example of automating the project build, allowing it to be built outside the Eclipse IDE.
+
+Using Maven removes the need for libraries, Javadocs, and Eclipse files to be in Subversion.
+Libraries are managed as dependencies in the project pom.xml, downloaded by Maven to the local repository.
+Javadocs can be generated by a Maven plugin goal, see example below.
+Eclipse files can be generated by a Maven plugin, see example below, or these are not needed if using m2eclipse.
+
+The project depends on the modified json library (different package name). These source files were added to Subversion.
+
+The current branch represents the fewest changes to the codebase with more extensive changes described in the future steps below.
+
+The Maven pom contains project metadata, including the version. For the branch, the working version is assumed to be 2.0 and since it is under development (non-release) the -SNAPSHOT qualifier is included (2.0-SNAPSHOT).
+
+The scm urls in the pom point to the trunk location in Subversion, instead of the Maven branch location.
+
+The end of the pom includes a profile for possibly deploying the released project artifacts to the Sonatype Maven repository and Maven central repository.
+
+= Command Line Goals =
+
+These goals require [http://www.oracle.com/technetwork/java/javase/downloads/index.html Java JDK6] and [http://maven.apache.org/download.html Maven] (2.2.1 used here) to be installed.
+As specified by the Maven README, the JAVA_HOME environment variable is expected to be set to the JDK location,
+and the PATH environment variable is expected to include the Maven bin directory.
+
+Run the following commands from the project base directory, containing the pom.xml
+
+Build the project:
+ * Run: mvn clean install
+ * The built jar is located at target/google-voice-java-2.0-SNAPSHOT.jar
+
+Generate Javadocs:
+ * Run: mvn javadoc:javadoc
+ * The generated HTML files are located at target/site/apidocs
+
+Generate Eclipse project:
+ * Run: mvn eclipse:configure-workspace -Declipse.workspace=/path/to/workspace
+ * Run: mvn eclipse:eclipse
+ * The .project and .classpath files are generated
+ * Each time the pom dependencies are changed, these can be updated running eclipse:eclipse
+
+= Future Steps =
+ * Remove lib and doc directories
+ * Remove .project and .classpath files
+ * Use Maven convention for source directory:
+ * The src directory could be changed to src/main/java
+ * The source directory build property in the pom.xml can be removed
+ * The google-voice and json libraries can be separated:
+ * Change to multi-module project
+ * Change existing pom to parent pom
+ * Move json classes to new module directory with pom.xml
+ * Move google-voice classes to new module directory with pom.xml, with dependency on json module
+ * Separate jars are built for json and google-voice
+ * Trim dependencies if needed:
+ * Maven brings in transitive dependencies (icu4j, jdom, xalan, xercesImpl, xml-apis, xmlParserAPIs, xom)
+ * Unnecessary dependencies can be excluded
+ * Cleanup existing test:
+ * The test directory could be moved to src/test/java and src/test/resources
+ * The test class name could be changed to ManualVoiceTest, excluded from build testing as necessary
+ * The test class package could be changed to com.techventus.server.voice
+ * Add junit tests to src/test/java and junit test dependency to pom.xml
\ No newline at end of file
| 
com.techventus.server.voice.datatypes.PhoneOld
-
test.test
-