caching framework cleanup and test extension
Change-Id: I472b0a465e3d2217835ffb1f49e07a1b65a08976
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
index 7d34efa..fb27b4d 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
@@ -1,5 +1,6 @@
package de.ids_mannheim.korap.security.ac;
+import de.ids_mannheim.korap.config.KustvaktCacheable;
import de.ids_mannheim.korap.exceptions.EmptyResultException;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.exceptions.NotAuthorizedException;
@@ -23,15 +24,18 @@
//todo: use interface (maybe a cachable interface?) and bean instanceing
// todo: if cachable, data integrity needs to be checked! either remove caching or check integrity!
@SuppressWarnings("all")
-public class ResourceHandler {
+public class ResourceHandler extends KustvaktCacheable {
private static Logger jlog = LoggerFactory.getLogger(ResourceHandler.class);
- public ResourceHandler () {}
+ public ResourceHandler () {
+ super("resources", "key:resources");
+ }
- public <T extends KustvaktResource> T getCache (Object id, Class<T> clazz) {
+ @Deprecated
+ public <T extends KustvaktResource> T getCache (Object id, Class<T> cz) {
Element e = CacheManager.getInstance().getCache("resources").get(id);
if (e != null)
return (T) e.getObjectValue();
@@ -40,6 +44,7 @@
}
+ @Deprecated
public <R extends KustvaktResource> void cache (R resource) {
CacheManager.getInstance().getCache("resources")
.put(new Element(resource.getPersistentID(), resource));