Merge branch 'fix-scoped-cache' into 'development'

Add proxyMode to CacheScope and remove obselete destructionCallback

See merge request !765

src/main/java/nl/tudelft/queue/scope/CacheManager.java

@@ -36,9 +36,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 public class CacheManager extends AbstractRequestAttributesScope {
 	private Map<String, Object> scopedObjects = Collections.synchronizedMap(new HashMap<String, Object>());
 
-	private Map<String, Runnable> destructionCallbacks = Collections
-			.synchronizedMap(new HashMap<String, Runnable>());
-
 	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		if (RequestContextHolder.getRequestAttributes() != null) {
@@ -53,7 +50,6 @@ public class CacheManager extends AbstractRequestAttributesScope {
 		if (RequestContextHolder.getRequestAttributes() != null) {
 			return super.remove(name);
 		}
-		destructionCallbacks.remove(name);
 		return scopedObjects.remove(name);
 	}
 
@@ -62,7 +58,6 @@ public class CacheManager extends AbstractRequestAttributesScope {
 		if (RequestContextHolder.getRequestAttributes() != null) {
 			super.registerDestructionCallback(name, callback);
 		}
-		destructionCallbacks.put(name, callback);
 	}
 
 	@Override

src/main/java/nl/tudelft/queue/scope/CacheScope.java

@@ -17,8 +17,17 @@
  */
 package nl.tudelft.queue.scope;
 
+import java.lang.annotation.*;
+
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.core.annotation.AliasFor;
 
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
 @Scope(scopeName = "cacheManager")
 public @interface CacheScope {
+	@AliasFor(annotation = Scope.class)
+	ScopedProxyMode proxyMode() default ScopedProxyMode.TARGET_CLASS;
 }