diff --git a/Changes b/Changes index 5c6eb172..25766f19 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ # version 0.73.3-SNAPSHOT - Remove corpusQuery param in the statistics web-service (close #758). +- Moved NamedVCLoader to the init package. # version 0.73.2 diff --git a/src/main/java/de/ids_mannheim/korap/init/Initializator.java b/src/main/java/de/ids_mannheim/korap/init/Initializator.java index 17782d81..fbcca0e3 100644 --- a/src/main/java/de/ids_mannheim/korap/init/Initializator.java +++ b/src/main/java/de/ids_mannheim/korap/init/Initializator.java @@ -9,7 +9,6 @@ import de.ids_mannheim.korap.cache.VirtualCorpusCache; import de.ids_mannheim.korap.config.FullConfiguration; import de.ids_mannheim.korap.config.KustvaktConfiguration; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.constant.OAuth2Scope; import de.ids_mannheim.korap.exceptions.KustvaktException; import de.ids_mannheim.korap.oauth2.dao.AccessScopeDao; diff --git a/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java b/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java similarity index 98% rename from src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java rename to src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java index 968d8d27..cbd9fb59 100644 --- a/src/main/java/de/ids_mannheim/korap/config/NamedVCLoader.java +++ b/src/main/java/de/ids_mannheim/korap/init/NamedVCLoader.java @@ -1,4 +1,4 @@ -package de.ids_mannheim.korap.config; +package de.ids_mannheim.korap.init; import java.io.File; import java.io.FileInputStream; @@ -16,6 +16,7 @@ import org.springframework.stereotype.Component; import de.ids_mannheim.korap.cache.VirtualCorpusCache; +import de.ids_mannheim.korap.config.FullConfiguration; import de.ids_mannheim.korap.constant.QueryType; import de.ids_mannheim.korap.constant.ResourceType; import de.ids_mannheim.korap.entity.QueryDO; diff --git a/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java b/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java index b4946fb2..0613a47d 100644 --- a/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java +++ b/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusAdminController.java @@ -5,11 +5,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.constant.QueryType; import de.ids_mannheim.korap.constant.ResourceType; import de.ids_mannheim.korap.dto.QueryDto; import de.ids_mannheim.korap.exceptions.KustvaktException; +import de.ids_mannheim.korap.init.NamedVCLoader; import de.ids_mannheim.korap.service.QueryService; import de.ids_mannheim.korap.web.KustvaktResponseHandler; import de.ids_mannheim.korap.web.filter.APIVersionFilter; diff --git a/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java b/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java index 4f5b013a..35a15bd7 100644 --- a/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java +++ b/src/test/java/de/ids_mannheim/korap/cache/NamedVCLoaderTest.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import de.ids_mannheim.korap.collection.DocBits; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.config.SpringJerseyTest; import de.ids_mannheim.korap.dao.QueryDao; import de.ids_mannheim.korap.entity.QueryDO; import de.ids_mannheim.korap.exceptions.KustvaktException; +import de.ids_mannheim.korap.init.NamedVCLoader; import de.ids_mannheim.korap.util.QueryException; public class NamedVCLoaderTest extends SpringJerseyTest { diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java index f0ea66c7..f35096c8 100644 --- a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java +++ b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewriteTest.java @@ -15,11 +15,11 @@ import de.ids_mannheim.korap.authentication.http.HttpAuthorizationHandler; import de.ids_mannheim.korap.cache.VirtualCorpusCache; import de.ids_mannheim.korap.config.Attributes; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.config.SpringJerseyTest; import de.ids_mannheim.korap.dao.QueryDao; import de.ids_mannheim.korap.entity.QueryDO; import de.ids_mannheim.korap.exceptions.KustvaktException; +import de.ids_mannheim.korap.init.NamedVCLoader; import de.ids_mannheim.korap.util.QueryException; import de.ids_mannheim.korap.utils.JsonUtils; import jakarta.ws.rs.core.Response; diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java index 27c527d7..a600bbaf 100644 --- a/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java +++ b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusFieldTest.java @@ -16,11 +16,11 @@ import de.ids_mannheim.korap.authentication.http.HttpAuthorizationHandler; import de.ids_mannheim.korap.cache.VirtualCorpusCache; import de.ids_mannheim.korap.config.Attributes; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.dao.QueryDao; import de.ids_mannheim.korap.entity.QueryDO; import de.ids_mannheim.korap.exceptions.KustvaktException; import de.ids_mannheim.korap.exceptions.StatusCodes; +import de.ids_mannheim.korap.init.NamedVCLoader; import de.ids_mannheim.korap.util.QueryException; import de.ids_mannheim.korap.utils.JsonUtils; diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusReferenceTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusReferenceTest.java index 5c53e177..3618c3ab 100644 --- a/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusReferenceTest.java +++ b/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusReferenceTest.java @@ -16,12 +16,12 @@ import de.ids_mannheim.korap.authentication.http.HttpAuthorizationHandler; import de.ids_mannheim.korap.cache.VirtualCorpusCache; import de.ids_mannheim.korap.config.Attributes; -import de.ids_mannheim.korap.config.NamedVCLoader; import de.ids_mannheim.korap.config.SpringJerseyTest; import de.ids_mannheim.korap.dao.QueryDao; import de.ids_mannheim.korap.entity.QueryDO; import de.ids_mannheim.korap.exceptions.KustvaktException; import de.ids_mannheim.korap.exceptions.StatusCodes; +import de.ids_mannheim.korap.init.NamedVCLoader; import de.ids_mannheim.korap.util.QueryException; import de.ids_mannheim.korap.utils.JsonUtils; import jakarta.ws.rs.client.Entity;