Replaced annotation parsing with restoring the annotation tables to the
database.
Change-Id: I79b33e4634642bcff42f79d8132964afdc123024
diff --git a/full/src/main/java/de/ids_mannheim/de/init/InitializatorImpl.java b/full/src/main/java/de/ids_mannheim/de/init/Initializator.java
similarity index 62%
rename from full/src/main/java/de/ids_mannheim/de/init/InitializatorImpl.java
rename to full/src/main/java/de/ids_mannheim/de/init/Initializator.java
index 1b49c17..2062e20 100644
--- a/full/src/main/java/de/ids_mannheim/de/init/InitializatorImpl.java
+++ b/full/src/main/java/de/ids_mannheim/de/init/Initializator.java
@@ -5,7 +5,6 @@
import org.springframework.beans.factory.annotation.Autowired;
-import de.ids_mannheim.korap.annotation.AnnotationParser;
import de.ids_mannheim.korap.annotation.FreeResourceParser;
import de.ids_mannheim.korap.config.NamedVCLoader;
import de.ids_mannheim.korap.constant.OAuth2Scope;
@@ -20,49 +19,30 @@
* @author margaretha
*
*/
-public class InitializatorImpl implements Initializator {
+public class Initializator{
@Autowired
private AccessScopeDao accessScopeDao;
@Autowired
private NamedVCLoader vcLoader;
@Autowired
- private AnnotationParser annotationParser;
- @Autowired
private FreeResourceParser resourceParser;
- public InitializatorImpl () {}
+ public Initializator () {}
- /* (non-Javadoc)
- * @see de.ids_mannheim.de.init.Initializator#init()
- */
- @Override
public void init () throws IOException, QueryException, KustvaktException {
setInitialAccessScope();
- Thread t = new Thread(vcLoader);
- t.start();
- }
-
- public void initAnnotation ()
- throws IOException, QueryException, KustvaktException {
- setInitialAccessScope();
- annotationParser.run();
resourceParser.run();
Thread t = new Thread(vcLoader);
t.start();
}
- /* (non-Javadoc)
- * @see de.ids_mannheim.de.init.Initializator#initTest()
- */
- @Override
- public void initTest () {
+ public void initTest () throws IOException, KustvaktException {
setInitialAccessScope();
}
- public void initAnnotationTest () throws IOException, KustvaktException {
+ public void initResourceTest () throws IOException, KustvaktException {
setInitialAccessScope();
- annotationParser.run();
resourceParser.run();
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java b/full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
index 41faa2a..7e946a7 100644
--- a/full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
+++ b/full/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java
@@ -156,7 +156,7 @@
collection.storeInCache(filename);
}
end = System.currentTimeMillis();
- jlog.info("{} caching duration: {}", filename, (end - start));
+ jlog.info("{} Caching duration: {}", filename, (end - start));
if (DEBUG) {
jlog.debug("memory cache: "
+ KrillCollection.cache.calculateInMemorySize());