diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecrytorHelper.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecryptorHelper.java similarity index 99% rename from kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecrytorHelper.java rename to kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecryptorHelper.java index cc58254e..cbcbbe88 100644 --- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecrytorHelper.java +++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/helper/SessionKeyDecryptorHelper.java @@ -52,9 +52,9 @@ * */ @Component -public class SessionKeyDecrytorHelper { +public class SessionKeyDecryptorHelper { - private static final Logger LOGGER = KeymanagerLogger.getLogger(SessionKeyDecrytorHelper.class); + private static final Logger LOGGER = KeymanagerLogger.getLogger(SessionKeyDecryptorHelper.class); /** * {@link CryptoCoreSpec} instance for cryptographic functionalities. @@ -352,7 +352,7 @@ private Object[] getPrivateKey(String referenceId, KeyAlias fetchedKeyAlias) { String ksAlias = fetchedKeyAlias.getAlias(); Optional dbKeyStore = dbHelper.getKeyStoreFromDB(ksAlias); if (!dbKeyStore.isPresent()) { - LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, dbKeyStore.toString(), + LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, KeymanagerConstant.EMPTY, "Key in DBStore does not exist for this alias. Throwing exception"); throw new NoUniqueAliasException(KeymanagerErrorConstant.NO_UNIQUE_ALIAS.getErrorCode(), KeymanagerErrorConstant.NO_UNIQUE_ALIAS.getErrorMessage()); diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java index 3ef29330..78068f36 100644 --- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java +++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java @@ -75,7 +75,7 @@ import io.mosip.kernel.keymanagerservice.exception.KeymanagerServiceException; import io.mosip.kernel.keymanagerservice.exception.NoUniqueAliasException; import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper; -import io.mosip.kernel.keymanagerservice.helper.SessionKeyDecrytorHelper; +import io.mosip.kernel.keymanagerservice.helper.SessionKeyDecryptorHelper; import io.mosip.kernel.keymanagerservice.logger.KeymanagerLogger; import io.mosip.kernel.keymanagerservice.service.KeymanagerService; import io.mosip.kernel.keymanagerservice.util.KeymanagerUtil; @@ -154,7 +154,7 @@ public class KeymanagerServiceImpl implements KeymanagerService { CryptomanagerUtils cryptomanagerUtil; @Autowired - SessionKeyDecrytorHelper keyDecryptorHelper; + SessionKeyDecryptorHelper keyDecryptorHelper; @Autowired private ECKeyPairGenRequestValidator ecKeyPairGenRequestValidator; @@ -306,7 +306,7 @@ private CertificateInfo getCertificateFromDBStore(String applic Optional keyFromDBStore = dbHelper .getKeyStoreFromDB(currentKeyAlias.get(0).getAlias()); if (!keyFromDBStore.isPresent()) { - LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(), + LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, KeymanagerConstant.EMPTY, "Key in DBStore does not exist for this alias. Throwing exception"); throw new NoUniqueAliasException(KeymanagerErrorConstant.NO_UNIQUE_ALIAS.getErrorCode(), KeymanagerErrorConstant.NO_UNIQUE_ALIAS.getErrorMessage()); @@ -934,7 +934,7 @@ private KeyAlias getKeyAlias(String appId, String refId){ private Object[] getKeyDetails(Optional keyFromDBStore, String keyAlias) { if (!keyFromDBStore.isPresent()) { - LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(), + LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, KeymanagerConstant.KEYALIAS, "Key in DBStore does not exist for this alias. So fetching the certificate from HSM."); PrivateKeyEntry signKeyEntry = keyStore.getAsymmetricKey(keyAlias); PrivateKey signPrivateKey = signKeyEntry.getPrivateKey(); @@ -945,16 +945,16 @@ private Object[] getKeyDetails(Optional