+ Reverting and Adding changes for NPE

Author: snavinch

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

@@ -1217,7 +1217,7 @@ public class ApiClient {
 		}
 		catch (NullPointerException e) {
 			logger.error("ApiException : " + e.getMessage());
-			return null;
+			throw new ApiException(e);
 		}
 	}
 

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

@@ -183,15 +183,7 @@ public class {{classname}} {
         this.apiClient.setComputationStartTime(System.nanoTime());
         {{#returnType}}ApiResponse<{{{returnType}}}> {{localVariablePrefix}}resp = {{/returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
         logger.info("CALL TO METHOD '{{operationId}}' ENDED");
-        if(resp != null)
-        {
-            return {{localVariablePrefix}}resp.getData();{{/returnType}}
-        }
-        else 
-        {
-            logger.error("CALL TO METHOD '{{operationId}}' FAILED DUE TO AN EXCEPTION");
-            return null;
-        }
+        return {{localVariablePrefix}}resp.getData();{{/returnType}}
     }
 
     /**

src/main/java/Api/OAuthApi.java

@@ -115,15 +115,7 @@ private okhttp3.Call postAccessTokenFromAuthCodeValidateBeforeCall(CreateAccessT
     public AccessTokenResponse postAccessTokenFromAuthCode(CreateAccessTokenRequest createAccessTokenRequest) throws ApiException {
         this.apiClient.setComputationStartTime(System.nanoTime());
         ApiResponse<AccessTokenResponse> resp = postAccessTokenFromAuthCodeWithHttpInfo(createAccessTokenRequest);
-        if(resp != null)
-        {
-            return resp.getData();
-        }
-        else 
-        {
-            logger.error("CALL TO METHOD 'postAccessTokenFromAuthCode' FAILED DUE TO AN EXCEPTION");
-            return null;
-        }
+        return resp.getData();
     }
 
 
@@ -247,15 +239,7 @@ private okhttp3.Call postAccessTokenFromRefreshTokenValidateBeforeCall(CreateAcc
     public AccessTokenResponse postAccessTokenFromRefreshToken(CreateAccessTokenRequest createAccessTokenRequest) throws ApiException {
         this.apiClient.setComputationStartTime(System.nanoTime());
         ApiResponse<AccessTokenResponse> resp = postAccessTokenFromRefreshTokenWithHttpInfo(createAccessTokenRequest);
-        if(resp != null)
-        {
-            return resp.getData();
-        }
-        else 
-        {
-            logger.error("CALL TO METHOD 'postAccessTokenFromRefreshToken' FAILED DUE TO AN EXCEPTION");
-            return null;
-        }
+        return resp.getData();
     }
 
 

src/main/java/Invokers/ApiClient.java

@@ -1217,7 +1217,7 @@ public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiExceptio
 		}
 		catch (NullPointerException e) {
 			logger.error("ApiException : " + e.getMessage());
-			return null;
+			throw new ApiException(e);
 		}
 	}
 

src/main/java/utilities/interceptors/RetryInterceptor.java

@@ -37,12 +37,16 @@ public Response intercept(Chain chain) throws IOException {
 		return response;
 	}
 
-	private Response doRequest(Chain chain, Request request){
+	private Response doRequest(Chain chain, Request request) throws IOException {
 		Response response = null;
 		try{
 			response = chain.proceed(request);
-		}catch (Exception e){
-			
+		}
+		catch (NullPointerException e){
+			throw e;
+		}
+		catch (Exception e){
+			throw e;
 		}
 
 		return response;