Merge pull request #53 from CyberSource/future

Future

Author: shamirwasia

README.md

@@ -1,6 +1,6 @@
 #CyberSource Simple Order API for Java
 
-[![Build Status](https://travis-ci.org/CyberSource/cybersource-sdk-java.png?branch=master)]
+[![Build Status](https://travis-ci.org/CyberSource/cybersource-sdk-java.png?branch=future)]
 (https://travis-ci.org/CyberSource/cybersource-sdk-java)
 
 ##Package Managers
@@ -11,7 +11,7 @@ To install the cybersource-sdk-java from central repository,add dependency to yo
         <dependency>
             <groupId>com.cybersource</groupId>
             <artifactId>cybersource-sdk-java</artifactId>
-            <version>6.2.2</version>
+            <version>6.2.3</version>
         </dependency> 
 ````
  Run mvn install, to install dependency
@@ -20,7 +20,7 @@ To install the cybersource-sdk-java from central repository,add dependency to yo
 Add the dependency to your build.gradle
 ````
 dependencies {
-    compile 'com.cybersource:cybersource-sdk-java:6.2.2'
+    compile 'com.cybersource:cybersource-sdk-java:6.2.3'
     }
 ````
 ##Requirements

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

@@ -14,16 +14,24 @@
  */
 public class BaseMessageHandler {
 
-    MessageHandlerKeyStore localKeyStoreHandler = null;
+    static MessageHandlerKeyStore localKeyStoreHandler = null;
     Logger logger = null;
+    static KeyStore keyStore;
+    
+    static {
+    	try {
+			initKeystore();
+		} catch (Exception e) {
+			localKeyStoreHandler=null;
+		}
+    }
+    
     BaseMessageHandler(Logger logger) throws SignEncryptException {
         if (logger != null) this.logger = logger;
-
         try {
-            localKeyStoreHandler = new MessageHandlerKeyStore(logger);
-            KeyStore keyStore = KeyStore.getInstance("jks");
-            keyStore.load(null, null);
-            localKeyStoreHandler.setKeyStore(keyStore);
+        	if(localKeyStoreHandler==null){
+         	   initKeystore();
+            }
         } catch (CredentialException e) {
             throw new SignEncryptException("BaseMessageHandler, " +
                     "cannot instantiate class with keystore error.", e);
@@ -42,5 +50,13 @@ public class BaseMessageHandler {
         }
     }
 
-    public void addIdentityToKeyStore( Identity id ) throws SignEncryptException { localKeyStoreHandler.addIdentityToKeyStore(id);}
+    private static void initKeystore() throws KeyStoreException, CredentialException, IOException, NoSuchAlgorithmException, CertificateException{
+			keyStore = KeyStore.getInstance("jks");
+			keyStore.load(null, null);
+			localKeyStoreHandler = new MessageHandlerKeyStore();
+			localKeyStoreHandler.setKeyStore(keyStore);
+		
+    }
+    
+    public void addIdentityToKeyStore(Identity id , Logger logger) throws SignEncryptException { localKeyStoreHandler.addIdentityToKeyStore(id,logger);}
 }

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

@@ -193,8 +193,14 @@ private static Document soapWrapAndSign(
         sr.close();
 
         Document resultDocument = null;
+        long timeNow = System.currentTimeMillis();
+        logger.log(Logger.LT_INFO, "Client, Start of getInstance Call, Timer Start in ms	" + timeNow + "For merchant " + mc.getMerchantID());
+        
         SignedAndEncryptedMessageHandler handler = SignedAndEncryptedMessageHandler.getInstance(mc,logger);
 
+        long endTime = System.currentTimeMillis();
+        logger.log(Logger.LT_INFO, "Client, End of getInstance Call, time taken in ms	" + (endTime-timeNow) + "For merchant " + mc.getMerchantID());
+        
         // 3/7/2016 change to support encrypted messages as well as signed - jeaton
         if ( !mc.getUseSignAndEncrypted() ) {
             // sign Document object

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

@@ -22,19 +22,19 @@
 public class Identity { 
 
    //Our p12 files do not contain an alias as a normal name, its the common name and serial number
-   public String name = null;
+   private String name = null;
 
    // we need to create alias for our keystores, it looks like "serialNumber=4032987129910179089277,CN=jasoneatoncorp"
-   protected String keyAlias = null;
+   private String keyAlias = null;
 
    // for an unknown reason the serial number of the certificate is set incorrectly, we must parse it from DN
-   protected String serialNumber = null;
+   private String serialNumber = null;
 
-   protected X509Certificate x509Cert =null;
+   private X509Certificate x509Cert =null;
 
-   protected PrivateKey privateKey = null;
+   private PrivateKey privateKey = null;
 
-   protected MerchantConfig merchantConfig = null;
+   private MerchantConfig merchantConfig = null;
 
    private static final String SERVER_ALIAS = "CyberSource_SJC_US";
 

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

@@ -13,17 +13,12 @@
  */
 public class MessageHandlerKeyStore extends Merlin {
 
-    Logger logger = null;
-
-    public MessageHandlerKeyStore(Logger logger) throws CredentialException, IOException {
+	public MessageHandlerKeyStore() throws CredentialException, IOException {
         super(null);
         properties = new Properties();
-        this.logger = logger;
     }
 
-
-
-    public void addIdentityToKeyStore(Identity id) throws SignEncryptException {
+    public void addIdentityToKeyStore(Identity id, Logger logger) throws SignEncryptException {
         if (id == null)
             return;
         X509Certificate certificate = id.getX509Cert();

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

@@ -21,7 +21,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -31,9 +33,9 @@ public class SignedAndEncryptedMessageHandler extends BaseMessageHandler {
 
     private static final String KEY_FILE_TYPE = "PKCS12";
 
-    public static List<Identity> identities = new ArrayList<Identity>();
+    private List<Identity> identities = new ArrayList<Identity>();
 
-	private static String currentMerchantId = null;
+	private static Set<String> currentMerchantId = new HashSet<String>();
 
     private static final String SERVER_ALIAS = "CyberSource_SJC_US";
 
@@ -52,7 +54,7 @@ private SignedAndEncryptedMessageHandler(MerchantConfig merchantConfig, Logger l
          // load keystore from disk p12 file (not keystore)
         loadMerchantP12File(merchantConfig, logger);
         for(int pos=0;pos<identities.size();pos++) {
-            localKeyStoreHandler.addIdentityToKeyStore(identities.get(pos));
+            localKeyStoreHandler.addIdentityToKeyStore(identities.get(pos),logger);
         }
     }
 
@@ -69,10 +71,10 @@ static SignedAndEncryptedMessageHandler getInstance(MerchantConfig merchantConfi
     * @param logger - logger instance
     * @throws SignException - Signature exception
     */
-   private static void loadMerchantP12File(MerchantConfig merchantConfig, Logger logger) throws SignException {
+   private void loadMerchantP12File(MerchantConfig merchantConfig, Logger logger) throws SignException {
        // Load the KeyStore and get the signing key and certificate do this once only
        // This change is made based on the assumptions that at point of time , a merchant will have only one P12 Key
-       if(  !merchantConfig.getMerchantID().equals(currentMerchantId)){
+       if(!currentMerchantId.contains(merchantConfig.getMerchantID())){
        	readAndStoreCertificateAndPrivateKey( merchantConfig,  logger);
        }
    }
@@ -84,7 +86,7 @@ private static void loadMerchantP12File(MerchantConfig merchantConfig, Logger lo
     * @throws SignException
     */
 
-    private static void readAndStoreCertificateAndPrivateKey(
+    private void readAndStoreCertificateAndPrivateKey(
 			MerchantConfig merchantConfig, Logger logger) throws SignException {
     	KeyStore merchantKeyStore;
         try {
@@ -142,7 +144,7 @@ private static void readAndStoreCertificateAndPrivateKey(
                 logger.log(Logger.LT_EXCEPTION, "No valid entries found in the KeyStore, check alias, '" + merchantConfig.getKeyAlias() + "'");
                 throw new SignException("No valid entries found in the KeyStore, check alias, '" + merchantConfig.getKeyAlias() + "'");
             }
-            currentMerchantId = merchantConfig.getMerchantID();
+            currentMerchantId.add(merchantConfig.getMerchantID());
         } catch (KeyStoreException e) {
             logger.log(Logger.LT_EXCEPTION, "Exception while obtaining private key from KeyStore with alias, '" + merchantConfig.getKeyAlias() + "'");
             throw new SignException(e);

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

@@ -48,7 +48,7 @@ private Utility() {
     /**
      * Version number of this release.
      */
-    public static final String VERSION = "6.2.2";
+    public static final String VERSION = "6.2.3";
 
     /**
      * If in the Request map, a key called "_has_escapes" is present and is set

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

@@ -362,8 +362,14 @@ private static Document soapWrapAndSign(
         }
 
         Document resultDocument = null;
+        long timeNow = System.currentTimeMillis();
+        logger.log(Logger.LT_INFO, "Client, Start of getInstance Call, Timer Start in ms	" + timeNow + "For merchant " + mc.getMerchantID());
+        
         SignedAndEncryptedMessageHandler handler = SignedAndEncryptedMessageHandler.getInstance(mc,logger);
 
+        long endTime = System.currentTimeMillis();
+        logger.log(Logger.LT_INFO, "Client, End of getInstance Call, time taken in ms	" + (endTime-timeNow) + "For merchant " + mc.getMerchantID());
+        
         // 3/7/2016 change to support encrypted messages as well as signed - jeaton
         if ( !mc.getUseSignAndEncrypted() ) {
         	// sign wrapped Document object

java/src/test/java/com/cybersource/ws/client/MessageHandlerKeyStoreTest.java

@@ -25,11 +25,11 @@ public void testServerIdentityToKeyStore() throws Exception{
     	Mockito.when(identity.getX509Cert()).thenReturn(x509Cert);
     	Mockito.when(identity.getName()).thenReturn("MahenCertTest");
 
-    	MessageHandlerKeyStore mhKeyStore= new MessageHandlerKeyStore(logger);
+    	MessageHandlerKeyStore mhKeyStore= new MessageHandlerKeyStore();
 
     	MessageHandlerKeyStore spyMhKeyStore = Mockito.spy(mhKeyStore);
     	Mockito.when(spyMhKeyStore.getKeyStore()).thenReturn(myKeystore);
-    	spyMhKeyStore.addIdentityToKeyStore(identity);
+    	spyMhKeyStore.addIdentityToKeyStore(identity,logger);
     	Mockito.verify(spyMhKeyStore).getKeyStore();
     }
 
@@ -48,10 +48,10 @@ public void testMerchantIdentityToKeyStore() throws Exception{
     	Mockito.when(identity.getX509Cert()).thenReturn(x509Cert);
     	Mockito.when(identity.getName()).thenReturn("MahenCertTest");
 
-    	MessageHandlerKeyStore mhKeyStore= new MessageHandlerKeyStore(logger);    	
+    	MessageHandlerKeyStore mhKeyStore= new MessageHandlerKeyStore();    	
     	MessageHandlerKeyStore spyMhKeyStore = Mockito.spy(mhKeyStore);
     	Mockito.when(spyMhKeyStore.getKeyStore()).thenReturn(myKeystore);
-    	spyMhKeyStore.addIdentityToKeyStore(identity);
+    	spyMhKeyStore.addIdentityToKeyStore(identity,logger);
     }
 
     private static PrivateKey instPrivateKey(PrivateKey pkey) throws Exception{

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>com.cybersource</groupId>
     <artifactId>cybersource-sdk-master</artifactId>
-    <version>6.2.2</version>
+    <version>6.2.3</version>
 
 
 </project>