Address review comments

ThaminduR · Nov 24, 2023 · bb71a2e · bb71a2e
1 parent c3cc8f8
commit bb71a2e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/....mgt/src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICache.java b/....mgt/src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICache.java
@@ -26,11 +26,11 @@
 public class AuthorizedAPICache extends BaseCache<AuthorizedAPICacheKey, AuthorizedAPICacheEntry> {
 
     private static final String CACHE_NAME = "AuthorizedAPICache";
-    private static volatile AuthorizedAPICache instance;
+    private static final AuthorizedAPICache instance = new AuthorizedAPICache();
 
-    public AuthorizedAPICache(String cacheName) {
+    private AuthorizedAPICache() {
 
-        super(cacheName);
+        super(CACHE_NAME);
     }
 
     /**
@@ -40,13 +40,6 @@ public AuthorizedAPICache(String cacheName) {
      */
     public static AuthorizedAPICache getInstance() {
 
-        if (instance == null) {
-            synchronized (AuthorizedAPICache.class) {
-                if (instance == null) {
-                    instance = new AuthorizedAPICache(CACHE_NAME);
-                }
-            }
-        }
         return instance;
     }
 }
diff --git a/...src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICacheEntry.java b/...src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICacheEntry.java
@@ -19,13 +19,12 @@
 package org.wso2.carbon.identity.application.mgt.cache;
 
 import org.wso2.carbon.identity.application.common.model.AuthorizedAPI;
-
-import java.io.Serializable;
+import org.wso2.carbon.identity.core.cache.CacheEntry;
 
 /**
  * Cache entry for authorized API.
  */
-public class AuthorizedAPICacheEntry implements Serializable {
+public class AuthorizedAPICacheEntry extends CacheEntry {
 
     private AuthorizedAPI authorizedAPI;
 

diff --git a/...t/src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICacheKey.java b/...t/src/main/java/org/wso2/carbon/identity/application/mgt/cache/AuthorizedAPICacheKey.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.application.mgt.cache;
 
-import java.io.Serializable;
+import org.wso2.carbon.identity.core.cache.CacheKey;
 
 /**
  * Cache key for authorized API.
  */
-public class AuthorizedAPICacheKey implements Serializable {
+public class AuthorizedAPICacheKey extends CacheKey {
 
     private static final long serialVersionUID = 3112605038259278777L;
 

diff --git a/...va/org/wso2/carbon/identity/application/mgt/dao/impl/CacheBackedAuthorizedAPIDAOImpl.java b/...va/org/wso2/carbon/identity/application/mgt/dao/impl/CacheBackedAuthorizedAPIDAOImpl.java
@@ -53,7 +53,6 @@ public CacheBackedAuthorizedAPIDAOImpl(AuthorizedAPIDAO authorizedAPIDAO) {
     public void addAuthorizedAPI(String applicationId, String apiId, String policyId, List<Scope> scopes, int tenantId)
             throws IdentityApplicationManagementException {
 
-
         authorizedAPIDAO.addAuthorizedAPI(applicationId, apiId, policyId, scopes, tenantId);
     }
 
@@ -101,11 +100,10 @@ public AuthorizedAPI getAuthorizedAPI(String appId, String apiId, int tenantId)
             } catch (IdentityApplicationManagementException e) {
                 String error = "Error while retrieving authorized API for application id: " + appId + " and api id: "
                         + apiId + " in tenant id: " + tenantId;
-                LOG.error(error, e);
                 throw new IdentityApplicationManagementException(error, e);
             }
         }
-        return authorizedAPI != null ? authorizedAPI : authorizedAPIDAO.getAuthorizedAPI(appId, apiId, tenantId);
+        return authorizedAPI;
     }
 
     private AuthorizedAPI getAuthorizedAPIFromCache(String appId, String apiId, int tenantId) {