CYBS-737: Code refactor

Author: sumadhav

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

@@ -53,7 +53,7 @@ public class Identity {
      * @param x509Certificate
      * @throws SignException
      */
-    public Identity(MerchantConfig merchantConfig,X509Certificate x509Certificate,Logger logger) throws SignException {
+    public Identity(MerchantConfig merchantConfig, X509Certificate x509Certificate) throws SignException {
         this.merchantConfig = merchantConfig;
         this.x509Cert=x509Certificate;
         if(merchantConfig.isJdkCertEnabled() || merchantConfig.isCacertEnabled()){
@@ -149,14 +149,14 @@ private void setUpServer() throws SignException {
         if (serialNumber == null && x509Cert != null) {
             String subjectDN = x509Cert.getSubjectDN().getName();
             if (subjectDN != null) {
-                String[] subjectDNrray = subjectDN.split("SERIALNUMBER=");
-                if (subjectDNrray.length == 1 && subjectDNrray[0].toLowerCase().contains(CYBS_CERT_AUTH.toLowerCase())){
-                    name = keyAlias = subjectDNrray[0].split("=")[1];
+                String[] subjectDNArray = subjectDN.split("SERIALNUMBER=");
+                if (subjectDNArray.length == 1 && subjectDNArray[0].toLowerCase().contains(CYBS_CERT_AUTH.toLowerCase())){
+                    name = keyAlias = subjectDNArray[0].split("=")[1];
                 }
-                else if (subjectDNrray.length == 2 && subjectDNrray[0].toLowerCase().contains(SERVER_ALIAS.toLowerCase())) {
-                    String subjectDName = subjectDNrray[0].split("=")[1];
+                else if (subjectDNArray.length == 2 && subjectDNArray[0].toLowerCase().contains(SERVER_ALIAS.toLowerCase())) {
+                    String subjectDName = subjectDNArray[0].split("=")[1];
                     name = subjectDName.substring(0, subjectDName.length()-1);
-                    serialNumber = subjectDNrray[1];
+                    serialNumber = subjectDNArray[1];
                     keyAlias = "serialNumber=" + serialNumber + ",CN=" + name;
                 }else{
                     throw new SignException("Exception while obtaining private key from KeyStore with alias, '" + merchantConfig.getKeyAlias() + "'");

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

@@ -30,8 +30,9 @@ public MessageHandlerKeyStore() throws CredentialException, IOException {
      * @throws SignEncryptException
      */
     public void addIdentityToKeyStore(Identity id, Logger logger) throws SignEncryptException {
-        if (id == null)
+        if (id == null) {
             return;
+        }
         X509Certificate certificate = id.getX509Cert();
         PrivateKey privateKey = id.getPrivateKey();
         try {

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

@@ -167,7 +167,7 @@ private static void readAndStoreCertificateAndPrivateKey(MerchantConfig merchant
                     identities.put(identity.getKeyAlias(), identity);
                     continue;
                 }
-                Identity identity = new Identity(merchantConfig, (X509Certificate) merchantKeyStore.getCertificate(merchantKeyAlias),logger);
+                Identity identity = new Identity(merchantConfig, (X509Certificate) merchantKeyStore.getCertificate(merchantKeyAlias));
                 localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                 identities.put(identity.getName(), identity);
             }
@@ -337,7 +337,7 @@ public static void readJdkCert(MerchantConfig merchantConfig, Logger logger)
 					continue;
 				}
 				Identity identity = new Identity(merchantConfig,
-						(X509Certificate) keystore.getCertificate(merchantKeyAlias), logger);
+						(X509Certificate) keystore.getCertificate(merchantKeyAlias));
 				localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
 				identities.put(identity.getName(), identity);
 			}
@@ -377,7 +377,7 @@ private static void loadJavaKeystore(MerchantConfig merchantConfig, Logger logge
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getKeyAlias(), identity);
                 } else {
-                    identity = new Identity(merchantConfig, (X509Certificate) certificate, logger);
+                    identity = new Identity(merchantConfig, (X509Certificate) certificate);
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getName(), identity);
                 }
@@ -386,7 +386,7 @@ private static void loadJavaKeystore(MerchantConfig merchantConfig, Logger logge
 			if (serverCert == null) {
 				throw new SignException("Missing Server Certificate ");
 			}
-			identity = new Identity(merchantConfig, (X509Certificate) serverCert, logger);
+			identity = new Identity(merchantConfig, (X509Certificate) serverCert);
 			localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
 			identities.put(identity.getName(), identity);
 

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

@@ -59,7 +59,7 @@ public void testsetUpServer() throws InstantiationException, IllegalAccessExcept
     	Logger logger = Mockito.mock(Logger.class);
     	Mockito.when(x509Cert.getSubjectDN()).thenReturn(principal);
     	Mockito.when(principal.getName()).thenReturn(keyAlias);
-    	Identity identity = new Identity(config,x509Cert,logger);
+    	Identity identity = new Identity(config,x509Cert);
     	assertEquals(identity.getName(), "CyberSource_SJC_US");
     	assertEquals(identity.getSerialNumber(), "400000009910179089277");
     	assertNull(identity.getPrivateKey());