Added API for emptying the cache.

rapidoid · Feb 2, 2017 · 03728ed · 03728ed
1 parent cfc59d3
commit 03728ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java b/rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java
@@ -47,4 +47,8 @@ public interface Cache<K, V> {
 	 */
 	void set(K key, V value);
 
+	/**
+	 * Clears the cache.
+	 */
+	void clear();
 }
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java b/rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java
@@ -34,11 +34,11 @@ public abstract class AbstractMapImpl<K, V> extends RapidoidThing implements Sim
 	protected V defaultValue;
 
 	public AbstractMapImpl(int width) {
-		this.entries = new SimpleHashTable<MapEntry<K, V>>(width);
+		this.entries = new SimpleHashTable<>(width);
 	}
 
 	public AbstractMapImpl(int width, int initialBucketSize) {
-		this.entries = new SimpleHashTable<MapEntry<K, V>>(width, initialBucketSize);
+		this.entries = new SimpleHashTable<>(width, initialBucketSize);
 	}
 
 	@Override

diff --git a/rapidoid-render/src/main/java/org/rapidoid/render/RapidoidTemplateFactory.java b/rapidoid-render/src/main/java/org/rapidoid/render/RapidoidTemplateFactory.java
@@ -3,12 +3,12 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.collection.Coll;
+import org.rapidoid.cache.Cache;
+import org.rapidoid.cache.Caching;
+import org.rapidoid.env.Env;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.u.U;
 
-import java.util.Map;
-
 /*
  * #%L
  * rapidoid-render
@@ -33,12 +33,14 @@
 @Since("5.2.0")
 public class RapidoidTemplateFactory extends RapidoidThing implements TemplateFactory {
 
-	private final Map<String, RapidoidTemplate> compiledTemplates = Coll.autoExpandingMap(new Mapper<String, RapidoidTemplate>() {
+	private static final int CACHE_TTL = Env.dev() ? 300 : 1000;
+
+	private final Cache<String, RapidoidTemplate> compiledTemplates = Caching.of(new Mapper<String, RapidoidTemplate>() {
 		@Override
 		public RapidoidTemplate map(String filename) throws Exception {
 			return loadAndCompile(filename);
 		}
-	});
+	}).capacity(10000).ttl(CACHE_TTL).build();
 
 	public RapidoidTemplate loadAndCompile(String filename) {
 		return new RapidoidTemplate(filename, loadTemplate(filename), this);