Merge pull request #97 from CyberSource/log4j-fix

Upgrade to log4j2 v2.17.1 and fix for issue with downloads

Author: gnongsie

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

@@ -1206,9 +1206,12 @@ public class ApiClient {
 			if(returnType == new TypeToken< Model.AccessTokenResponse >(){}.getType()) {
 				logger.debug("Response :\n" + response.peekBody(Long.MAX_VALUE).string());
 			}
+
 			T data = handleResponse(response, returnType);
 
-			response.body().close();
+			if (returnType != null || call.request().method().equalsIgnoreCase("DELETE") || responseCode.equalsIgnoreCase("202")) {
+				response.body().close();
+			}
 
 			logger.info("HTTP Response Body :\n{}", data);
 

pom.xml

@@ -252,6 +252,13 @@
 		    <artifactId>log4j-1.2-api</artifactId>
 			<version>${log4j.version}</version>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.7</version>
+		</dependency>
 
 		<!-- test dependencies -->
 		<dependency>
@@ -265,7 +272,7 @@
 		<dependency>
 			<groupId>com.cybersource</groupId>
 			<artifactId>AuthenticationSdk</artifactId>
-			<version>0.0.20</version>
+			<version>0.0.21</version>
 		</dependency>
 	</dependencies>
 
@@ -281,6 +288,6 @@
 		<maven-plugin-version>1.0.0</maven-plugin-version>
 		<junit-version>4.13.2</junit-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<log4j.version>2.16.0</log4j.version>
+		<log4j.version>2.17.1</log4j.version>
 	</properties>
 </project>

src/main/java/Invokers/ApiClient.java

@@ -1206,9 +1206,12 @@ public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiExceptio
 			if(returnType == new TypeToken< Model.AccessTokenResponse >(){}.getType()) {
 				logger.debug("Response :\n" + response.peekBody(Long.MAX_VALUE).string());
 			}
+
 			T data = handleResponse(response, returnType);
 
-			response.body().close();
+			if (returnType != null || call.request().method().equalsIgnoreCase("DELETE") || responseCode.equalsIgnoreCase("202")) {
+				response.body().close();
+			}
 
 			logger.info("HTTP Response Body :\n{}", data);
 

src/main/java/utilities/filehandling/FileUtilities.java

@@ -0,0 +1,18 @@
+package utilities.filehandling;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.commons.io.FileUtils;
+
+public class FileUtilities {
+	public static void downloadFileFromInputStream(InputStream inputStream, File outputFile) throws IOException {
+		if (inputStream == null) {
+			throw new IllegalArgumentException("Input Stream is null or unavailable.");
+		}
+		
+		FileUtils.copyInputStreamToFile(inputStream, outputFile);
+		
+		inputStream.close();
+	}
+}