From 87e38e6181aa1c338687f5a43a83cada12b59118 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 27 Jun 2024 13:14:47 +0200 Subject: [PATCH] (search-query) refac: Move query factory --- .../functions/searchquery/{svc => }/QueryFactory.java | 4 ++-- .../nu/marginalia/functions/searchquery/QueryGRPCService.java | 1 - .../test/nu/marginalia/query/svc/QueryFactoryTest.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename code/functions/search-query/java/nu/marginalia/functions/searchquery/{svc => }/QueryFactory.java (99%) diff --git a/code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryFactory.java similarity index 99% rename from code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryFactory.java index 9b66d150..98e2de94 100644 --- a/code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java +++ b/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryFactory.java @@ -1,15 +1,15 @@ -package nu.marginalia.functions.searchquery.svc; +package nu.marginalia.functions.searchquery; import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.api.searchquery.model.query.*; import nu.marginalia.api.searchquery.model.results.ResultRankingParameters; import nu.marginalia.functions.searchquery.query_parser.QueryExpansion; +import nu.marginalia.functions.searchquery.query_parser.QueryParser; import nu.marginalia.functions.searchquery.query_parser.token.QueryToken; import nu.marginalia.index.query.limit.QueryStrategy; import nu.marginalia.index.query.limit.SpecificationLimit; import nu.marginalia.language.WordPatterns; -import nu.marginalia.functions.searchquery.query_parser.QueryParser; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java index 4da55bc1..e4bac6e2 100644 --- a/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java +++ b/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java @@ -10,7 +10,6 @@ import nu.marginalia.api.searchquery.model.query.ProcessedQuery; import nu.marginalia.api.searchquery.model.query.QueryParams; import nu.marginalia.api.searchquery.model.results.ResultRankingParameters; import nu.marginalia.index.api.IndexClient; -import nu.marginalia.functions.searchquery.svc.QueryFactory; import nu.marginalia.api.searchquery.model.results.DecoratedSearchResultItem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java b/code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java index 2b59d15f..c8bce00f 100644 --- a/code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java +++ b/code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java @@ -5,7 +5,7 @@ import nu.marginalia.api.searchquery.model.query.SearchCoherenceConstraint; import nu.marginalia.api.searchquery.model.query.SearchSpecification; import nu.marginalia.api.searchquery.model.results.ResultRankingParameters; import nu.marginalia.functions.searchquery.query_parser.QueryExpansion; -import nu.marginalia.functions.searchquery.svc.QueryFactory; +import nu.marginalia.functions.searchquery.QueryFactory; import nu.marginalia.index.query.limit.QueryLimits; import nu.marginalia.index.query.limit.QueryStrategy; import nu.marginalia.index.query.limit.SpecificationLimit;