mti field check should be enabled only for auth service

Author: mahendya1002

README.md

@@ -174,14 +174,7 @@ keytool -list -v -keystore <Your_keystore_name>`
   - Second entry should be for `CyberSource_SJC_US` certificate with alias name as CyberSource_SJC_US
 
 ## PoolingHttpClient
-   PoolingHttpClient is built using the apache's PoolingHttpClientConnectionManager class. It comes with retry functionality which is very much needed in case if
-   SDK receives an I/O error/exception, when executing a request over a connection that has been closed at the server side. However there might be some cases when
-   transaction has reached server and similar or some other exception has occurred. It is not recommended to retry on non-idempotent methods, so we are considering
-   `merchantTransactionIdentifier` as idempotent key. Hence if you want to use PoolingHttpClient, merchantTransactionIdentifier field is mandatory in the payload(nvp or xml).
-   
-   merchantTransactionIdentifier field should be present in the original request for all the services. The value of the merchant transaction ID must be unique for 60 days.
-   
-   To get more information related to connection pooling please refer wiki.
+5
 
 ## Message Level Encryption
 CyberSource supports Message Level Encryption (MLE) for Simple Order API. Message level encryption conforms to the SOAP Security 1.0 specification published by the OASIS standards group. 

java/src/main/java/com/cybersource/ws/client/Client.java

@@ -103,7 +103,8 @@ public static Map<String, String> runTransaction(
 
             logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
 
-            if (mc.getUseHttpClientWithConnectionPool()){
+            String isAuthService = request.get(AUTH_SERVICE_NVP);
+            if (Boolean.valueOf(isAuthService) && mc.getUseHttpClientWithConnectionPool()){
                 String mtiField = request.get(MERCHANT_TRANSACTION_IDENTIFIER);
                 if(StringUtils.isBlank(mtiField)) {
                     throw new ClientException(HTTP_BAD_REQUEST, MTI_FIELD_ERR_MSG, false, logger);

java/src/main/java/com/cybersource/ws/client/MerchantConfig.java

@@ -254,11 +254,8 @@ public int getLogMaximumSize() {
     }
 
     /**
-     * retryIfMTIFieldExist If enabled and merchantTransactionIdentifier field is passed in payload then SDK will
-     * retry the transaction in case when connection pooling http client is used and if SDK receives an I/O error/exception, when executing
-     * a request over a connection that has been closed at the server side.
-     *
-     * The value of the merchantTransactionIdentifier[MTI] field must be unique
+     * retryIfMTIFieldExist If enabled then SDK will retry the transaction in case when connection pooling http client is used
+     * and if SDK receives an I/O error/exception, when executing a request over a connection that has been closed at the server side.
      *
      * If not enabled, a transaction may fail(retry wont occur in some cases) if while sending transaction SDK receives an I/O error/exception, when executing
      * a request over a connection that has been closed at the server side.

java/src/main/java/com/cybersource/ws/client/Utility.java

@@ -50,6 +50,11 @@ private Utility() {
     public static final String SDK_ELAPSED_TIMESTAMP = "v-c-client-computetime";
     public static final String RESPONSE_TIME_REPLY = "v-c-response-time";
     public static final String MERCHANT_TRANSACTION_IDENTIFIER = "merchantTransactionIdentifier";
+
+    public static final String AUTH_SERVICE = "ccAuthService";
+    public static final String AUTH_SERVICE_XML_RUN_ATT = "run";
+    public static final String AUTH_SERVICE_NVP = "ccAuthService_run";
+
     public static final String ELEM_MERCHANT_ID = "merchantID";
     public static final String KEY_ALIAS = "keyAlias";
     public static final String ELEM_MERCHANT_REFERENCE_CODE = "merchantReferenceCode";
@@ -592,4 +597,15 @@ public static String checkIfMTIFiledExist(Document request, String nsURI) {
         return mtiFieldValue;
     }
 
+    public static String checkIfAuthServiceFieldExist(Document request, String nsURI) {
+        Element authServiceElement = Utility.getElement(request, AUTH_SERVICE, nsURI);
+        if(authServiceElement == null){
+            authServiceElement = Utility.getElement(request, AUTH_SERVICE, null);
+        }
+        String isAuthService = null;
+        if(authServiceElement != null){
+            isAuthService = authServiceElement.getAttribute(AUTH_SERVICE_XML_RUN_ATT);
+        }
+        return isAuthService;
+    }
 }	

java/src/main/java/com/cybersource/ws/client/XMLClient.java

@@ -171,7 +171,8 @@ public static Document runTransaction(
 
             logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
 
-            if (mc.getUseHttpClientWithConnectionPool()){
+            String isAuthService = checkIfAuthServiceFieldExist(request, nsURI);
+            if (Boolean.valueOf(isAuthService) && mc.getUseHttpClientWithConnectionPool()){
                 String mtiField = checkIfMTIFiledExist(request, nsURI);
                 if(StringUtils.isBlank(mtiField)) {
                     throw new ClientException(HTTP_BAD_REQUEST, MTI_FIELD_ERR_MSG, false, logger);

zip/README

@@ -164,12 +164,11 @@ try {
 }
 
 ##PoolingHttpClient
-PoolingHttpClient is built using the apache's PoolingHttpClientConnectionManager class. It comes with retry functionality which is very much needed in case if SDK receives
-an I/O error/exception, when executing a request over a connection that has been closed at the server side. However there might be some cases when transaction has reached
-server and similar or some other exception has occurred. It is not recommended to retry on non-idempotent methods, so we are considering `merchantTransactionIdentifier` as
-idempotent key. Hence if you want to use PoolingHttpClient, merchantTransactionIdentifier field is mandatory in the payload(nvp or xml).
-
-merchantTransactionIdentifier field should be present in the original request for all the services. The value of the merchant transaction ID must be unique for 60 days.
+PoolingHttpClient is built using the apache's PoolingHttpClientConnectionManager class. It comes with retry functionality which is very much needed in case if
+SDK receives an I/O error/exception, when executing a request over a connection that has been closed at the server side. However there might be some cases when
+transaction has reached server and similar or some other exception has occurred. We are considering `merchantTransactionIdentifier` as idempotent key, specially in
+case of auth service(`ccAuthService`). Hence if you want to use PoolingHttpClient, for auth service(`ccAuthService`) merchantTransactionIdentifier field is mandatory
+in the payload for both nvp and xml. The value of the merchant transaction ID must be unique for 60 days.
 
 To get more information related to connection pooling please refer wiki.