removed logger object refrenc from identity class

Author: mahendya1002

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

@@ -43,8 +43,6 @@ public class Identity {
 
     private char[] pswd;
 
-    private Logger logger;
-    
     /**
      * Creates an Identity instance.this type of the instance can
      * only be used to store server certificate identity.
@@ -56,8 +54,6 @@ public class Identity {
     public Identity(MerchantConfig merchantConfig,X509Certificate x509Certificate,Logger logger) throws SignException {
         this.merchantConfig = merchantConfig;
         this.x509Cert=x509Certificate;
-        this.logger=logger;
-
         if(merchantConfig.isJdkCertEnabled() || merchantConfig.isCacertEnabled()){
             setupJdkServerCerts();
         }
@@ -97,16 +93,13 @@ else if (subjectDNrray.length == 2 && subjectDNrray[1].contains(SERVER_ALIAS)) {
      * @param privateKey
      * @throws SignException
      */
-    public Identity(MerchantConfig merchantConfig,X509Certificate x509Certificate, PrivateKey privateKey,Logger logger) throws SignException {
+    public Identity(MerchantConfig merchantConfig,X509Certificate x509Certificate, PrivateKey privateKey, Logger logger) throws SignException {
         this.merchantConfig = merchantConfig;
         this.x509Cert = x509Certificate;
         this.privateKey = privateKey;
-        this.logger=logger;
-
         try {
 			this.lastModifiedDate=merchantConfig.getKeyFile().lastModified();
 		} catch (ConfigException e) {
-			
 			logger.log(Logger.LT_EXCEPTION,
                     "Identity object ,cannot instantiate with key file lastModifiedDate. "
                     + e.getMessage());
@@ -120,7 +113,7 @@ public Identity(MerchantConfig merchantConfig,X509Certificate x509Certificate, P
      * else isValid method will return true and certificate reload will not occur.
     */
 
-	public boolean isValid(File keyFile) {
+	public boolean isValid(File keyFile, Logger logger) {
 		boolean changeKeyFileStatus=(this.lastModifiedDate == keyFile.lastModified());
 		if (!changeKeyFileStatus) {
 			logger.log(Logger.LT_INFO, "Key file changed");

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

@@ -77,7 +77,7 @@ private static void initKeystore() throws KeyStoreException, CredentialException
     public static void loadMerchantP12File(MerchantConfig merchantConfig, Logger logger) throws SignException, SignEncryptException, ConfigException {
 
         Identity identity=identities.get(merchantConfig.getKeyAlias());
-        if(!merchantConfig.isCertificateCacheEnabled() || identity == null || !(identity.isValid(merchantConfig.getKeyFile()))){
+        if(!merchantConfig.isCertificateCacheEnabled() || identity == null || !(identity.isValid(merchantConfig.getKeyFile(), logger))){
             try {
                 if (localKeyStoreHandler == null)
                     initKeystore();