Deprecated code removal

Author: nagarikantipavan

src/main/java/net/authorize/util/HttpClient.java

@@ -4,46 +4,28 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLDecoder;
 import java.security.KeyStore;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.params.ConnRoutePNames;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.protocol.HTTP;
 
 import net.authorize.Environment;
-import net.authorize.ResponseField;
-import net.authorize.Transaction;
 
 /**
  * Transportation object used to facilitate the communication with the
@@ -73,141 +55,8 @@ public class HttpClient {
 		httpReadTimeout = (httpReadTimeout == 0 ? Constants.HTTP_READ_TIME_OUT_DEFAULT_VALUE : httpReadTimeout);
 	}
 
-	/**
-	 * Creates the http post object for an environment and transaction container.
-	 *
-	 * @param env
-	 * @param transaction
-	 * @return HttpPost object
-	 *
-	 * @throws Exception
-	 */
-	@Deprecated
-	private static HttpPost createHttpPost(Environment env, Transaction transaction) throws Exception {
-		URI postUrl;
-		HttpPost httpPost = null;
-
-		/*
-		 * if(transaction instanceof net.authorize.aim.Transaction || transaction
-		 * instanceof net.authorize.sim.Transaction) {
-		 * 
-		 * if(transaction instanceof net.authorize.aim.Transaction &&
-		 * ((net.authorize.aim.Transaction)transaction).isCardPresent()) {
-		 */
-
-		postUrl = new URI(env.getCardPresentUrl() + "/gateway/transact.dll");
-		/* } else { */
-		postUrl = new URI(env.getBaseUrl() + "/gateway/transact.dll");
-		/* } */
-
-		httpPost = new HttpPost(postUrl);
-
-		httpPost.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false);
-
-		// set the tcp connection timeout
-		httpPost.getParams().setIntParameter(HttpConnectionParams.CONNECTION_TIMEOUT, httpConnectionTimeout);
-		// set the time out on read-data request
-		httpPost.getParams().setIntParameter(HttpConnectionParams.SO_TIMEOUT, httpReadTimeout);
-
-		httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
-		httpPost.setEntity(new StringEntity(transaction.toNVPString(), HTTP.UTF_8));
-		/*
-		 * } else if (transaction instanceof net.authorize.arb.Transaction ||
-		 * transaction instanceof net.authorize.cim.Transaction || transaction
-		 * instanceof net.authorize.reporting.Transaction) {
-		 */
-
-		postUrl = new URI(env.getXmlBaseUrl() + "/xml/v1/request.api");
-		httpPost = new HttpPost(postUrl);
-		httpPost.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false);
-
-		// set the TCP connection timeout
-		httpPost.getParams().setIntParameter(HttpConnectionParams.CONNECTION_TIMEOUT, httpConnectionTimeout);
-		// set the time out on read-data request
-		httpPost.getParams().setIntParameter(HttpConnectionParams.SO_TIMEOUT, httpReadTimeout);
-
-		httpPost.setHeader("Content-Type", "text/xml; charset=utf-8");
-		httpPost.setEntity(new StringEntity(transaction.toXMLString(), HTTP.UTF_8));
-		/* } */
 
