CYBS-737: Typo refactor

Author: sumadhav

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

@@ -68,14 +68,14 @@ private void setupJdkServerCerts() throws SignException {
         if (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[1].toLowerCase().contains(SERVER_ALIAS.toLowerCase())) {
-                    String subjectDName = subjectDNrray[1].split("=")[1];
+                else if (subjectDNArray.length == 2 && subjectDNArray[1].toLowerCase().contains(SERVER_ALIAS.toLowerCase())) {
+                    String subjectDName = subjectDNArray[1].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/SecurityUtil.java

@@ -357,8 +357,6 @@ private static void loadJavaKeystore(MerchantConfig merchantConfig, Logger logge
 			KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
 			keystore.load(is, merchantConfig.getCacertPassword().toCharArray());
 
-			Identity identity;
-
 			java.security.cert.Certificate[] cert = keystore.getCertificateChain(merchantConfig.getKeyAlias());
 			if (cert == null) {
 				throw new SignException("Empty Keystore or Missing Certificate ");
@@ -372,14 +370,14 @@ private static void loadJavaKeystore(MerchantConfig merchantConfig, Logger logge
 						+ merchantConfig.getKeyAlias() + "'");
 				throw new SignException(e);
 			}
-
-            for (int i = 0; i < cert.length; i++) {
-                if (merchantConfig.getKeyAlias().equals(keystore.getCertificateAlias(cert[i]))) {
-                    identity = new Identity(merchantConfig, (X509Certificate) cert[i], key, logger);
+            Identity identity;
+            for (java.security.cert.Certificate certificate : cert) {
+                if (merchantConfig.getKeyAlias().equals(keystore.getCertificateAlias(certificate))) {
+                    identity = new Identity(merchantConfig, (X509Certificate) certificate, key, logger);
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getKeyAlias(), identity);
                 } else {
-                    identity = new Identity(merchantConfig, (X509Certificate) cert[i], logger);
+                    identity = new Identity(merchantConfig, (X509Certificate) certificate, logger);
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getName(), identity);
                 }