Implemented predefined VC caching and added VC reference tests.
Change-Id: I84ad56b375f8b076ad92e493775993fc0580249f
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/Initializator.java b/full/src/main/java/de/ids_mannheim/korap/config/Initializator.java
index e730a0b..c204558 100644
--- a/full/src/main/java/de/ids_mannheim/korap/config/Initializator.java
+++ b/full/src/main/java/de/ids_mannheim/korap/config/Initializator.java
@@ -1,31 +1,42 @@
package de.ids_mannheim.korap.config;
-import java.util.Arrays;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
import de.ids_mannheim.korap.oauth2.constant.OAuth2Scope;
import de.ids_mannheim.korap.oauth2.dao.AccessScopeDao;
/**
- * Initializes values in the database from kustvakt configuration.
+ * Initializes values in the database from kustvakt configuration and
+ * performs named VC caching.
*
* @author margaretha
*
*/
public class Initializator {
+ @Autowired
private AccessScopeDao accessScopeDao;
+ @Autowired
+ private NamedVCLoader loader;
- public Initializator (AccessScopeDao accessScopeDao) {
- this.accessScopeDao = accessScopeDao;
+ public Initializator () {}
+
+ public void init () throws IOException {
+ setInitialAccessScope();
+ loader.loadVCToCache();
}
- public void init () {
- setAccessScope();
+ public void initTest () {
+ setInitialAccessScope();
}
-
- private void setAccessScope () {
+
+ private void setInitialAccessScope () {
OAuth2Scope[] enums = OAuth2Scope.values();
Set<String> scopes = new HashSet<>(enums.length);
for (OAuth2Scope s : enums) {