fixes networknt#1697 check cache configuration first before creating …

…CacheManager instance (networknt#1698)
younggwon1 · Apr 7, 2023 · cf052b5 · cf052b5
1 parent aa7f350
commit cf052b5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/cache-manager/src/main/java/com/networknt/cache/CacheManager.java b/cache-manager/src/main/java/com/networknt/cache/CacheManager.java
@@ -5,23 +5,28 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 
 public interface CacheManager {
     Logger logger = LoggerFactory.getLogger(CacheManager.class);
     static CacheManager getInstance() {
-        CacheManager cacheManager = SingletonServiceFactory.getBean(CacheManager.class);
-        if (cacheManager == null) {
-            logger.warn("No cache manager configured in service.yml; default to CaffeineCacheManager");
-            cacheManager = new CaffeineCacheManager();
-            for(CacheItem cacheItem: CacheConfig.load().getCaches()) {
-                cacheManager.addCache(cacheItem.getCacheName(), cacheItem.getMaxSize(), cacheItem.getExpiryInMinutes());
+        List<CacheItem> caches = CacheConfig.load().getCaches();
+        if(caches != null && caches.size() > 0) {
+            CacheManager cacheManager = SingletonServiceFactory.getBean(CacheManager.class);
+            if (cacheManager == null) {
+                logger.warn("No cache manager configured in service.yml; default to CaffeineCacheManager");
+                cacheManager = new CaffeineCacheManager();
+                for(CacheItem cacheItem: CacheConfig.load().getCaches()) {
+                    cacheManager.addCache(cacheItem.getCacheName(), cacheItem.getMaxSize(), cacheItem.getExpiryInMinutes());
+                }
+                SingletonServiceFactory.setBean(CacheManager.class.getName(), cacheManager);
             }
-            SingletonServiceFactory.setBean(CacheManager.class.getName(), cacheManager);
+            return cacheManager;
+        } else {
+            return null;
         }
-        return cacheManager;
-
     }
+
     void addCache(String cacheName, long maxSize, long expiryInMinutes);
     Cache<Object, Object> getCache(String cacheName);
     void removeCache(String cacheName);

diff --git a/db-provider/src/main/java/com/networknt/db/provider/DbProviderImpl.java b/db-provider/src/main/java/com/networknt/db/provider/DbProviderImpl.java
@@ -11,6 +11,10 @@
  * @author Steve Hu
  */
 public class DbProviderImpl implements DbProvider {
+    public static final String SQL_EXCEPTION = "ERR10017";
+    public static final String GENERIC_EXCEPTION = "ERR10014";
+    public static final String OBJECT_NOT_FOUND = "ERR11637";
+
     private static final Logger logger = LoggerFactory.getLogger(DbProviderImpl.class);