feat: fix config read on k = v (#476)

Author: caojiajun

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/conf/ProxyDynamicConf.java

@@ -32,7 +32,6 @@ public class ProxyDynamicConf {
     private static final ConcurrentHashMap<String, Boolean> booleanCache = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, Double> doubleCache = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> stringCache = new ConcurrentHashMap<>();
-    private static final ConcurrentHashMap<String, Object> cache = new ConcurrentHashMap<>();
 
 
     /**
@@ -129,7 +128,6 @@ private static void clearCache() {
         booleanCache.clear();
         doubleCache.clear();
         stringCache.clear();
-        cache.clear();
     }
 
     /**
@@ -301,44 +299,6 @@ public static String getString(String key, Long bid, String bgroup, String defau
     }
 
 
-    private static <T> T get(String key, T defaultValue, Class<T> tClass) {
-        return ConfigurationUtil.get(conf, key, defaultValue, tClass);
-    }
-
-    /**
-     * Get value from {@link ProxyDynamicConf#conf}. Use caching to avoid duplicate creation.
-     *
-     * @param key          key
-     * @param bid          id
-     * @param bgroup       group
-     * @param defaultValue defaultValue
-     * @param tClass       the type of the return value
-     * @param <T>          T
-     * @return value
-     */
-    public static <T> T get(String key, Long bid, String bgroup, T defaultValue, Class<T> tClass) {
-        try {
-            if (conf.isEmpty()) return defaultValue;
-            String confKey = buildConfKey(key, bid, bgroup);
-            T value;
-            T cacheValue = (T) cache.get(confKey);
-            if (cacheValue != null) return cacheValue;
-            value = get(confKey, null, tClass);
-            if (value == null) {
-                value = get(key, null, tClass);
-            }
-            if (value == null) {
-                cache.put(confKey, defaultValue);
-                return defaultValue;
-            }
-            cache.put(confKey, value);
-            return value;
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-
     /**
      * Build config key from key，bid，bgroup. If bid == null and bgroup == null, use default.default+key
      *

camellia-toolkits/camellia-tools/src/main/java/com/netease/nim/camellia/tools/utils/ConfigurationUtil.java

@@ -67,26 +67,6 @@ public static String get(Map<String, String> conf, String key, String defaultVal
         }
     }
 
-    public static <T> T get(Map<String, String> conf, String key, T defaultValue, Class<T> tClass) {
-        try {
-            String v = conf.get(key);
-            if (v == null) return defaultValue;
-            if (tClass == Integer.class) {
-                return (T) Integer.valueOf(v);
-            } else if (tClass == Boolean.class) {
-                return (T) Boolean.valueOf(v);
-            } else if (tClass == Long.class) {
-                return (T) Long.valueOf(v);
-            } else if (tClass == Double.class) {
-                return (T) Double.valueOf(v);
-            } else {
-                return (T) v;
-            }
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
     public static ConfigContentType configContentType(String fileName) {
         if (fileName == null) {
             return ConfigContentType.properties;
@@ -115,7 +95,7 @@ public static Map<String, String> contentToMap(String content, ConfigContentType
                 int index = line.indexOf("=");
                 String key = line.substring(0, index);
                 String value = line.substring(index + 1);
-                conf.put(key, value);
+                conf.put(key.trim(), value.trim());
             }
             return conf;
         } else if (contentType == ConfigContentType.json) {