-		return httpPost;
-	}
-
-	/**
-	 * Creates a response map for a given response string and transaction container.
-	 *
-	 * @param transaction
-	 * @param responseString
-	 * @return container map containing semi-processed data after request was posted
-	 * @throws UnsupportedEncodingException
-	 */
-	/* @Deprecated */
-	/*
-	 * private static Map<ResponseField, String> createResponseMap(Transaction
-	 * transaction, String responseString) throws UnsupportedEncodingException {
-	 * 
-	 * Map<ResponseField, String> responseMap = null;
-	 * 
-	 * // aim/sim if(transaction instanceof net.authorize.aim.Transaction ||
-	 * transaction instanceof net.authorize.sim.Transaction) {
-	 * 
-	 * String decodedResponseData = URLDecoder.decode(responseString, HTTP.UTF_8);
-	 * 
-	 * 
-	 * responseMap = ResponseParser.parseResponseString(decodedResponseData); }
-	 * 
-	 * return responseMap; }
-	 */
-
-	/**
-	 * Executes a Transaction against a given Environment.
-	 *
-	 * @param environment
-	 * @param transaction
-	 * @return container map containing semi-processed data after request was posted
-	 */
-	/* @Deprecated */
-	/*
-	 * public static Map<ResponseField, String> execute(Environment environment,
-	 * Transaction transaction) { Map<ResponseField, String> responseMap = new
-	 * HashMap<ResponseField, String>();
-	 * 
-	 * if(environment != null && transaction != null) { try { CloseableHttpClient
-	 * httpClient = getHttpsClient();
-	 * 
-	 * // create the HTTP POST object HttpPost httpPost =
-	 * createHttpPost(environment, transaction);
-	 * 
-	 * // execute the request HttpResponse httpResponse =
-	 * httpClient.execute(httpPost); String rawResponseString; if(httpResponse !=
-	 * null && httpResponse.getStatusLine().getStatusCode() == 200) { HttpEntity
-	 * entity = httpResponse.getEntity();
-	 * 
-	 * // get the raw data being received InputStream instream =
-	 * entity.getContent(); rawResponseString = convertStreamToString(instream); }
-	 * // handle HTTP errors else { StringBuilder responseBuilder = new
-	 * StringBuilder();
-	 * responseBuilder.append(3).append(net.authorize.aim.Transaction.
-	 * TRANSACTION_FIELD_DELIMITER);
-	 * responseBuilder.append(3).append(net.authorize.aim.Transaction.
-	 * TRANSACTION_FIELD_DELIMITER);
-	 * responseBuilder.append(22).append(net.authorize.aim.Transaction.
-	 * TRANSACTION_FIELD_DELIMITER); responseBuilder.append(httpResponse != null ?
-	 * httpResponse.getStatusLine().getReasonPhrase() : " "); rawResponseString =
-	 * responseBuilder.toString(); }
-	 * 
-	 * httpClient.getConnectionManager().shutdown();
-	 * 
-	 * String cleanResponseString =
-	 * XmlUtility.descapeStringForXml(rawResponseString);
-	 * 
-	 * responseMap = HttpClient.createResponseMap(transaction, cleanResponseString);
-	 * } catch (Exception e) { LogHelper.warn(logger,
-	 * "Exception getting response: '%s': '%s', '%s'", e.getMessage(), e.getCause(),
-	 * Arrays.toString(e.getStackTrace())); } }
-	 * 
-	 * return responseMap; }
-	 */
+	
 
 	/**
 	 * Converts a response inputstream into a string.
@@ -247,71 +96,7 @@ public static String convertStreamToString(InputStream is) {
 		return sb.toString();
 	}
 
-	/**
-	 * Executes a Transaction against a given Environment.
-	 *
-	 * @param environment
-	 * @param transaction
-	 * @return BasicXmlDocument containing semi-processed data after request was
-	 *         posted
-	 */
-	/*
-	 * @Deprecated public static BasicXmlDocument executeXML(Environment
-	 * environment, Transaction transaction) { BasicXmlDocument response = new
-	 * BasicXmlDocument();
-	 * 
-	 * if(environment != null && transaction != null) { try { CloseableHttpClient
-	 * httpClient = getHttpsClient();
-	 * 
-	 * // create the HTTP POST object HttpPost httpPost =
-	 * createHttpPost(environment, transaction);
-	 * 
-	 * // execute the request HttpResponse httpResponse =
-	 * httpClient.execute(httpPost); String rawResponseString; if(httpResponse !=
-	 * null && httpResponse.getStatusLine().getStatusCode() == 200) { HttpEntity
-	 * entity = httpResponse.getEntity();
-	 * 
-	 * // get the raw data being received InputStream instream =
-	 * entity.getContent(); rawResponseString = convertStreamToString(instream); }
-	 * else { StringBuilder responseBuilder = new StringBuilder(); if(transaction
-	 * instanceof net.authorize.arb.Transaction || transaction instanceof
-	 * net.authorize.cim.Transaction || transaction instanceof
-	 * net.authorize.reporting.Transaction) {
-	 * 
-	 * responseBuilder.append("<?xml version=\"1.0\" ?>");
-	 * responseBuilder.append("<messages><resultCode>Error</resultCode>");
-	 * responseBuilder.append("<message><code>E00001</code>");
-	 * responseBuilder.append("<text>"); responseBuilder.append(httpResponse !=
-	 * null?httpResponse.getStatusLine().getReasonPhrase():"");
-	 * responseBuilder.append("</text></message></messages>"); } else {
-	 * responseBuilder.append("<?xml version=\"1.0\" ?>");
-	 * responseBuilder.append("<response>");
-	 * responseBuilder.append("<ResponseCode>3</ResponseCode>");
-	 * responseBuilder.append(
-	 * "<Errors><Error><ErrorCode>22</ErrorCode><ErrorText><![CDATA[");
-	 * responseBuilder.append(httpResponse !=
-	 * null?httpResponse.getStatusLine().getReasonPhrase():"");
-	 * responseBuilder.append("]]></ErrorText></Error></Errors></response>"); }
-	 * 
-	 * rawResponseString = responseBuilder.toString(); }
-	 * 
-	 * 
-	 * httpClient.getConnectionManager().shutdown();
-	 * 
-	 * if(rawResponseString == null) return null;
-	 * 
-	 * 
-	 * int mark = rawResponseString.indexOf("<?xml"); if(mark == -1){ return null; }
-	 * 
-	 * response.parseString(rawResponseString.substring(mark,rawResponseString.
-	 * length())); if(response.IsAccessible() == false){ return null; } } catch
-	 * (Exception e) { LogHelper.warn(logger,
-	 * "Exception getting response: '%s': '%s', '%s'", e.getMessage(), e.getCause(),
-	 * Arrays.toString(e.getStackTrace())); } }
-	 * 
-	 * return response; }
-	 */
-
+	
 	/**
 	 * @return returns an SSL context with TLSv1.2 protocol instance to be used in
 	 *         the call

src/test/java/net/authorize/api/controller/test/ApiCoreTestBase.java

@@ -179,7 +179,6 @@ public void setUp() throws Exception {
 		counterStr = getRandomString("");
 
 		now = Calendar.getInstance().getTime();
-		// nowString = DateUtil.getFormattedDate(now, ReportingDetails.DATE_FORMAT);
 
 		datatypeFactory = DatatypeFactory.newInstance();
 		// TODO add / subtract relative