Replaced the single cache of scanned classes with per-app cache.

rapidoid-ctx/pom.xml

@@ -17,6 +17,11 @@
 			<artifactId>rapidoid-annotations</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-tuple</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
 			<artifactId>rapidoid-test-commons</artifactId>

rapidoid-ctx/src/main/java/org/rapidoid/ctx/Classes.java

@@ -20,17 +20,24 @@
  * #L%
  */
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.tuple.Tuple;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.1.0")
 public class Classes extends LinkedHashMap<String, Class<?>> {
 
 	private static final long serialVersionUID = 8987037790459772014L;
 
+	private final Map<Tuple, List<Class<?>>> cache = Collections.synchronizedMap(new HashMap<Tuple, List<Class<?>>>());
+
 	public static Classes from(Iterable<Class<?>> classes) {
 		Classes clss = new Classes();
 
@@ -41,4 +48,8 @@ public static Classes from(Iterable<Class<?>> classes) {
 		return clss;
 	}
 
+	public Map<Tuple, List<Class<?>>> getCache() {
+		return cache;
+	}
+
 }

rapidoid-http/src/main/java/org/rapidoid/appctx/Scan.java

@@ -40,8 +40,6 @@
 @Since("2.0.0")
 public class Scan {
 
-	private static final Map<Tuple, List<Class<?>>> CLASSES_CACHE = U.map();
-
 	private Scan() {}
 
 	public static List<Class<?>> classes() {
@@ -78,32 +76,28 @@ private static synchronized List<Class<?>> scanClasses(String packageName, Strin
 
 		packageName = U.or(packageName, "");
 
-		boolean caching = classLoader == null;
 		Tuple cacheKey = null;
 
-		if (caching) {
-			cacheKey = new Tuple(packageName, nameRegex, filter, annotated, classLoader);
-			List<Class<?>> classes = CLASSES_CACHE.get(cacheKey);
-			if (classes != null) {
-				return classes;
-			}
+		Application app = Ctxs.ctx().app();
+		Classes appClasses = app.getClasses();
+		Map<Tuple, List<Class<?>>> cache = appClasses.getCache();
+
+		cacheKey = new Tuple(packageName, nameRegex, filter, annotated, classLoader);
+		List<Class<?>> cachedClasses = cache.get(cacheKey);
+		if (cachedClasses != null) {
+			return cachedClasses;
 		}
 
 		long startingAt = U.time();
 
-		Application app = Ctxs.ctx().app();
-		Classes appClasses = app.getClasses();
-
 		Log.info("Filtering " + appClasses.size() + " classes", "annotated", annotated, "package", packageName, "name",
 				nameRegex);
 
 		Pattern regex = nameRegex != null ? Pattern.compile(nameRegex) : null;
 
 		List<Class<?>> classes = filterClasses(appClasses, packageName, regex, filter, annotated);
 
-		if (caching) {
-			CLASSES_CACHE.put(cacheKey, classes);
-		}
+		cache.put(cacheKey, classes);
 
 		long timeMs = U.time() - startingAt;
 		Log.info("Finished classpath scan", "time", timeMs + "ms", "classes", classes);