revert general cache changes

annotation/src/main/java/lcsb/mapviewer/annotation/cache/GeneralCache.java

@@ -32,7 +32,7 @@ public class GeneralCache implements GeneralCacheInterface {
    * Application level cache. More information can be found
    * {@link ApplicationLevelCache here}.
    */
-  private QueryCacheInterface cache1;
+  private QueryCacheInterface cache1 = ApplicationLevelCache.getInstance();
 
   /**
    * Database level cache. More information can be found
@@ -44,9 +44,7 @@ public class GeneralCache implements GeneralCacheInterface {
    * Constructor
    */
   @Autowired
-  public GeneralCache(@Qualifier(value = "applicationLevelCache") QueryCacheInterface cache1,
-                      @Qualifier(value = "permanentDatabaseLevelCache") QueryCacheInterface cache2) {
-    this.cache1 = cache1;
+  public GeneralCache(@Qualifier(value = "permanentDatabaseLevelCache") QueryCacheInterface cache2) {
     this.cache2 = cache2;
   }
 

annotation/src/test/java/lcsb/mapviewer/annotation/cache/CachableInterfaceTest.java

@@ -59,7 +59,7 @@ public class CachableInterfaceTest extends AnnotationTestFunctions {
 			CacheTypeDao mock = Mockito.mock(CacheTypeDao.class);
 			when(mock.getByClassName(anyString())).thenReturn(new CacheType());
 			ci.setCacheTypeDao(mock);
-			ci.setCache(new GeneralCache(null, null));
+			ci.setCache(new GeneralCache(null));
 			
 			String cacheKey = "https://www.google.com/";
 			String result = ci.getWebPageContent(cacheKey);
@@ -82,7 +82,7 @@ public class CachableInterfaceTest extends AnnotationTestFunctions {
 			ci.setCacheTypeDao(mock);
 			
 			String xml = "<xml><child/></xml>";
-			ci.setCache(new GeneralCache(null, null));
+			ci.setCache(new GeneralCache(null));
 			ci.setCacheNode("id", super.getNodeFromXmlString(xml));
 			
 			Node node = ci.getCacheNode("id");

annotation/src/test/java/lcsb/mapviewer/annotation/cache/GeneralCacheTest.java

@@ -19,7 +19,7 @@ import lcsb.mapviewer.model.cache.CacheType;
 public class GeneralCacheTest extends AnnotationTestFunctions {
 	Logger															 logger	= Logger.getLogger(GeneralCacheTest.class);
 
-	GeneralCache												 cache	= new GeneralCache(null, null);
+	GeneralCache												 cache	= new GeneralCache(null);
 
 	@Autowired
 	PermanentDatabaseLevelCacheInterface databaseLevelCache;

annotation/src/test/java/lcsb/mapviewer/annotation/cache/GeneralCacheWithExclusionTest.java

@@ -44,7 +44,7 @@ public class GeneralCacheWithExclusionTest extends AnnotationTestFunctions {
 	public void testExclusion() throws Exception {
 		try {
 			CacheType type = new CacheType();
-			GeneralCache cache = new GeneralCache(null, null);
+			GeneralCache cache = new GeneralCache(null);
 			cache.setCache2(ApplicationLevelCache.getInstance());
 			GeneralCacheWithExclusion cacheWithExclusion = new GeneralCacheWithExclusion(cache, 2);
 
@@ -67,7 +67,7 @@ public class GeneralCacheWithExclusionTest extends AnnotationTestFunctions {
 	public void testClear() throws Exception {
 		try {
 			CacheType type = new CacheType();
-			GeneralCache cache = new GeneralCache(null, null);
+			GeneralCache cache = new GeneralCache(null);
 			cache.setCache2(ApplicationLevelCache.getInstance());
 			GeneralCacheWithExclusion cacheWithExclusion = new GeneralCacheWithExclusion(cache, 0);
 
@@ -90,7 +90,7 @@ public class GeneralCacheWithExclusionTest extends AnnotationTestFunctions {
 	public void testRemove() throws Exception {
 		try {
 			CacheType type = new CacheType();
-			GeneralCache cache = new GeneralCache(null, null);
+			GeneralCache cache = new GeneralCache(null);
 			cache.setCache2(ApplicationLevelCache.getInstance());
 			GeneralCacheWithExclusion cacheWithExclusion = new GeneralCacheWithExclusion(cache, 0);
 
@@ -114,7 +114,7 @@ public class GeneralCacheWithExclusionTest extends AnnotationTestFunctions {
 	public void testInvalidate() throws Exception {
 		try {
 			CacheType type = new CacheType();
-			GeneralCache cache = new GeneralCache(null, null);
+			GeneralCache cache = new GeneralCache(null);
 			cache.setCache2(ApplicationLevelCache.getInstance());
 			GeneralCacheWithExclusion cacheWithExclusion = new GeneralCacheWithExclusion(cache, 0);