Merge branch 'master' of https://github.com/CyberSource/cybersource-rest-client-java into dec19-dev

# Conflicts:
#	generator/cybersource-java-template/libraries/okhttp-gson/ApiClient.mustache

Author: gnongsie

generator/cybersource-java-template/libraries/okhttp-gson/ApiClient.mustache

@@ -12,16 +12,16 @@
 
 package Invokers;
 
-import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
+import java.net.HttpRetryException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
@@ -43,42 +43,42 @@ import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
-
 import org.apache.logging.log4j.Logger;
-
 import com.cybersource.authsdk.core.Authorization;
 import com.cybersource.authsdk.core.ConfigException;
 import com.cybersource.authsdk.core.MerchantConfig;
 import com.cybersource.authsdk.log.Log4j;
 import com.cybersource.authsdk.payloaddigest.PayloadDigest;
 import com.cybersource.authsdk.util.GlobalLabelParameters;
 import com.cybersource.authsdk.util.PropertiesUtil;
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Callback;
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.MultipartBuilder;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.internal.http.HttpMethod;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
-
 import Invokers.auth.ApiKeyAuth;
 import Invokers.auth.Authentication;
 import Invokers.auth.HttpBasicAuth;
 import Invokers.auth.OAuth;
+import okhttp3.Authenticator;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Credentials;
+import okhttp3.FormBody;
+import okhttp3.FormBody.Builder;
+import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.Route;
+import okhttp3.internal.http.HttpMethod;
+import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
 import okio.BufferedSink;
 import okio.Okio;
 
@@ -88,7 +88,7 @@ public class ApiClient {
 	public static final int ANDROID_SDK_VERSION;
 	public String responseCode;
 	public String status;
-	public String responseBody;
+	public InputStream responseBody;
 	public String respBody;
 	public MerchantConfig merchantConfig;
 
@@ -154,6 +154,12 @@ public class ApiClient {
 		
 		versionInfo = getClientID();
 
+		httpClient = new OkHttpClient.Builder()
+			    .connectTimeout(1, TimeUnit.SECONDS)
+			    .writeTimeout(60, TimeUnit.SECONDS)
+			    .readTimeout(60, TimeUnit.SECONDS)
+			    .build();
+
 		verifyingSsl = true;
 
 		json = new JSON(this);
@@ -197,6 +203,54 @@ public class ApiClient {
 
 	public ApiClient(MerchantConfig merchantConfig) {
 		this();
+		final boolean useProxy = merchantConfig.isUseProxyEnabled();
+		final String username = merchantConfig.getProxyUser();
+		final String password = merchantConfig.getProxyPassword();
+		int proxyPort = merchantConfig.getProxyPort();
+		String proxyHost = merchantConfig.getProxyAddress();
+
+		Authenticator proxyAuthenticator;
+
+		if (useProxy && (proxyHost != null && !proxyHost.isEmpty())) {
+			if ((username != null && !username.isEmpty()) &&
+				(password != null && !password.isEmpty())) {
+				proxyAuthenticator = new Authenticator() {
+					private int proxyCounter = 0;
+
+					@Override
+					public Request authenticate(Route route, Response response) throws IOException {
+						if (proxyCounter++ > 0) {
+							if (response.code() == 407) {
+								throw new HttpRetryException("Proxy Authentication Missing or Incorrect.", 407);
+							} else {							
+								throw new IOException(response.message());
+							}
+						}
+
+						String credential = Credentials.basic(username, password);
+						return response.request().newBuilder().header("Proxy-Authorization", credential).build();
+					}
+				};
+			} else {
+				proxyAuthenticator = new Authenticator() {
+					@Override
+					public Request authenticate(Route route, Response response) throws IOException {
+						return response.request().newBuilder().build();
+					}
+				};
+			}
+
+			httpClient = new OkHttpClient.Builder()
+					.connectTimeout(1, TimeUnit.SECONDS)
+					.writeTimeout(60, TimeUnit.SECONDS)
+					.readTimeout(60, TimeUnit.SECONDS)
+					.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)))
+					.proxyAuthenticator(proxyAuthenticator)
+					.build();
+
+			this.setHttpClient(httpClient);			
+		}
+
 		this.merchantConfig = merchantConfig;
 
 	}
