The Unified and Autonomous Development Platform
Refactor some packages
Robin Shen56f6bb343fdc
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex fea2bb0845..c072af7c4a 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -67,6 +67,10 @@ import com.vladsch.flexmark.Extension;import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.launcher.loader.AbstractPlugin;import io.onedev.launcher.loader.AbstractPluginModule;+import io.onedev.server.codesearch.DefaultIndexManager;+import io.onedev.server.codesearch.DefaultSearchManager;+import io.onedev.server.codesearch.IndexManager;+import io.onedev.server.codesearch.SearchManager;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;import io.onedev.server.command.CheckDataVersionCommand;@@ -187,10 +191,6 @@ import io.onedev.server.rest.RestConstants;import io.onedev.server.rest.jersey.DefaultServletContainer;import io.onedev.server.rest.jersey.JerseyConfigurator;import io.onedev.server.rest.jersey.ResourceConfigProvider;-import io.onedev.server.search.DefaultIndexManager;-import io.onedev.server.search.DefaultSearchManager;-import io.onedev.server.search.IndexManager;-import io.onedev.server.search.SearchManager;import io.onedev.server.security.BasicAuthenticationFilter;import io.onedev.server.security.FilterChainConfigurator;import io.onedev.server.security.OneAuthorizingRealm;@@ -205,7 +205,6 @@ import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfiguratorimport io.onedev.server.util.jetty.DefaultJettyRunner;import io.onedev.server.util.jetty.JettyRunner;import io.onedev.server.util.markdown.MarkdownProcessor;-import io.onedev.server.util.readcallback.ReadCallbackServlet;import io.onedev.server.util.validation.DefaultEntityValidator;import io.onedev.server.util.validation.EntityValidator;import io.onedev.server.util.validation.ValidatorProvider;@@ -363,7 +362,6 @@ public class CoreModule extends AbstractPluginModule {bind(GitFilter.class);bind(GitPreReceiveCallback.class);bind(GitPostReceiveCallback.class);- bind(ReadCallbackServlet.class);}private void configureRestServices() {diff --git a/core/src/main/java/io/onedev/server/search/CommitIndexed.java b/core/src/main/java/io/onedev/server/codesearch/CommitIndexed.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/CommitIndexed.javarename to core/src/main/java/io/onedev/server/codesearch/CommitIndexed.javaindex 913896022e..1f57bdbbf7 100644--- a/core/src/main/java/io/onedev/server/search/CommitIndexed.java+++ b/core/src/main/java/io/onedev/server/codesearch/CommitIndexed.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;import org.eclipse.jgit.lib.ObjectId;diff --git a/core/src/main/java/io/onedev/server/search/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/search/DefaultIndexManager.javarename to core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.javaindex b3167909ec..473871d02a 100644--- a/core/src/main/java/io/onedev/server/search/DefaultIndexManager.java+++ b/core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.java@@ -1,21 +1,21 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;-import static io.onedev.server.search.FieldConstants.BLOB_HASH;-import static io.onedev.server.search.FieldConstants.BLOB_INDEX_VERSION;-import static io.onedev.server.search.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.FieldConstants.BLOB_PATH;-import static io.onedev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;-import static io.onedev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;-import static io.onedev.server.search.FieldConstants.BLOB_SYMBOL_LIST;-import static io.onedev.server.search.FieldConstants.BLOB_TEXT;-import static io.onedev.server.search.FieldConstants.COMMIT_HASH;-import static io.onedev.server.search.FieldConstants.COMMIT_INDEX_VERSION;-import static io.onedev.server.search.FieldConstants.LAST_COMMIT;-import static io.onedev.server.search.FieldConstants.LAST_COMMIT_HASH;-import static io.onedev.server.search.FieldConstants.LAST_COMMIT_INDEX_VERSION;-import static io.onedev.server.search.FieldConstants.META;-import static io.onedev.server.search.IndexConstants.MAX_INDEXABLE_SIZE;-import static io.onedev.server.search.IndexConstants.NGRAM_SIZE;+import static io.onedev.server.codesearch.FieldConstants.BLOB_HASH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_INDEX_VERSION;+import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PRIMARY_SYMBOLS;+import static io.onedev.server.codesearch.FieldConstants.BLOB_SECONDARY_SYMBOLS;+import static io.onedev.server.codesearch.FieldConstants.BLOB_SYMBOL_LIST;+import static io.onedev.server.codesearch.FieldConstants.BLOB_TEXT;+import static io.onedev.server.codesearch.FieldConstants.COMMIT_HASH;+import static io.onedev.server.codesearch.FieldConstants.COMMIT_INDEX_VERSION;+import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT;+import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT_HASH;+import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT_INDEX_VERSION;+import static io.onedev.server.codesearch.FieldConstants.META;+import static io.onedev.server.codesearch.IndexConstants.MAX_INDEXABLE_SIZE;+import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;import java.io.File;import java.io.IOException;diff --git a/core/src/main/java/io/onedev/server/search/DefaultSearchManager.java b/core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/search/DefaultSearchManager.javarename to core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.javaindex de9adeb6a3..0516c331e7 100644--- a/core/src/main/java/io/onedev/server/search/DefaultSearchManager.java+++ b/core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.java@@ -1,9 +1,9 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;-import static io.onedev.server.search.FieldConstants.BLOB_HASH;-import static io.onedev.server.search.FieldConstants.BLOB_INDEX_VERSION;-import static io.onedev.server.search.FieldConstants.BLOB_PATH;-import static io.onedev.server.search.FieldConstants.BLOB_SYMBOL_LIST;+import static io.onedev.server.codesearch.FieldConstants.BLOB_HASH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_INDEX_VERSION;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_SYMBOL_LIST;import java.io.IOException;import java.nio.channels.ClosedByInterruptException;@@ -46,13 +46,13 @@ import com.google.common.base.Throwables;import io.onedev.jsymbol.Symbol;import io.onedev.jsymbol.SymbolExtractorRegistry;import io.onedev.launcher.loader.Listen;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.query.BlobQuery;import io.onedev.server.event.lifecycle.SystemStopping;import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.EntityRemoved;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.query.BlobQuery;@Singletonpublic class DefaultSearchManager implements SearchManager {diff --git a/core/src/main/java/io/onedev/server/search/FieldConstants.java b/core/src/main/java/io/onedev/server/codesearch/FieldConstants.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/FieldConstants.javarename to core/src/main/java/io/onedev/server/codesearch/FieldConstants.javaindex 4daef1fb0d..3ea89b8b43 100644--- a/core/src/main/java/io/onedev/server/search/FieldConstants.java+++ b/core/src/main/java/io/onedev/server/codesearch/FieldConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;diff --git a/core/src/main/java/io/onedev/server/search/IndexConstants.java b/core/src/main/java/io/onedev/server/codesearch/IndexConstants.javasimilarity index 72%rename from core/src/main/java/io/onedev/server/search/IndexConstants.javarename to core/src/main/java/io/onedev/server/codesearch/IndexConstants.javaindex e04fcfd73b..a2e580baba 100644--- a/core/src/main/java/io/onedev/server/search/IndexConstants.java+++ b/core/src/main/java/io/onedev/server/codesearch/IndexConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;public interface IndexConstants {diff --git a/core/src/main/java/io/onedev/server/search/IndexManager.java b/core/src/main/java/io/onedev/server/codesearch/IndexManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/search/IndexManager.javarename to core/src/main/java/io/onedev/server/codesearch/IndexManager.javaindex 1a65ff3580..cef0c5147d 100644--- a/core/src/main/java/io/onedev/server/search/IndexManager.java+++ b/core/src/main/java/io/onedev/server/codesearch/IndexManager.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/search/NGramAnalyzer.java b/core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/search/NGramAnalyzer.javarename to core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.javaindex 06c23d3f86..0e8ff59ddb 100644--- a/core/src/main/java/io/onedev/server/search/NGramAnalyzer.java+++ b/core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;import java.io.IOException;import java.io.Reader;diff --git a/core/src/main/java/io/onedev/server/search/SearchManager.java b/core/src/main/java/io/onedev/server/codesearch/SearchManager.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/search/SearchManager.javarename to core/src/main/java/io/onedev/server/codesearch/SearchManager.javaindex cee9fc6c9d..0bf4e62e70 100644--- a/core/src/main/java/io/onedev/server/search/SearchManager.java+++ b/core/src/main/java/io/onedev/server/codesearch/SearchManager.java@@ -1,4 +1,4 @@-package io.onedev.server.search;+package io.onedev.server.codesearch;import java.util.List;@@ -8,10 +8,10 @@ import org.apache.lucene.search.IndexSearcher;import org.eclipse.jgit.lib.ObjectId;import io.onedev.jsymbol.Symbol;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.query.BlobQuery;+import io.onedev.server.codesearch.query.TooGeneralQueryException;import io.onedev.server.model.Project;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.query.BlobQuery;-import io.onedev.server.search.query.TooGeneralQueryException;public interface SearchManager {diff --git a/core/src/main/java/io/onedev/server/search/hit/FileHit.java b/core/src/main/java/io/onedev/server/codesearch/hit/FileHit.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/search/hit/FileHit.javarename to core/src/main/java/io/onedev/server/codesearch/hit/FileHit.javaindex 773dd78a45..02e98eb8d6 100644--- a/core/src/main/java/io/onedev/server/search/hit/FileHit.java+++ b/core/src/main/java/io/onedev/server/codesearch/hit/FileHit.java@@ -1,4 +1,4 @@-package io.onedev.server.search.hit;+package io.onedev.server.codesearch.hit;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/search/hit/PathHit.java b/core/src/main/java/io/onedev/server/codesearch/hit/PathHit.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/search/hit/PathHit.javarename to core/src/main/java/io/onedev/server/codesearch/hit/PathHit.javaindex 6ad938ce45..754748a3b1 100644--- a/core/src/main/java/io/onedev/server/search/hit/PathHit.java+++ b/core/src/main/java/io/onedev/server/codesearch/hit/PathHit.java@@ -1,4 +1,4 @@-package io.onedev.server.search.hit;+package io.onedev.server.codesearch.hit;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/search/hit/QueryHit.java b/core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/search/hit/QueryHit.javarename to core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.javaindex beebc59193..7db090fb18 100644--- a/core/src/main/java/io/onedev/server/search/hit/QueryHit.java+++ b/core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.java@@ -1,4 +1,4 @@-package io.onedev.server.search.hit;+package io.onedev.server.codesearch.hit;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/search/hit/SymbolHit.java b/core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/search/hit/SymbolHit.javarename to core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.javaindex 5dc38c34e4..8b8694c391 100644--- a/core/src/main/java/io/onedev/server/search/hit/SymbolHit.java+++ b/core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.java@@ -1,4 +1,4 @@-package io.onedev.server.search.hit;+package io.onedev.server.codesearch.hit;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/search/hit/TextHit.java b/core/src/main/java/io/onedev/server/codesearch/hit/TextHit.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/search/hit/TextHit.javarename to core/src/main/java/io/onedev/server/codesearch/hit/TextHit.javaindex e5fe860935..38b625d497 100644--- a/core/src/main/java/io/onedev/server/search/hit/TextHit.java+++ b/core/src/main/java/io/onedev/server/codesearch/hit/TextHit.java@@ -1,4 +1,4 @@-package io.onedev.server.search.hit;+package io.onedev.server.codesearch.hit;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;diff --git a/core/src/main/java/io/onedev/server/search/hit/bullet.gif b/core/src/main/java/io/onedev/server/codesearch/hit/bullet.gifsimilarity index 100%rename from core/src/main/java/io/onedev/server/search/hit/bullet.gifrename to core/src/main/java/io/onedev/server/codesearch/hit/bullet.gifdiff --git a/core/src/main/java/io/onedev/server/search/hit/file.png b/core/src/main/java/io/onedev/server/codesearch/hit/file.pngsimilarity index 100%rename from core/src/main/java/io/onedev/server/search/hit/file.pngrename to core/src/main/java/io/onedev/server/codesearch/hit/file.pngdiff --git a/core/src/main/java/io/onedev/server/search/query/BlobQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/search/query/BlobQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.javaindex c8bd3c270b..b4c96a0f08 100644--- a/core/src/main/java/io/onedev/server/search/query/BlobQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.java@@ -1,6 +1,6 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;-import static io.onedev.server.search.FieldConstants.BLOB_PATH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;import java.util.List;@@ -13,7 +13,7 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;-import io.onedev.server.search.hit.QueryHit;+import io.onedev.server.codesearch.hit.QueryHit;public abstract class BlobQuery {diff --git a/core/src/main/java/io/onedev/server/search/query/FileQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/FileQuery.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/query/FileQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/FileQuery.javaindex a151697cdd..9bd8f0780e 100644--- a/core/src/main/java/io/onedev/server/search/query/FileQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/FileQuery.java@@ -1,6 +1,6 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;-import static io.onedev.server.search.FieldConstants.BLOB_NAME;+import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;import java.util.List;@@ -15,8 +15,8 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Preconditions;-import io.onedev.server.search.hit.FileHit;-import io.onedev.server.search.hit.QueryHit;+import io.onedev.server.codesearch.hit.FileHit;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.utils.Range;import io.onedev.utils.stringmatch.WildcardUtils;diff --git a/core/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.javaindex 0bc79a1a81..f336f7c9f4 100644--- a/core/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;import java.io.IOException;import java.io.StringReader;diff --git a/core/src/main/java/io/onedev/server/search/query/PathQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/PathQuery.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/search/query/PathQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/PathQuery.javaindex adb2d2f6e6..555d243306 100644--- a/core/src/main/java/io/onedev/server/search/query/PathQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/PathQuery.java@@ -1,6 +1,6 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;-import static io.onedev.server.search.FieldConstants.BLOB_PATH;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;import java.util.List;@@ -13,8 +13,8 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;-import io.onedev.server.search.hit.PathHit;-import io.onedev.server.search.hit.QueryHit;+import io.onedev.server.codesearch.hit.PathHit;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.utils.PathUtils;import io.onedev.utils.Range;diff --git a/core/src/main/java/io/onedev/server/search/query/SymbolQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/search/query/SymbolQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.javaindex a2f4529ef6..3f5dde544b 100644--- a/core/src/main/java/io/onedev/server/search/query/SymbolQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.java@@ -1,8 +1,8 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;-import static io.onedev.server.search.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;-import static io.onedev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;+import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;+import static io.onedev.server.codesearch.FieldConstants.BLOB_PRIMARY_SYMBOLS;+import static io.onedev.server.codesearch.FieldConstants.BLOB_SECONDARY_SYMBOLS;import java.util.List;@@ -18,9 +18,9 @@ import org.eclipse.jgit.treewalk.TreeWalk;import io.onedev.jsymbol.Symbol;import io.onedev.server.OneDev;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.hit.SymbolHit;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.hit.SymbolHit;import io.onedev.utils.Range;import io.onedev.utils.stringmatch.WildcardUtils;diff --git a/core/src/main/java/io/onedev/server/search/query/TextQuery.java b/core/src/main/java/io/onedev/server/codesearch/query/TextQuery.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/query/TextQuery.javarename to core/src/main/java/io/onedev/server/codesearch/query/TextQuery.javaindex 8471ae63a2..2bf90ae361 100644--- a/core/src/main/java/io/onedev/server/search/query/TextQuery.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/TextQuery.java@@ -1,8 +1,8 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;-import static io.onedev.server.search.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.FieldConstants.BLOB_TEXT;-import static io.onedev.server.search.IndexConstants.NGRAM_SIZE;+import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;+import static io.onedev.server.codesearch.FieldConstants.BLOB_TEXT;+import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;import java.io.IOException;import java.util.List;@@ -21,10 +21,10 @@ import org.eclipse.jgit.lib.ObjectLoader;import org.eclipse.jgit.treewalk.TreeWalk;import io.onedev.jsymbol.TokenPosition;-import io.onedev.server.search.IndexConstants;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.hit.TextHit;-import io.onedev.server.search.query.regex.RegexLiterals;+import io.onedev.server.codesearch.IndexConstants;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.hit.TextHit;+import io.onedev.server.codesearch.query.regex.RegexLiterals;import io.onedev.server.util.ContentDetector;import io.onedev.utils.Range;diff --git a/core/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.java b/core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.javasimilarity index 73%rename from core/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.javarename to core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.javaindex 8cef221781..bfab46b7b5 100644--- a/core/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query;+package io.onedev.server.codesearch.query;public class TooGeneralQueryException extends RuntimeException {diff --git a/core/src/main/java/io/onedev/server/search/query/regex/AndLiterals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/search/query/regex/AndLiterals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.javaindex af29435464..cbe8a57731 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/AndLiterals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.javaindex e275cfb95a..6e2019fc30 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.javaindex e9bcdf3c14..acb12207dc 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.ArrayList;import java.util.HashSet;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.javaindex 6d60cb9d24..3074ca836e 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.java@@ -1,18 +1,18 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.ArrayList;import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.search.query.regex.PCREBaseVisitor;-import io.onedev.server.search.query.regex.PCREParser.AlternationContext;-import io.onedev.server.search.query.regex.PCREParser.AtomContext;-import io.onedev.server.search.query.regex.PCREParser.Cc_atomContext;-import io.onedev.server.search.query.regex.PCREParser.ElementContext;-import io.onedev.server.search.query.regex.PCREParser.ExprContext;-import io.onedev.server.search.query.regex.PCREParser.ParseContext;-import io.onedev.server.search.query.regex.PCREParser.QuantifierContext;+import io.onedev.server.codesearch.query.regex.PCREBaseVisitor;+import io.onedev.server.codesearch.query.regex.PCREParser.AlternationContext;+import io.onedev.server.codesearch.query.regex.PCREParser.AtomContext;+import io.onedev.server.codesearch.query.regex.PCREParser.Cc_atomContext;+import io.onedev.server.codesearch.query.regex.PCREParser.ElementContext;+import io.onedev.server.codesearch.query.regex.PCREParser.ExprContext;+import io.onedev.server.codesearch.query.regex.PCREParser.ParseContext;+import io.onedev.server.codesearch.query.regex.PCREParser.QuantifierContext;public class LiteralVisitor extends PCREBaseVisitor<Literals> {diff --git a/core/src/main/java/io/onedev/server/search/query/regex/Literals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.javasimilarity index 69%rename from core/src/main/java/io/onedev/server/search/query/regex/Literals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.javaindex cb09db25ee..a428f4795b 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/Literals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.javaindex ad797d5ce1..92ab025b0e 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.Iterator;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/OrLiterals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/search/query/regex/OrLiterals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.javaindex 38fc093d65..f12ba82848 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/OrLiterals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.java@@ -1,4 +1,4 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/search/query/regex/PCRE.g4 b/core/src/main/java/io/onedev/server/codesearch/query/regex/PCRE.g4similarity index 100%rename from core/src/main/java/io/onedev/server/search/query/regex/PCRE.g4rename to core/src/main/java/io/onedev/server/codesearch/query/regex/PCRE.g4diff --git a/core/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.java b/core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.javarename to core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.javaindex 20ea4cf06e..679a11888c 100644--- a/core/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.java+++ b/core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.java@@ -1,6 +1,6 @@-package io.onedev.server.search.query.regex;+package io.onedev.server.codesearch.query.regex;-import static io.onedev.server.search.IndexConstants.NGRAM_SIZE;+import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;import java.util.List;@@ -16,11 +16,11 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Strings;-import io.onedev.server.search.query.regex.PCRELexer;-import io.onedev.server.search.query.regex.PCREParser;-import io.onedev.server.search.query.NGramLuceneQuery;-import io.onedev.server.search.query.TooGeneralQueryException;+import io.onedev.server.codesearch.query.NGramLuceneQuery;+import io.onedev.server.codesearch.query.TooGeneralQueryException;+import io.onedev.server.codesearch.query.regex.PCRELexer;+import io.onedev.server.codesearch.query.regex.PCREParser;public class RegexLiterals {diff --git a/core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.java b/core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.javarename to core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.javaindex a8af7492b1..7d0937a6d0 100644--- a/core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.java+++ b/core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/util/query/EntityCriteria.java b/core/src/main/java/io/onedev/server/entityquery/EntityCriteria.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/util/query/EntityCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/EntityCriteria.javaindex 5dad9a194c..d884abf91c 100644--- a/core/src/main/java/io/onedev/server/util/query/EntityCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/EntityCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/util/query/EntityQuery.java b/core/src/main/java/io/onedev/server/entityquery/EntityQuery.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/util/query/EntityQuery.javarename to core/src/main/java/io/onedev/server/entityquery/EntityQuery.javaindex 136610bc34..f6a397dd7f 100644--- a/core/src/main/java/io/onedev/server/util/query/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/util/query/EntitySort.java b/core/src/main/java/io/onedev/server/entityquery/EntitySort.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/util/query/EntitySort.javarename to core/src/main/java/io/onedev/server/entityquery/EntitySort.javaindex ebcb18d704..6de14d4ca0 100644--- a/core/src/main/java/io/onedev/server/util/query/EntitySort.java+++ b/core/src/main/java/io/onedev/server/entityquery/EntitySort.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.java b/core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.javarename to core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.javaindex 99477a5cdf..e7873d101a 100644--- a/core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.java+++ b/core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import javax.persistence.criteria.Predicate;diff --git a/core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.java b/core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.javarename to core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.javaindex 3ebc38158d..9cfd9fbe70 100644--- a/core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.java+++ b/core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/entityquery/ParensAware.java b/core/src/main/java/io/onedev/server/entityquery/ParensAware.javanew file mode 100644index 0000000000..53b793ef0e--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/ParensAware.java@@ -0,0 +1,5 @@+package io.onedev.server.entityquery;++public interface ParensAware {++}diff --git a/core/src/main/java/io/onedev/server/util/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/util/query/QueryBuildContext.javarename to core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.javaindex 30431c66b5..e85360c690 100644--- a/core/src/main/java/io/onedev/server/util/query/QueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.util.HashMap;import java.util.Map;diff --git a/core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.java b/core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.javarename to core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.javaindex 7df4b8ed78..2606330d66 100644--- a/core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.java+++ b/core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.java@@ -1,4 +1,4 @@-package io.onedev.server.util.query;+package io.onedev.server.entityquery;import java.util.Collection;import java.util.HashMap;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.javaindex b5eafd2c57..b1e7fa257d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.Collection;@@ -9,11 +9,11 @@ import java.util.Set;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.AndCriteriaHelper;+import io.onedev.server.entityquery.ParensAware;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.AndCriteriaHelper;-import io.onedev.server.util.query.ParensAware;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public class AndCriteria extends IssueCriteria implements ParensAware {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.javaindex f8eea62b42..2e89873b11 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import java.util.Set;@@ -6,10 +6,11 @@ import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class BooleanFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.javaindex cc146d4ba3..ea54334750 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.Collection;@@ -10,11 +10,12 @@ import java.util.Set;import javax.persistence.criteria.Join;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public class ChoiceFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.javaindex 58fb7740e3..72b37ef427 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.model.support.issue.workflow.StateSpec;-import io.onedev.server.util.query.QueryBuildContext;public class ClosedCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.javaindex effddff911..9e6cba8604 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class CommentCountCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.javaindex 7fb2e249a5..5ceae3b0ca 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Date;import javax.persistence.criteria.Join;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class DateFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.javaindex 0f52ecca98..a1cc809e88 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java@@ -1,12 +1,13 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.annotation.Nullable;import javax.persistence.criteria.Expression;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class DescriptionCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.javaindex 728475dae0..6bf17534cd 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Collection;import java.util.HashSet;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.javaindex 87f3c31778..6fc5190c24 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import java.util.Set;@@ -6,11 +6,12 @@ import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.QueryBuildContext;public class FieldOperatorCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.javaindex 2f225d1d3f..9747ee2cc5 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Collection;import java.util.HashSet;@@ -8,10 +8,10 @@ import java.util.Set;import javax.annotation.Nullable;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityCriteria;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.EntityCriteria;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public abstract class IssueCriteria extends EntityCriteria<Issue> {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.javaindex 6421636e03..4a8a433cae 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class IssueFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4similarity index 100%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4rename to core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.javarename to core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.javaindex a1c31a7805..9fc98c387f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.Collection;@@ -18,22 +18,28 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.EntitySort;+import io.onedev.server.entityquery.EntitySort.Direction;import io.onedev.server.exception.OneException;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.query.IssueQueryParser.AndCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.CriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.FieldOperatorCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.NotCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.OperatorCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.OrCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.OrderContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.ParensCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.QueryContext;+import io.onedev.server.entityquery.issue.IssueQueryBaseVisitor;+import io.onedev.server.entityquery.issue.IssueQueryLexer;+import io.onedev.server.entityquery.issue.IssueQueryParser;+import io.onedev.server.entityquery.issue.IssueQueryParser.AndCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.CriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.FieldOperatorCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.FieldOperatorValueCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.NotCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.OperatorCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.OperatorValueCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.OrCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.OrderContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.ParensCriteriaContext;+import io.onedev.server.entityquery.issue.IssueQueryParser.QueryContext;import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -47,9 +53,6 @@ import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;import io.onedev.server.util.inputspec.numberinput.NumberInput;import io.onedev.server.util.inputspec.textinput.TextInput;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.EntitySort;-import io.onedev.server.util.query.EntitySort.Direction;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public class IssueQuery extends EntityQuery<Issue> {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.javarename to core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.javaindex 62ed83983d..115f94f0f7 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java@@ -1,12 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Root;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;-import io.onedev.server.util.query.QueryBuildContext;public class IssueQueryBuildContext extends QueryBuildContext<Issue> {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.javaindex 51fbab4143..90974a295f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Set;@@ -6,10 +6,11 @@ import javax.annotation.Nullable;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class MilestoneCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.javaindex 198f900665..a7d907e3fe 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.java@@ -1,16 +1,17 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.List;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;-import io.onedev.server.util.query.QueryBuildContext;public class MineCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.javaindex f5509a4477..0a6bf2ae3d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.java@@ -1,11 +1,11 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.NotCriteriaHelper;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.NotCriteriaHelper;-import io.onedev.server.util.query.QueryBuildContext;public class NotCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.javaindex eb37fca12d..fc91ed2def 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class NumberCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.javaindex 7e21e76c40..7ce201a579 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import java.util.Set;@@ -6,10 +6,11 @@ import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class NumberFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.javaindex 37b391a6c2..e2b4c0d36b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/OpenCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.model.support.issue.workflow.StateSpec;-import io.onedev.server.util.query.QueryBuildContext;public class OpenCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.javaindex 60417a173b..13bb13686e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.Collection;@@ -9,11 +9,11 @@ import java.util.Set;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.OrCriteriaHelper;+import io.onedev.server.entityquery.ParensAware;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.OrCriteriaHelper;-import io.onedev.server.util.query.ParensAware;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public class OrCriteria extends IssueCriteria implements ParensAware {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.javaindex a219c8aaad..882f809595 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.ArrayList;import java.util.Collection;@@ -8,9 +8,10 @@ import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class StateCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.javaindex 0baff5b11e..f5ab23c5b0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import java.util.Set;@@ -6,10 +6,11 @@ import java.util.Set;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class StringFieldCriteria extends FieldCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.javaindex 43e8b34a4d..e632c3137b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java@@ -1,13 +1,14 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Date;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class SubmitDateCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.javaindex 60333fa956..b15b8914cf 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class SubmittedByCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.javaindex db901d00ee..9fd7e94555 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.QueryBuildContext;public class SubmittedByMeCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.javaindex 86b84b6624..8d9f0c0dfc 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class TitleCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.javaindex 6296bafaa7..1d3cf9708f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java@@ -1,13 +1,14 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import java.util.Date;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class UpdateDateCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.javaindex 5246527fa0..0e585827e7 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.entityquery.issue;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.issue.IssueQueryLexer;public class VoteCountCriteria extends IssueCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.javaindex 1e869418f4..aece8eab4f 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.java@@ -1,14 +1,14 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.List;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.AndCriteriaHelper;+import io.onedev.server.entityquery.ParensAware;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.AndCriteriaHelper;-import io.onedev.server.util.query.ParensAware;-import io.onedev.server.util.query.QueryBuildContext;public class AndCriteria extends PullRequestCriteria implements ParensAware {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.javaindex d6b206c444..48a1173d9c 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class ApprovedByCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.javaindex 26d78a4320..faf2ff8aeb 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;public class ApprovedByMeCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.javaindex 531b4c3846..97472490a7 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java@@ -1,13 +1,14 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Date;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class CloseDateCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.javaindex df5ab9ec2c..f944b42643 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Collection;import java.util.HashSet;@@ -9,11 +9,12 @@ import javax.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.manager.CodeCommentRelationInfoManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class ContainsCommitCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.javaindex 296964b4a2..61fe01c44e 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class DescriptionCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.javaindex 38d703010c..69965899a5 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class DiscardedByCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.javaindex 7bc24acfc9..8b4aa3c67e 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.QueryBuildContext;public class DiscardedByMeCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.javaindex f1c3626bdc..5909cb80b8 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class DiscardedCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.javaindex 12e79b390f..a266db15cf 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class HasFailedBuildsCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.javaindex 6b9d2b10cc..feeed74788 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java@@ -1,12 +1,13 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class HasMergeConflictsCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.javaindex 7544fd4f60..851bbbfc76 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class HasPendingBuildsCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.javaindex dd0ca410ac..d443abfbc6 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class HasPendingReviewsCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.javaindex 65ed50f950..fefe22daec 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java@@ -1,12 +1,13 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class MergeStrategyCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.javaindex 23ac614b15..b07de79342 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class MergedCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.javaindex 68312a646f..cf4765c99c 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.java@@ -1,11 +1,11 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.NotCriteriaHelper;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.NotCriteriaHelper;-import io.onedev.server.util.query.QueryBuildContext;public class NotCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.javaindex 8c9a509757..80194a0182 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class NumberCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.javaindex 6ccd3e81d8..7cb14a590c 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java@@ -1,10 +1,11 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class OpenCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.javaindex 410a31be60..ccc96ef465 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.java@@ -1,14 +1,14 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.List;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.OrCriteriaHelper;+import io.onedev.server.entityquery.ParensAware;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.ParensAware;-import io.onedev.server.util.query.OrCriteriaHelper;-import io.onedev.server.util.query.QueryBuildContext;public class OrCriteria extends PullRequestCriteria implements ParensAware {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.javaindex ea16889a98..28b967e7a6 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java@@ -1,11 +1,11 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.EntityCriteria;public abstract class PullRequestCriteria extends EntityCriteria<PullRequest> {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4similarity index 100%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.g4rename to core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.javaindex af40e54a30..4ec5b328a6 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.io.IOException;import java.util.ArrayList;@@ -17,6 +17,9 @@ import org.eclipse.jgit.errors.RevisionSyntaxException;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.EntitySort;+import io.onedev.server.entityquery.EntitySort.Direction;import io.onedev.server.exception.OneException;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.UserManager;@@ -24,20 +27,20 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.AndCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.CriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.NotCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OperatorCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OrCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OrderContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.ParensCriteriaContext;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.QueryContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryBaseVisitor;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.AndCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.CriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.NotCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OperatorCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OperatorValueCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrderContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.ParensCriteriaContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.QueryContext;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.EntitySort;-import io.onedev.server.util.query.EntitySort.Direction;public class PullRequestQuery extends EntityQuery<PullRequest> {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.javaindex 0b75557368..460474a04c 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java@@ -1,12 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Root;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;public class PullRequestQueryBuildContext extends QueryBuildContext<PullRequest> {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.javaindex 1682126c4a..4d64205461 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class RequestForChangesByCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.javaindex ef86d6be0c..88b857bfac 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;public class RequestForChangesByMeCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.javaindex 82ede081e7..ab292df779 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.javaindex 37eb3e5d51..bc2b4af6bc 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SourceBranchCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.javaindex ffe27d22cd..ed8fdfd7e8 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SourceProjectCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.javaindex 9c8ff962b7..9c6b93eef4 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java@@ -1,12 +1,13 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class StateCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.javaindex b3b8fcc6cb..29369dfe98 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java@@ -1,13 +1,14 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Date;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SubmitDateCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.javaindex 258e3fcb7d..b9adb23be8 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SubmittedByCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.javaindex 8f0d2866fa..f3c3c68271 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.QueryBuildContext;public class SubmittedByMeCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.javaindex 84d8937fe0..907eedad7f 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java@@ -1,14 +1,15 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Objects;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class TargetBranchCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.javaindex 44e197e9f4..e1e35c906a 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class TitleCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.javaindex c9f2284ae6..f8e31140f5 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class ToBeReviewedByCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.javaindex 7f845dcc2c..74d840b692 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java@@ -1,15 +1,16 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryBuildContext;public class ToBeReviewedByMeCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.javaindex 3d943c97c6..9f6d2ae3fd 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java@@ -1,13 +1,14 @@-package io.onedev.server.model.support.pullrequest.query;+package io.onedev.server.entityquery.pullrequest;import java.util.Date;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.query.QueryBuildContext;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class UpdateDateCriteria extends PullRequestCriteria {diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex 370566d7c5..f621bdd3da 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -6,13 +6,13 @@ import java.util.Map;import javax.annotation.Nullable;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.dao.EntityManager;-import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.javaindex dbdadb9ac2..bb50589076 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java@@ -5,14 +5,14 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.entityquery.EntityCriteria;+import io.onedev.server.entityquery.EntityQuery;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.persistence.dao.EntityManager;-import io.onedev.server.util.query.EntityCriteria;-import io.onedev.server.util.query.EntityQuery;public interface PullRequestManager extends EntityManager<PullRequest> {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex 796fde668b..fbb1e679ce 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -29,6 +29,15 @@ import org.hibernate.query.Query;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.EntitySort;+import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.entityquery.EntitySort.Direction;+import io.onedev.server.entityquery.issue.AndCriteria;+import io.onedev.server.entityquery.issue.IssueCriteria;+import io.onedev.server.entityquery.issue.IssueQuery;+import io.onedev.server.entityquery.issue.IssueQueryBuildContext;+import io.onedev.server.entityquery.issue.MilestoneCriteria;import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;@@ -41,11 +50,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.IssueBoard;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.query.AndCriteria;-import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryBuildContext;-import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -57,10 +61,6 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.EntitySort;-import io.onedev.server.util.query.EntitySort.Direction;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;@@ -142,7 +142,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn nextNumber.getAndIncrement();}- private Predicate[] getPredicates(io.onedev.server.util.query.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context) {+ private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context) {List<Predicate> predicates = new ArrayList<>();predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));if (criteria != null)@@ -185,7 +185,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(Project project, io.onedev.server.util.query.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {+ public List<Issue> query(Project project, io.onedev.server.entityquery.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javaindex ce534fb9a3..8c1d7b29e4 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java@@ -10,6 +10,9 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryWatchBuilder;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.issue.IssueActionEvent;import io.onedev.server.event.issue.IssueCommented;@@ -27,11 +30,8 @@ import io.onedev.server.model.IssueWatch;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.util.markdown.MentionParser;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryWatchBuilder;import jersey.repackaged.com.google.common.collect.Lists;@Singletondiff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex a3d435f474..46cefc6030 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -58,6 +58,12 @@ import com.google.common.base.Throwables;import io.onedev.launcher.loader.Listen;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.EntitySort;+import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.entityquery.EntitySort.Direction;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryBuildContext;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.pullrequest.PullRequestActionEvent;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;@@ -104,8 +110,6 @@ import io.onedev.server.model.support.pullrequest.actiondata.MergedData;import io.onedev.server.model.support.pullrequest.actiondata.RemovedReviewerData;import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;import io.onedev.server.model.support.pullrequest.actiondata.RestoredSourceBranchData;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryBuildContext;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -119,10 +123,6 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.BatchWorker;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.EntitySort;-import io.onedev.server.util.query.EntitySort.Direction;-import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.utils.concurrent.Prioritized;@@ -977,7 +977,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreturn findAll(criteria);}- private Predicate[] getPredicates(io.onedev.server.util.query.EntityCriteria<PullRequest> criteria, Project project, QueryBuildContext<PullRequest> context) {+ private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<PullRequest> criteria, Project project, QueryBuildContext<PullRequest> context) {List<Predicate> predicates = new ArrayList<>();predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), project));if (criteria != null)@@ -1022,7 +1022,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public int count(Project project, io.onedev.server.util.query.EntityCriteria<PullRequest> requestCriteria) {+ public int count(Project project, io.onedev.server.entityquery.EntityCriteria<PullRequest> requestCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.javaindex 6c917aff2c..5bf274119c 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java@@ -16,6 +16,9 @@ import org.hibernate.type.Type;import com.google.common.collect.Lists;import io.onedev.launcher.loader.Listen;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.QueryWatchBuilder;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.pullrequest.PullRequestActionEvent;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;@@ -44,12 +47,9 @@ import io.onedev.server.model.support.pullrequest.actiondata.DiscardedData;import io.onedev.server.model.support.pullrequest.actiondata.MergedData;import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;import io.onedev.server.model.support.pullrequest.actiondata.RequestedForChangesData;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.persistence.PersistListener;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.util.markdown.MentionParser;-import io.onedev.server.util.query.EntityQuery;-import io.onedev.server.util.query.QueryWatchBuilder;@Singletonpublic class DefaultPullRequestNotificationManager implements PersistListener {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex c05e14882e..c0de67052b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -145,7 +145,7 @@ public class IssueBoard implements Serializable {Set<String> undefinedStates = new HashSet<>();if (getBaseQuery() != null) {try {- undefinedStates.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));+ undefinedStates.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));} catch (Exception e) {}}@@ -161,8 +161,8 @@ public class IssueBoard implements Serializable {public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {if (getBaseQuery() != null) {try {- io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false);+ io.onedev.server.entityquery.issue.IssueQuery query =+ io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());setBaseQuery(query.toString());@@ -182,7 +182,7 @@ public class IssueBoard implements Serializable {Set<String> undefinedFields = new HashSet<>();if (getBaseQuery() != null) {try {- undefinedFields.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));+ undefinedFields.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));} catch (Exception e) {}}@@ -197,8 +197,8 @@ public class IssueBoard implements Serializable {public boolean fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {if (getBaseQuery() != null) {try {- io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), false);+ io.onedev.server.entityquery.issue.IssueQuery query =+ io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false);boolean remove = false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();@@ -259,7 +259,7 @@ public class IssueBoard implements Serializable {try {if (getBaseQuery() != null) {try {- undefinedFieldValues.addAll(io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));+ undefinedFieldValues.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));} catch (Exception e) {}}@@ -282,8 +282,8 @@ public class IssueBoard implements Serializable {public boolean fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions) {if (getBaseQuery() != null) {try {- io.onedev.server.model.support.issue.query.IssueQuery query =- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, getBaseQuery(), true);+ io.onedev.server.entityquery.issue.IssueQuery query =+ io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), true);boolean remove = false;for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {UndefinedFieldValueResolution resolution = entry.getValue();diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex 440e4ff54d..7aacc4db94 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -13,12 +13,12 @@ import javax.annotation.Nullable;import com.google.common.collect.Lists;+import io.onedev.server.entityquery.issue.IssueCriteria;+import io.onedev.server.entityquery.issue.OrCriteria;+import io.onedev.server.entityquery.issue.StateCriteria;import io.onedev.server.exception.OneException;import io.onedev.server.model.Issue;import io.onedev.server.model.support.authorized.ProjectWriters;-import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.OrCriteria;-import io.onedev.server.model.support.issue.query.StateCriteria;import io.onedev.server.model.support.issue.workflow.action.PressButton;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;diff --git a/core/src/main/java/io/onedev/server/util/query/ParensAware.java b/core/src/main/java/io/onedev/server/util/query/ParensAware.javadeleted file mode 100644index 1cd8aa4c75..0000000000--- a/core/src/main/java/io/onedev/server/util/query/ParensAware.java+++ /dev/null@@ -1,5 +0,0 @@-package io.onedev.server.util.query;--public interface ParensAware {--}diff --git a/core/src/main/java/io/onedev/server/util/readcallback/ReadCallback.java b/core/src/main/java/io/onedev/server/util/readcallback/ReadCallback.javadeleted file mode 100644index 04e8e255ab..0000000000--- a/core/src/main/java/io/onedev/server/util/readcallback/ReadCallback.java+++ /dev/null@@ -1,10 +0,0 @@-package io.onedev.server.util.readcallback;--import com.fasterxml.jackson.annotation.JsonTypeInfo;--@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")-public interface ReadCallback {-- public abstract void onRead();--}diff --git a/core/src/main/java/io/onedev/server/util/readcallback/ReadCallbackServlet.java b/core/src/main/java/io/onedev/server/util/readcallback/ReadCallbackServlet.javadeleted file mode 100644index 0ffd5fb69d..0000000000--- a/core/src/main/java/io/onedev/server/util/readcallback/ReadCallbackServlet.java+++ /dev/null@@ -1,76 +0,0 @@-package io.onedev.server.util.readcallback;--import java.io.IOException;-import java.io.InputStream;-import java.io.OutputStream;-import java.io.UnsupportedEncodingException;-import java.net.URLDecoder;-import java.net.URLEncoder;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;--import org.apache.commons.codec.Charsets;-import org.apache.http.HttpHeaders;-import org.h2.util.IOUtils;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;--import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.web.img.Img;-import io.onedev.utils.ClassUtils;--@Singleton-public class ReadCallbackServlet extends HttpServlet {-- private static final long serialVersionUID = 1L;-- public static final String PATH = "/read-callback";-- private final ObjectMapper mapper;-- @Inject- public ReadCallbackServlet(ObjectMapper mapper) {- this.mapper = mapper;- }-- private void doNotCache(HttpServletResponse response) {- response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");- response.setHeader("Pragma", "no-cache");- response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");- }-- @Sessional- @Override- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {- String json = URLDecoder.decode(request.getQueryString(), Charsets.UTF_8.name());- ReadCallback callback = mapper.readValue(json, ReadCallback.class);- callback.onRead();-- response.addHeader(HttpHeaders.CONTENT_TYPE, "image/png");- doNotCache(response);-- try ( InputStream is = ClassUtils.getResourceAsStream(Img.class, "1x1.png");- OutputStream os = response.getOutputStream();) {- IOUtils.copy(is, os);- os.flush();- }- }-- public static String getUrl(ReadCallback callback) {- try {- String json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(callback);- String queryString = URLEncoder.encode(json, Charsets.UTF_8.name());- return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl() + PATH + "?" + queryString;- } catch (UnsupportedEncodingException | JsonProcessingException e) {- throw new RuntimeException(e);- }- }-}diff --git a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.javaindex 884506753b..425281b948 100644--- a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java@@ -21,7 +21,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri} else {Project project = OneContext.get().getProject();try {- io.onedev.server.model.support.issue.query.IssueQuery.parse(project, value, true);+ io.onedev.server.entityquery.issue.IssueQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.javaindex d92c550978..d56255b916 100644--- a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java@@ -21,7 +21,7 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullReques} else {Project project = OneContext.get().getProject();try {- io.onedev.server.model.support.pullrequest.query.PullRequestQuery.parse(project, value, true);+ io.onedev.server.entityquery.pullrequest.PullRequestQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 3fc03fb8da..6c24965d5e 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -22,6 +22,7 @@ import io.onedev.codeassist.grammar.LiteralElementSpec;import io.onedev.codeassist.grammar.RuleRefElementSpec;import io.onedev.codeassist.parser.Element;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.exception.OneException;import io.onedev.server.manager.GroupManager;import io.onedev.server.manager.IssueManager;@@ -29,8 +30,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryParser;+import io.onedev.server.entityquery.issue.IssueQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;import io.onedev.server.util.DateUtils;diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex b6a9fbc983..cc020f709a 100644--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -21,6 +21,7 @@ import io.onedev.codeassist.grammar.LiteralElementSpec;import io.onedev.codeassist.grammar.RuleRefElementSpec;import io.onedev.codeassist.parser.Element;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -30,9 +31,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryLexer;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;import io.onedev.server.util.Constants;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex 3ef91cdb25..1910c43520 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -42,6 +42,7 @@ import io.onedev.jsyntax.TextToken;import io.onedev.jsyntax.TokenUtils;import io.onedev.jsyntax.Tokenized;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.BlameCommit;import io.onedev.server.git.BlobChange;@@ -54,7 +55,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.hit.QueryHit;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.diff.DiffBlock;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 542debbe6f..5a1879ae45 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -64,6 +64,7 @@ import io.onedev.codeassist.InputSuggestion;import io.onedev.codeassist.Substitution;import io.onedev.jsymbol.util.NoAntiCacheImage;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.IndexManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;@@ -76,7 +77,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.ProjectAndRevision;-import io.onedev.server.search.IndexManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.javaindex d9b8f8e9ee..66a88ad4b2 100644--- a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java@@ -13,8 +13,8 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.protocol.http.WebSession;+import io.onedev.server.entityquery.EntityQuery;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.util.QueryPosition;import io.onedev.utils.ReflectionUtils;import io.onedev.utils.WordUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex bc7c34e777..ac9f10d248 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -30,11 +30,11 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.RunTaskBehavior;diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 78b7012174..6b3ead11aa 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -40,13 +40,13 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.javaindex eca845aae2..f85a5155ec 100644--- a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java@@ -5,9 +5,9 @@ import java.util.List;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.javaindex 77dec8b5dd..44f503b8ca 100644--- a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java@@ -5,9 +5,9 @@ import java.util.List;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.model.Project;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javaindex 481f47bd4b..4e0105d59e 100644--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -20,9 +20,9 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.collect.Sets;+import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex a7418a6b1c..beac09e09e 100644--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -31,17 +31,17 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.jsymbol.Symbol;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.IndexConstants;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.hit.SymbolHit;+import io.onedev.server.codesearch.query.BlobQuery;+import io.onedev.server.codesearch.query.SymbolQuery;+import io.onedev.server.codesearch.query.TextQuery;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.IndexConstants;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.hit.SymbolHit;-import io.onedev.server.search.query.BlobQuery;-import io.onedev.server.search.query.SymbolQuery;-import io.onedev.server.search.query.TextQuery;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex eefa3062fa..c6047fd32a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -52,6 +52,12 @@ import io.onedev.jsymbol.TokenPosition;import io.onedev.jsymbol.util.NoAntiCacheImage;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;+import io.onedev.server.codesearch.IndexManager;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.query.BlobQuery;+import io.onedev.server.codesearch.query.TextQuery;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;@@ -70,12 +76,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.TextRange;import io.onedev.server.persistence.UnitOfWork;-import io.onedev.server.search.CommitIndexed;-import io.onedev.server.search.IndexManager;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.query.BlobQuery;-import io.onedev.server.search.query.TextQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex b0e328cc37..c4558a0981 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -11,13 +11,13 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.jsymbol.TokenPosition;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.hit.QueryHit;public interface BlobRenderContext extends Serializable {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex f33a948c15..ef842c9fac 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -61,6 +61,8 @@ import io.onedev.jsymbol.SymbolExtractor;import io.onedev.jsymbol.SymbolExtractorRegistry;import io.onedev.jsymbol.TokenPosition;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;@@ -75,8 +77,6 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 06d1865edb..27bc1b74c4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -36,15 +36,15 @@ import org.eclipse.jgit.lib.ObjectId;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.query.BlobQuery;+import io.onedev.server.codesearch.query.FileQuery;+import io.onedev.server.codesearch.query.SymbolQuery;+import io.onedev.server.codesearch.query.TextQuery;+import io.onedev.server.codesearch.query.TooGeneralQueryException;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.query.BlobQuery;-import io.onedev.server.search.query.FileQuery;-import io.onedev.server.search.query.SymbolQuery;-import io.onedev.server.search.query.TextQuery;-import io.onedev.server.search.query.TooGeneralQueryException;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.tabbable.AjaxActionTab;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 58658e30ea..bc70fe3c95 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -33,15 +33,15 @@ import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.SearchManager;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.query.BlobQuery;+import io.onedev.server.codesearch.query.FileQuery;+import io.onedev.server.codesearch.query.SymbolQuery;+import io.onedev.server.codesearch.query.TooGeneralQueryException;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.SearchManager;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.query.BlobQuery;-import io.onedev.server.search.query.FileQuery;-import io.onedev.server.search.query.SymbolQuery;-import io.onedev.server.search.query.TooGeneralQueryException;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.javaindex 05e3dc5bb7..62fc0ec7e9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.blob.search.result;import java.io.Serializable;import java.util.List;-import io.onedev.server.search.hit.QueryHit;+import io.onedev.server.codesearch.hit.QueryHit;import io.onedev.utils.Range;public class MatchedBlob implements Serializable {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex fc5379cbb3..6f0e80cf34 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -30,11 +30,11 @@ import org.eclipse.jgit.lib.FileMode;import io.onedev.jsymbol.TokenPosition;import io.onedev.jsymbol.util.HighlightableLabel;+import io.onedev.server.codesearch.hit.FileHit;+import io.onedev.server.codesearch.hit.QueryHit;+import io.onedev.server.codesearch.hit.TextHit;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.support.TextRange;-import io.onedev.server.search.hit.FileHit;-import io.onedev.server.search.hit.QueryHit;-import io.onedev.server.search.hit.TextHit;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 16468f7716..12a79ebaa3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -53,6 +53,7 @@ import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -63,8 +64,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;-import io.onedev.server.model.support.pullrequest.query.PullRequestQueryLexer;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branchchoice.BranchChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex fc5b1274b3..18723591c9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -38,6 +38,7 @@ import com.google.common.base.Joiner;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -49,7 +50,6 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.avatar.ContributorAvatars;diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 936e4fbd4b..90427589ee 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -30,6 +30,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.manager.PullRequestManager;@@ -40,7 +41,6 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.ProjectAndRevision;-import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.TooltipBehavior;import io.onedev.server.web.component.commitlist.CommitListPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javaindex cb8ad4db96..a6f3001899 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -21,13 +21,13 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueCriteria;+import io.onedev.server.entityquery.issue.IssueQuery;+import io.onedev.server.entityquery.issue.MilestoneCriteria;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex c964752b49..2329d94c9c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -28,6 +28,12 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.ChoiceFieldCriteria;+import io.onedev.server.entityquery.issue.FieldOperatorCriteria;+import io.onedev.server.entityquery.issue.IssueCriteria;+import io.onedev.server.entityquery.issue.IssueQuery;+import io.onedev.server.entityquery.issue.MilestoneCriteria;+import io.onedev.server.entityquery.issue.StateCriteria;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.UserManager;@@ -36,13 +42,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.model.support.issue.query.ChoiceFieldCriteria;-import io.onedev.server.model.support.issue.query.FieldOperatorCriteria;-import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryLexer;-import io.onedev.server.model.support.issue.query.MilestoneCriteria;-import io.onedev.server.model.support.issue.query.StateCriteria;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.javaindex 19eb22c395..56e6f875be 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java@@ -36,12 +36,12 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.exception.OneException;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.javaindex 7f7386d96e..25f07f8732 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java@@ -8,10 +8,10 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.newissue.NewIssueEditor;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 9c14a43843..c5f03d5b34 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -50,6 +50,8 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;@@ -64,7 +66,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;@@ -72,7 +73,6 @@ import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.entitynav.EntityNavPanel;import io.onedev.server.web.component.entitywatches.EntityWatchesPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex 08d4cbb6ed..9956bd1bfd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -14,13 +14,13 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.web.component.issuelist.IssueListPanel;import io.onedev.server.web.component.issuelist.QuerySaveSupport;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex a7ae31cf2b..b9e36c9337 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;+import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.model.Milestone;-import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.web.component.milestoneprogress.MilestoneProgressBar;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 6eca21990a..f37785e7d3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -14,11 +14,11 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueQuery;+import io.onedev.server.entityquery.issue.MilestoneCriteria;import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.MilestoneDueLabel;import io.onedev.server.web.component.MilestoneStatusLabel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javaindex e456a76111..7d4b4e44d5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -11,12 +11,12 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.issue.IssueCriteria;+import io.onedev.server.entityquery.issue.IssueQuery;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.newissue.NewIssueEditor;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javaindex fe407cfb65..ff33a51301 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java@@ -37,6 +37,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.manager.PullRequestManager;@@ -52,7 +53,6 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.search.CommitIndexed;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.component.branchpicker.AffinalBranchPicker;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex 5677983242..f0d2237ece 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -66,6 +66,8 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.EntityQuery;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.manager.PullRequestActionManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestUpdateManager;@@ -82,10 +84,8 @@ import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.component.build.PullRequestBuildsPanel;import io.onedev.server.web.component.entitynav.EntityNavPanel;import io.onedev.server.web.component.entitywatches.EntityWatchesPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.javaindex 30c0488e99..9df936c10d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java@@ -33,13 +33,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.diff.revision.CommentSupport;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.javaindex 3d07ffeffd..6845d6688b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java@@ -24,12 +24,12 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.codesearch.CommitIndexed;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.build.BuildStatusPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex 2da37a2d15..ffb2e75b6e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entityquery.pullrequest.PullRequestQuery;import io.onedev.server.git.BlobIdent;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.PullRequestManager;@@ -49,7 +50,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestQuerySetting;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;diff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.javaindex 7f17266fb7..3d9a17835e 100644--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java@@ -4,7 +4,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;-import io.onedev.server.search.CommitIndexed;+import io.onedev.server.codesearch.CommitIndexed;@Singletonpublic class CommitIndexedBroadcaster {diff --git a/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java b/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.javaindex fdb55d1948..2ff8812fd9 100644--- a/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java+++ b/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java@@ -7,7 +7,7 @@ import org.junit.Test;import com.google.common.base.Splitter;-import io.onedev.server.search.query.regex.RegexLiterals;+import io.onedev.server.codesearch.query.regex.RegexLiterals;public class RegexLiteralsTest {diff --git a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex c92746b7e3..a2eedc922a 100644--- a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -24,7 +24,6 @@ import io.onedev.server.security.OneWebEnvironment;import io.onedev.server.util.jetty.ClasspathAssetServlet;import io.onedev.server.util.jetty.FileAssetServlet;import io.onedev.server.util.jetty.ServletConfigurator;-import io.onedev.server.util.readcallback.ReadCallbackServlet;import io.onedev.server.util.serverconfig.ServerConfig;import io.onedev.server.web.component.markdown.AttachmentUploadServlet;import io.onedev.server.web.img.Img;@@ -42,8 +41,6 @@ public class ProductServletConfigurator implements ServletConfigurator {private final GitPostReceiveCallback postReceiveServlet;- private final ReadCallbackServlet trackingServlet;-private final WicketServlet wicketServlet;private final ServletContainer jerseyServlet;@@ -53,7 +50,7 @@ public class ProductServletConfigurator implements ServletConfigurator {@Injectpublic ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter, GitFilter gitFilter,GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet,- ReadCallbackServlet trackingServlet, WicketServlet wicketServlet, WebSocketManager webSocketManager,+ WicketServlet wicketServlet, WebSocketManager webSocketManager,ServletContainer jerseyServlet) {this.serverConfig = serverConfig;this.shiroFilter = shiroFilter;@@ -63,7 +60,6 @@ public class ProductServletConfigurator implements ServletConfigurator {this.wicketServlet = wicketServlet;this.webSocketManager = webSocketManager;this.jerseyServlet = jerseyServlet;- this.trackingServlet = trackingServlet;}@Override@@ -86,9 +82,6 @@ public class ProductServletConfigurator implements ServletConfigurator {ServletHolder postReceiveServletHolder = new ServletHolder(postReceiveServlet);context.addServlet(postReceiveServletHolder, GitPostReceiveCallback.PATH + "/*");- ServletHolder trackingServletHolder = new ServletHolder(trackingServlet);- context.addServlet(trackingServletHolder, ReadCallbackServlet.PATH + "/*");-ServletHolder wicketServletHolder = new ServletHolder(wicketServlet);/*