cherry pick 'Use List<NameValuePair> for create'

Author: Doug Black

src/main/java/com/twilio/sdk/TwilioRestClient.java

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 
 import org.apache.http.Header;
@@ -395,9 +396,16 @@ private URI buildUri(String path, List<NameValuePair> queryStringParams) {
 	 * @return the twilio rest response
 	 */
 	public TwilioRestResponse request(String path, String method,
-			Map<String, String> vars) throws TwilioRestException {
+			Map<String, String> paramMap) throws TwilioRestException {
+
+		List<NameValuePair> paramList = generateParameters(paramMap);
+		return request(path, method, paramList);
+	}
+
+	public TwilioRestResponse request(String path, String method,
+			List<NameValuePair> paramList) throws TwilioRestException {
 
-		HttpUriRequest request = setupRequest(path, method, vars);
+		HttpUriRequest request = setupRequest(path, method, paramList);
 
 		HttpResponse response;
 		try {
@@ -446,7 +454,25 @@ public TwilioRestResponse request(String path, String method,
 	public InputStream requestStream(String path, String method,
 			Map<String, String> vars) {
 
-		HttpUriRequest request = setupRequest(path, method, vars);
+		List<NameValuePair> paramList = generateParameters(vars);
+		return requestStream(path, method, paramList);
+	}
+
+	/**
+	 * Request stream.
+	 *
+	 * @param path
+	 *            the path
+	 * @param method
+	 *            the method
+	 * @param paramList
+	 *            the list of POST params
+	 * @return the input stream
+	 */
+	public InputStream requestStream(String path, String method,
+			List<NameValuePair> paramList) {
+
+		HttpUriRequest request = setupRequest(path, method, paramList);
 
 		HttpResponse response;
 		try {
@@ -474,8 +500,7 @@ public InputStream requestStream(String path, String method,
 	 * @return the http uri request
 	 */
 	private HttpUriRequest setupRequest(String path, String method,
-			Map<String, String> vars) {
-		List<NameValuePair> params = generateParameters(vars);
+			List<NameValuePair> params) {
 
 		String normalizedPath = path.toLowerCase();
 		StringBuilder sb = new StringBuilder();
@@ -529,9 +554,32 @@ private HttpUriRequest setupRequest(String path, String method,
 	 */
 	public TwilioRestResponse safeRequest(String path, String method,
 			Map<String, String> vars) throws TwilioRestException {
+
+		List<NameValuePair> paramList = generateParameters(vars);
+		return safeRequest(path, method, paramList);
+	}
+
+	/**
+	 * Make a request, handles retries + back-off for server/network errors
+	 *
+	 * @param path
+	 *            the URL (absolute w.r.t. the endpoint URL - i.e.
+	 *            /2010-04-01/Accounts)
+	 * @param method
+	 *            the HTTP method to use, defaults to GET
+	 * @param paramList
+	 *            for POST or PUT, a list of data to send, for GET will be
+	 *            appended to the URL as querystring params
+	 * @return The response
+	 * @throws TwilioRestException
+	 *             if there's an client exception returned by the TwilioApi
+	 */
+	public TwilioRestResponse safeRequest(String path, String method,
+			List<NameValuePair> paramList) throws TwilioRestException {
+
 		TwilioRestResponse response = null;
 		for (int retry = 0; retry < this.numRetries; retry++) {
-			response = request(path, method, vars);
+			response = request(path, method, paramList);
 			if (response.isClientError()) {
 				throw TwilioRestException.parseResponse(response);
 			} else if (response.isServerError()) {
@@ -565,7 +613,7 @@ public TwilioRestResponse get(String fullUri) throws TwilioRestException {
 		TwilioRestResponse response = null;
 
 		for (int retry = 0; retry < this.numRetries; retry++) {
-			response = request(fullUri, "GET", null);
+			response = request(fullUri, "GET", (Map) null);
 			if (response.isClientError()) {
 				throw TwilioRestException.parseResponse(response);
 			} else if (response.isServerError()) {

src/main/java/com/twilio/sdk/examples/RestExamples.java

@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 
 import com.twilio.sdk.TwilioRestClient;
@@ -18,6 +19,8 @@
 import com.twilio.sdk.resource.list.AccountList;
 import com.twilio.sdk.resource.list.AvailablePhoneNumberList;
 import com.twilio.sdk.resource.list.ParticipantList;
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -33,7 +36,7 @@ public class RestExamples {
 
 	/**
 	 * The main method.
-	 * 
+	 *
 	 * @param args
 	 *            the arguments
 	 * @throws TwilioRestException
@@ -72,11 +75,11 @@ public static void main(String[] args) throws TwilioRestException {
 		Map<String, String> callParams = new HashMap<String, String>();
 		callParams.put("To", "5105551212"); // Replace with a valid phone number
 		callParams.put("From", "(510) 555-1212"); // Replace with a valid phone
-													// number in your account
+		// number in your account
 		callParams.put("Url", "http://demo.twilio.com/welcome/voice/");
 		Call call = callFactory.create(callParams);
 		System.out.println(call.getSid());
-		
+
 		// Send an sms
 		SmsFactory smsFactory = mainAccount.getSmsFactory();
 		Map<String, String> smsParams = new HashMap<String, String>();
@@ -88,7 +91,7 @@ public static void main(String[] args) throws TwilioRestException {
 
 		// Search for available phone numbers & then buy a random phone number
 		AvailablePhoneNumberList phoneNumbers = mainAccount
-				.getAvailablePhoneNumbers();
+			.getAvailablePhoneNumbers();
 		List<AvailablePhoneNumber> list = phoneNumbers.getPageData();
 
 		// Buy the first number returned
@@ -112,7 +115,7 @@ public static void main(String[] args) throws TwilioRestException {
 
 		// Make a raw request to the api... note, this is deprecated style
 		TwilioRestResponse resp = client.request("/2010-04-01/Accounts", "GET",
-				null);
+				(Map) null);
 		if (!resp.isError()) {
 			System.out.println(resp.getResponseText());
 		}

src/main/java/com/twilio/sdk/resource/InstanceResource.java

@@ -2,10 +2,16 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
+import java.util.Date;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
 import com.twilio.sdk.TwilioRestClient;
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.TwilioRestResponse;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -106,6 +112,16 @@ public void update(Map<String, String> params) throws TwilioRestException {
 		this.getClient().safeRequest(this.getResourceLocation(), "POST", params);
 	}
 
+	/**
+	 * Update.
+	 *
+	 * @param params the params list
+	 * @throws TwilioRestException the twilio rest exception
+	 */
+	public void update(List<NameValuePair> params) throws TwilioRestException {
+		this.getClient().safeRequest(this.getResourceLocation(), "POST", params);
+	}
+
 	/* (non-Javadoc)
 	 * @see com.twilio.sdk.resource.Resource#parseResponse(com.twilio.sdk.TwilioRestResponse)
 	 */
@@ -114,4 +130,14 @@ protected void parseResponse(TwilioRestResponse response) {
 			Map<String, Object> properties = response.toMap();
 			this.properties = new HashMap<String, Object>(properties);
 		}
+
+	/**
+	 * return a date from the property string
+	 *
+	 * @return the date value of the input string
+	 */
+	protected Date parseDate(String inDate) {
+		if (inDate==null) {
+			return null;
+		}
 }

src/main/java/com/twilio/sdk/resource/factory/AccountFactory.java

@@ -1,24 +1,27 @@
 package com.twilio.sdk.resource.factory;
 
 import java.util.Map;
+import java.util.List;
 
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.Account;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
  * A factory for creating Account objects.
- * 
+ *
  * For more information see <a href="http://www.twilio.com/docs/api/rest/subaccounts">http://www.twilio.com/docs/api/rest/subaccounts</a>
  */
 public interface AccountFactory {
-	
+
 	/**
 	 * Creates a subaccount.
 	 *
 	 * @param params the params
 	 * @return the account
-	 * @throws TwilioRestException 
+	 * @throws TwilioRestException
 	 */
 	public Account create(Map<String, String> params) throws TwilioRestException;
+	public Account create(List<NameValuePair> params) throws TwilioRestException;
 }

src/main/java/com/twilio/sdk/resource/factory/ApplicationFactory.java

@@ -1,25 +1,28 @@
 package com.twilio.sdk.resource.factory;
 
 import java.util.Map;
+import java.util.List;
 
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.Application;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
  * A factory for creating Application objects.
- * 
+ *
  * For more information see <a href=" http://www.twilio.com/docs/api/rest/applications#list-post"> http://www.twilio.com/docs/api/rest/applications#list-post</a>
  *
  */
 public interface ApplicationFactory {
-	
+
 	/**
 	 * Creates the.
 	 *
 	 * @param params the params
 	 * @return the application
-	 * @throws TwilioRestException 
+	 * @throws TwilioRestException
 	 */
 	public Application create(Map<String, String> params) throws TwilioRestException;
+	public Application create(List<NameValuePair> params) throws TwilioRestException;
 }

src/main/java/com/twilio/sdk/resource/factory/CallFactory.java

@@ -1,22 +1,25 @@
 package com.twilio.sdk.resource.factory;
 
 import java.util.Map;
+import java.util.List;
 
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.Call;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
  * A factory for creating Call objects.
  */
 public interface CallFactory {
-	
+
 	/**
 	 * Creates the.
 	 *
 	 * @param params the params
 	 * @return the call
-	 * @throws TwilioRestException 
+	 * @throws TwilioRestException
 	 */
 	public Call create(Map<String, String> params) throws TwilioRestException;
+	public Call create(List<NameValuePair> params) throws TwilioRestException;
 }

src/main/java/com/twilio/sdk/resource/factory/IncomingPhoneNumberFactory.java

@@ -1,22 +1,33 @@
 package com.twilio.sdk.resource.factory;
 
 import java.util.Map;
+import java.util.List;
 
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.IncomingPhoneNumber;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
  * A factory for creating IncomingPhoneNumber objects.
  */
 public interface IncomingPhoneNumberFactory {
-	
+
 	/**
-	 * Creates the.
+	 * Creates the IncomingPhoneNumber
 	 *
-	 * @param params the params
+	 * @param params the params map
 	 * @return the incoming phone number
-	 * @throws TwilioRestException 
+	 * @throws TwilioRestException
 	 */
 	public IncomingPhoneNumber create(Map<String, String> params) throws TwilioRestException;
+
+	/**
+	 * Creates the IncomingPhoneNumber
+	 *
+	 * @param params the param list
+	 * @return the incoming phone number
+	 * @throws TwilioRestException
+	 */
+	public IncomingPhoneNumber create(List<NameValuePair> params) throws TwilioRestException;
 }

src/main/java/com/twilio/sdk/resource/factory/OutgoingCallerIdFactory.java

@@ -1,22 +1,33 @@
 package com.twilio.sdk.resource.factory;
 
 import java.util.Map;
+import java.util.List;
 
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.CallerIdValidation;
+import org.apache.http.NameValuePair;
 
 // TODO: Auto-generated Javadoc
 /**
  * A factory for creating OutgoingCallerId objects.
  */
 public interface OutgoingCallerIdFactory {
-	
+
 	/**
-	 * Creates the.
+	 * Creates the OutgoingCallerId
 	 *
-	 * @param params the params
+	 * @param params the params map
 	 * @return the caller id validation
-	 * @throws TwilioRestException 
+	 * @throws TwilioRestException
 	 */
 	public CallerIdValidation create(Map<String, String> params) throws TwilioRestException;
+
+	/**
+	 * Creates the OutgoingCallerId
+	 *
+	 * @param params the params
+	 * @return the caller id validation
+	 * @throws TwilioRestException
+	 */
+	public CallerIdValidation create(List<NameValuePair> params) throws TwilioRestException;
 }