ConfigUtil: add method to populate an existing CacheBuilder Change-Id: I1957faef3aa154c28605aad06709b5d7cd433b29
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java b/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java index 4f8733b..a5289b0 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/ConfigUtil.java
@@ -102,7 +102,19 @@ * @return a new cache builder. */ public static CacheBuilder<Object, Object> getCacheBuilder(Config config, String name) { - CacheBuilder<Object, Object> b = CacheBuilder.newBuilder(); + return getCacheBuilder(CacheBuilder.newBuilder(), config, name); + } + + /** + * Populate an existing {@link CacheBuilder} from a config. + * + * @param b cache builder. + * @param config JGit config object. + * @param name name of the cache subsection under the "cache" section. + * @return input cache builder after modifications. + */ + public static <K, V> CacheBuilder<K, V> getCacheBuilder(CacheBuilder<K, V> b, Config config, + String name) { try { if (config.getString("cache", name, "maximumWeight") != null) { b.maximumWeight(config.getLong("cache", name, "maximumWeight", 20 << 20));