- Return false if key not present in the cache, currently returning 0

Author: nilayspshah

src/main/java/com/starter/springboot/services/OtpGenerator.java

@@ -56,12 +56,7 @@ public Integer generateOTP(String key)
      */
     public Integer getOPTByKey(String key)
     {
-        try {
-            return otpCache.get(key);
-        }
-        catch (ExecutionException e) {
-            return -1;
-        }
+        return otpCache.getIfPresent(key);
     }
 
     /**

src/main/java/com/starter/springboot/services/OtpService.java

@@ -76,7 +76,7 @@ public Boolean validateOTP(String key, Integer otpNumber)
     {
         // get OTP from cache
         Integer cacheOTP = otpGenerator.getOPTByKey(key);
-        if (cacheOTP.equals(otpNumber))
+        if (cacheOTP!=null && cacheOTP.equals(otpNumber))
         {
             otpGenerator.clearOTPFromCache(key);
             return true;