@@ -681,7 +735,7 @@ public class ApiClient {
 	 * @return Timeout in milliseconds
 	 */
 	public int getConnectTimeout() {
-		return httpClient.getConnectTimeout();
+		return httpClient.connectTimeoutMillis();
 	}
 
 	/**
@@ -693,7 +747,7 @@ public class ApiClient {
 	 * @return Api client
 	 */
 	public ApiClient setConnectTimeout(int connectionTimeout) {
-		httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+		this.httpClient = this.httpClient.newBuilder().connectTimeout(connectionTimeout, TimeUnit.MILLISECONDS).build();
 		return this;
 	}
 
@@ -891,21 +945,15 @@ public class ApiClient {
 	 */
 	@SuppressWarnings("unchecked")
 	public <T> T deserialize(Response response, Type returnType) throws ApiException {
-		if (response == null /* || returnType == null */) {
+		if (response == null) {
 			return null;
 		}
-		if (returnType == null && response != null) {
+		
+		if ((returnType == null && response != null) || ("byte[]".equals(returnType.toString()))) {
 			try {
-				return (T) response.body().bytes();
-			} catch (IOException e) {
-				throw new ApiException(e);
-			}
-		} else
+				T respBody =  (T) response.body().byteStream();
 
-		if ("byte[]".equals(returnType.toString())) {
-			// Handle binary response (byte array).
-			try {
-				return (T) response.body().bytes();
+				return respBody;
 			} catch (IOException e) {
 				throw new ApiException(e);
 			}
@@ -1079,25 +1127,9 @@ public class ApiClient {
 			responseCode = String.valueOf(response.code());
 			status = response.message();
 			String headerType = response.header("Content-Type");
-			if (headerType != null)
-				if (headerType.equals("application/xml") || headerType.equals("text/csv")
-						|| headerType.equals("application/pdf")) {
-					responseBody = response.body().string();
-				}
-			if (!(responseCode.equals("200"))) {
-				if (!responseCode.equals("201")) {
-					System.out.println(response.body().string());
-				}
-			}
+						
 			T data = handleResponse(response, returnType);
 			
-			response.body().close();
-			
-			if (headerType != null)
-				if (!headerType.equals("application/xml") && !headerType.equals("text/csv")
-						&& !headerType.equals("application/pdf")) {
-					responseBody = response.toString();
-				}
 			return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
 		} catch (IOException e) {
 			throw new ApiException(e);
@@ -1135,12 +1167,12 @@ public class ApiClient {
 	public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
 		call.enqueue(new Callback() {
 			@Override
-			public void onFailure(Request request, IOException e) {
+			public void onFailure(Call call0, IOException e) {
 				callback.onFailure(new ApiException(e), 0, null);
 			}
 
 			@Override
-			public void onResponse(Response response) throws IOException {
+			public void onResponse(Call call0) throws IOException {
 				T result;
 				try {
 					result = (T) handleResponse(response, returnType);
@@ -1170,16 +1202,10 @@ public class ApiClient {
 	 */
 	public <T> T handleResponse(Response response, Type returnType) throws ApiException {
 		if (response.isSuccessful()) {
-			if (/* returnType == null || */ response.code() == 204) {
-				// returning null if the returnType is not defined,
-				// or the status code is 204 (No Content)
+			if (response.code() == 204) {
 				if (response.body() != null) {
-					try {
 						response.body().close();
-					} catch (IOException e) {
-						throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
 					}
-				}
 				return null;
 			} else {
 				return deserialize(response, returnType);
@@ -1436,6 +1462,8 @@ public class ApiClient {
 				reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
 			}
 		}
+		
+		reqBuilder.header("Connection", "close");
 	}
 
 	/**
@@ -1465,7 +1493,7 @@ public class ApiClient {
 	 * @return RequestBody
 	 */
 	public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-		FormEncodingBuilder formBuilder = new FormEncodingBuilder();
+		FormBody.Builder formBuilder = new FormBody.Builder();
 		for (Entry<String, Object> param : formParams.entrySet()) {
 			formBuilder.add(param.getKey(), parameterToString(param.getValue()));
 		}
@@ -1481,7 +1509,7 @@ public class ApiClient {
 	 * @return RequestBody
 	 */
 	public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-		MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+		MultipartBody.Builder mpBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
 		for (Entry<String, Object> param : formParams.entrySet()) {
 			if (param.getValue() instanceof File) {
 				File file = (File) param.getValue();
@@ -1598,11 +1626,11 @@ public class ApiClient {
 			if (keyManagers != null || trustManagers != null) {
 				SSLContext sslContext = SSLContext.getInstance("TLS");
 				sslContext.init(keyManagers, trustManagers, new SecureRandom());
-				httpClient.setSslSocketFactory(sslContext.getSocketFactory());
+				httpClient = httpClient.newBuilder().sslSocketFactory(sslContext.getSocketFactory()).build();
 			} else {
-				httpClient.setSslSocketFactory(null);
+				httpClient = httpClient.newBuilder().sslSocketFactory(null).build();
 			}
-			httpClient.setHostnameVerifier(hostnameVerifier);
+			httpClient = httpClient.newBuilder().hostnameVerifier(hostnameVerifier).build();
 		} catch (GeneralSecurityException e) {
 			throw new RuntimeException(e);
 		}

generator/cybersource-java-template/libraries/okhttp-gson/GzipRequestInterceptor.mustache

@@ -2,7 +2,7 @@
 
 package {{invokerPackage}};
 
-import com.squareup.okhttp.*;
+import okhttp3.*;
 import okio.Buffer;
 import okio.BufferedSink;
 import okio.GzipSink;

generator/cybersource-java-template/libraries/okhttp-gson/ProgressRequestBody.mustache

@@ -2,8 +2,8 @@
 
 package {{invokerPackage}};
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import java.io.IOException;
 

generator/cybersource-java-template/libraries/okhttp-gson/ProgressResponseBody.mustache

@@ -2,8 +2,8 @@
 
 package {{invokerPackage}};
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
 
 import java.io.IOException;
 
@@ -34,12 +34,12 @@ public class ProgressResponseBody extends ResponseBody {
     }
 
     @Override
-    public long contentLength() throws IOException {
+    public long contentLength() {
         return responseBody.contentLength();
     }
 
     @Override
-    public BufferedSource source() throws IOException {
+    public BufferedSource source() {
         if (bufferedSource == null) {
             bufferedSource = Okio.buffer(source(responseBody.source()));
         }