Intermediate host updates

Author: sachshet

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

@@ -44,6 +44,7 @@ import javax.net.ssl.*;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -734,7 +735,7 @@ public class ApiClient {
 	 * @return ApiClient
 	 */
 	public ApiClient addDefaultHeader(String key, String value) {
-		defaultHeaderMap.put(key, value);
+	    defaultHeaderMap.put(key, value);
 		return this;
 	}
 
@@ -1337,7 +1338,11 @@ public class ApiClient {
 			headerParams.put("Accept", defaultAcceptHeader);
 		}
 
-		headerParams.putAll(defaultHeaderMap);
+		for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+			if (!headerParams.containsKey(header.getKey())) {
+				headerParams.put(header.getKey(), header.getValue());
+			}
+		}
 		logger.info("Request Header Parameters:\n{}", new PrettyPrintingMap<String, String>(headerParams));
 		Request request = buildRequest(path, method, queryParams, body, headerParams, formParams, authNames,
 				progressRequestListener);
@@ -1502,7 +1507,11 @@ public class ApiClient {
 	 */
 	public String buildUrl(String path, List<Pair> queryParams) {
 		final StringBuilder url = new StringBuilder();
-		url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getRequestHost().trim()).append(path);
+		if(StringUtils.isNotBlank(merchantConfig.getIntermediateHost())) {
+			url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getIntermediateHost().trim()).append(path);
+		} else {
+			url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getRequestHost().trim()).append(path);
+		}
 
 		if (queryParams != null && !queryParams.isEmpty()) {
 			// support (constant) query string in `path`, e.g. "/posts?draft=1"

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

@@ -93,7 +93,7 @@ public class {{classname}} {
         if ({{paramName}} != null)
         {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
 
-        {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();{{#headerParams}}
+        {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>(apiClient.merchantConfig.getDefaultHeaders());{{#headerParams}}
         if ({{paramName}} != null)
         {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
 

src/main/java/Invokers/ApiClient.java

@@ -44,6 +44,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -734,7 +735,7 @@ public ApiClient setUserAgent(String userAgent) {
 	 * @return ApiClient
 	 */
 	public ApiClient addDefaultHeader(String key, String value) {
-		defaultHeaderMap.put(key, value);
+	    defaultHeaderMap.put(key, value);
 		return this;
 	}
 
@@ -1337,7 +1338,11 @@ public Call buildCall(String path, String method, List<Pair> queryParams, Object
 			headerParams.put("Accept", defaultAcceptHeader);
 		}
 
-		headerParams.putAll(defaultHeaderMap);
+		for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+			if (!headerParams.containsKey(header.getKey())) {
+				headerParams.put(header.getKey(), header.getValue());
+			}
+		}
 		logger.info("Request Header Parameters:\n{}", new PrettyPrintingMap<String, String>(headerParams));
 		Request request = buildRequest(path, method, queryParams, body, headerParams, formParams, authNames,
 				progressRequestListener);
@@ -1502,7 +1507,11 @@ public Request buildRequest(String path, String method, List<Pair> queryParams,
 	 */
 	public String buildUrl(String path, List<Pair> queryParams) {
 		final StringBuilder url = new StringBuilder();
-		url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getRequestHost().trim()).append(path);
+		if(StringUtils.isNotBlank(merchantConfig.getIntermediateHost())) {
+			url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getIntermediateHost().trim()).append(path);
+		} else {
+			url.append(GlobalLabelParameters.URL_PREFIX).append(merchantConfig.getRequestHost().trim()).append(path);
+		}
 
 		if (queryParams != null && !queryParams.isEmpty()) {
 			// support (constant) query string in `path`, e.g. "/posts?draft=1"