The Unified and Autonomous Development Platform
chore: refactor advanced search panel and various query options
Robin Shen8467d79c92f7
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex f9a369c56a..7a4a430493 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -2,7 +2,6 @@ package io.onedev.server;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;-import com.google.inject.Provider;import com.google.inject.matcher.AbstractMatcher;import com.google.inject.matcher.Matchers;import com.thoughtworks.xstream.XStream;@@ -28,9 +27,7 @@ import io.onedev.server.buildspec.job.log.instruction.LogInstruction;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterResource;import io.onedev.server.cluster.DefaultClusterManager;-import io.onedev.server.codequality.CodeProblem;import io.onedev.server.codequality.CodeProblemContribution;-import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.commandhandler.*;import io.onedev.server.entitymanager.*;@@ -67,7 +64,6 @@ import io.onedev.server.mail.MailManager;import io.onedev.server.markdown.DefaultMarkdownManager;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.markdown.MarkdownProcessor;-import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.notification.*;@@ -82,10 +78,10 @@ import io.onedev.server.rest.exception.UnauthenticatedExceptionHandler;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.code.insidecommit.CodeIndexManager;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;-import io.onedev.server.search.code.insidecommit.DefaultCodeIndexManager;-import io.onedev.server.search.code.insidecommit.DefaultCodeSearchManager;+import io.onedev.server.search.code.CodeIndexManager;+import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.DefaultCodeIndexManager;+import io.onedev.server.search.code.DefaultCodeSearchManager;import io.onedev.server.search.entitytext.*;import io.onedev.server.security.*;import io.onedev.server.security.realm.AbstractAuthorizingRealm;@@ -121,11 +117,9 @@ import io.onedev.server.web.editable.EditSupportRegistry;import io.onedev.server.web.exception.PageExpiredExceptionHandler;import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.layout.AdministrationSettingContribution;-import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;import io.onedev.server.web.page.layout.MainMenuCustomization;import io.onedev.server.web.page.project.blob.render.BlobRenderer;-import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.test.TestPage;import io.onedev.server.web.websocket.*;@@ -302,8 +296,8 @@ public class CoreModule extends AbstractPluginModule {bind(CodeIndexManager.class).to(DefaultCodeIndexManager.class);bind(CodeSearchManager.class).to(DefaultCodeSearchManager.class);- Bootstrap.executorService = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS,- new SynchronousQueue<Runnable>()) {+ Bootstrap.executorService = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS,+ new SynchronousQueue<>()) {@Overridepublic void execute(Runnable command) {@@ -317,60 +311,18 @@ public class CoreModule extends AbstractPluginModule {};- bind(ExecutorService.class).toProvider(new Provider<ExecutorService>() {-- @Override- public ExecutorService get() {- return Bootstrap.executorService;- }-- }).in(Singleton.class);+ bind(ExecutorService.class).toProvider(() -> Bootstrap.executorService).in(Singleton.class);- bind(OsInfo.class).toProvider(new Provider<OsInfo>() {-- @Override- public OsInfo get() {- return ExecutorUtils.getOsInfo();- }-- }).in(Singleton.class);+ bind(OsInfo.class).toProvider(() -> ExecutorUtils.getOsInfo()).in(Singleton.class);contributeFromPackage(LogInstruction.class, LogInstruction.class);- contribute(CodeProblemContribution.class, new CodeProblemContribution() {-- @Override- public List<CodeProblem> getCodeProblems(Build build, String blobPath, String reportName) {- return Lists.newArrayList();- }-- });+ contribute(CodeProblemContribution.class, (build, blobPath, reportName) -> Lists.newArrayList());- contribute(LineCoverageContribution.class, new LineCoverageContribution() {-- @Override- public Map<Integer, CoverageStatus> getLineCoverages(Build build, String blobPath, String reportName) {- return new HashMap<>();- }-- });- contribute(AdministrationSettingContribution.class, new AdministrationSettingContribution() {-- @Override- public List<Class<? extends ContributedAdministrationSetting>> getSettingClasses() {- return new ArrayList<>();- }-- });- contribute(ProjectSettingContribution.class, new ProjectSettingContribution() {-- @Override- public List<Class<? extends ContributedProjectSetting>> getSettingClasses() {- return new ArrayList<>();- }-- });+ contribute(LineCoverageContribution.class, (build, blobPath, reportName) -> new HashMap<>());+ contribute(AdministrationSettingContribution.class, () -> new ArrayList<>());+ contribute(ProjectSettingContribution.class, () -> new ArrayList<>());}diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex e0a3d44f83..dd368d593c 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -53,7 +53,7 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.search.code.insidecommit.CodeIndexManager;+import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.javaindex 8fb83da286..b7231f6f07 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java@@ -37,10 +37,9 @@ public class BranchProtection implements Serializable {private static final long serialVersionUID = 1L;- private static final Pattern CONVENTIONAL_COMMIT_SUBJECT =- Pattern.compile(- "([\\w\\-.]+)\\s*(\\(([\\w\\s\\-./,]+)\\)\\s*)?(!\\s*)?:.+",- Pattern.UNICODE_CHARACTER_CLASS);+ private static final Pattern CONVENTIONAL_COMMIT_SUBJECT = Pattern.compile(+ "([\\w\\-.]+)\\s*(\\(([\\w\\s\\-./,]+)\\)\\s*)?(!\\s*)?:.+",+ Pattern.UNICODE_CHARACTER_CLASS);private boolean enabled = true;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.javarename to server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.javaindex 9f4ae2e3c5..2392cf6c0b 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit;+package io.onedev.server.search.code;import javax.annotation.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.javarename to server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.javaindex a9c53594f3..ab0699fa8d 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java@@ -1,10 +1,10 @@-package io.onedev.server.search.code.insidecommit;+package io.onedev.server.search.code;import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;+import io.onedev.server.search.code.query.BlobQuery;import org.apache.lucene.search.IndexSearcher;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.javarename to server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.javaindex 6fb64c05b3..6e34a5868a 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit;+package io.onedev.server.search.code;import com.google.common.base.Preconditions;import io.onedev.commons.jsymbol.Symbol;@@ -18,7 +18,6 @@ import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.search.code.NGramAnalyzer;import io.onedev.server.util.ContentDetector;import io.onedev.server.util.IndexResult;import io.onedev.server.util.concurrent.BatchWorkManager;@@ -56,7 +55,7 @@ import java.nio.charset.StandardCharsets;import java.util.List;import java.util.concurrent.atomic.AtomicReference;-import static io.onedev.server.search.code.insidecommit.FieldConstants.*;+import static io.onedev.server.search.code.FieldConstants.*;import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.javarename to server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.javaindex 9ef0eed345..6470f9ebce 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit;+package io.onedev.server.search.code;import com.google.common.base.Preconditions;import io.onedev.commons.jsymbol.Symbol;@@ -15,8 +15,8 @@ import io.onedev.server.event.system.SystemStopping;import io.onedev.server.model.Project;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.FileQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.commons.lang3.SerializationUtils;import org.apache.lucene.document.Document;@@ -47,7 +47,7 @@ import java.util.*;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicReference;-import static io.onedev.server.search.code.insidecommit.FieldConstants.*;+import static io.onedev.server.search.code.FieldConstants.*;@Singletonpublic class DefaultCodeSearchManager implements CodeSearchManager, Serializable {diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.java b/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.javarename to server-core/src/main/java/io/onedev/server/search/code/FieldConstants.javaindex b7ef108f1f..a66a0fd98e 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.java+++ b/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit;+package io.onedev.server.search.code;import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.javarename to server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.javaindex 01aa848b0b..3fc6154da9 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java@@ -1,7 +1,6 @@-package io.onedev.server.search.code.insidecommit.query;+package io.onedev.server.search.code.query;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.IndexSearcher;@@ -13,7 +12,7 @@ import javax.annotation.Nullable;import java.io.Serializable;import java.util.List;-import static io.onedev.server.search.code.insidecommit.FieldConstants.BLOB_PATH;+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;public abstract class BlobQuery implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.javarename to server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.javaindex d3f4197131..2e6b15271d 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java@@ -1,12 +1,11 @@-package io.onedev.server.search.code.insidecommit.query;+package io.onedev.server.search.code.query;-import static io.onedev.server.search.code.insidecommit.FieldConstants.BLOB_NAME;+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.lucene.index.Term;import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.javaindex 0460a1be68..9892ca1980 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java@@ -1,7 +1,5 @@package io.onedev.server.search.code.query;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.FileQuery;import io.onedev.server.web.component.codequeryoption.FileQueryOptionPanel;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.javaindex 1c400c807c..2e510b0e20 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java@@ -1,6 +1,5 @@package io.onedev.server.search.code.query;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;import org.apache.wicket.markup.html.form.FormComponentPanel;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.javarename to server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.javaindex 050f56d83b..be5be41e7a 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit.query;+package io.onedev.server.search.code.query;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;@@ -7,8 +7,7 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.server.OneDev;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.SymbolHit;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;-import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.util.match.WildcardUtils;import org.apache.lucene.index.Term;import org.apache.lucene.search.BooleanClause.Occur;@@ -21,7 +20,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;import javax.annotation.Nullable;import java.util.List;-import static io.onedev.server.search.code.insidecommit.FieldConstants.*;+import static io.onedev.server.search.code.FieldConstants.*;public class SymbolQuery extends BlobQuery {diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.javaindex 86411c2873..9e017bb853 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java@@ -1,7 +1,5 @@package io.onedev.server.search.code.query;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.SymbolQuery;import io.onedev.server.web.component.codequeryoption.SymbolQueryOptionPanel;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.javarename to server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.javaindex 2714251ae4..fc1d72818c 100644--- a/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java@@ -1,4 +1,4 @@-package io.onedev.server.search.code.insidecommit.query;+package io.onedev.server.search.code.query;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;@@ -7,8 +7,6 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.search.code.IndexConstants;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.TextHit;-import io.onedev.server.search.code.query.NGramLuceneQuery;-import io.onedev.server.search.code.query.TooGeneralQueryException;import io.onedev.server.search.code.query.regex.RegexLiterals;import io.onedev.server.util.ContentDetector;import org.apache.commons.lang3.CharUtils;@@ -27,8 +25,8 @@ import java.util.regex.Matcher;import java.util.regex.Pattern;import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;-import static io.onedev.server.search.code.insidecommit.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.code.insidecommit.FieldConstants.BLOB_TEXT;+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;public class TextQuery extends BlobQuery {@@ -48,8 +46,8 @@ public class TextQuery extends BlobQuery {private transient Pattern pattern;- private TextQuery(String term, boolean regex, boolean caseSensitive, boolean wholeWord,- @Nullable String directory, @Nullable String fileNames, int count) {+ private TextQuery(String term, boolean regex, boolean caseSensitive, boolean wholeWord,+ @Nullable String directory, @Nullable String fileNames, int count) {super(directory, count);this.term = term;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.javaindex 1b72a999e6..067b6735ff 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java@@ -1,7 +1,5 @@package io.onedev.server.search.code.query;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.TextQuery;import io.onedev.server.web.component.codequeryoption.TextQueryOptionPanel;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.htmlindex fce7616690..ffa3008107 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html@@ -1,6 +1,6 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>Search For <span class="text-danger">*</span></label>+ <label>File Name <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><p class="form-text text-muted">(* = any string, ? = any character)</p><div wicket:id="feedback" class="mt-2"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.javaindex 9fa2db7cb3..c9a2c581e4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java@@ -1,8 +1,7 @@package io.onedev.server.web.component.codequeryoption;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.FileQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.FileQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.wicket.behavior.AttributeAppender;@@ -33,19 +32,16 @@ public class FileQueryOptionPanel extends FormComponentPanel<FileQueryOption> {WebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));+ term.setRequired(true).setLabel(Model.of("File name"));term.add(validatable -> {- if (StringUtils.isBlank(validatable.getValue())) {- validatable.error(messageSource -> "This field is required");- } else {- BlobQuery query = new FileQuery.Builder()- .fileNames(validatable.getValue())- .count(1)- .build();- try {- query.asLuceneQuery();- } catch (TooGeneralQueryException e) {- validatable.error(messageSource -> "Search is too general");- }+ BlobQuery query = new FileQuery.Builder()+ .fileNames(validatable.getValue())+ .count(1)+ .build();+ try {+ query.asLuceneQuery();+ } catch (TooGeneralQueryException e) {+ validatable.error(messageSource -> "Search is too general");}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.htmlindex 6bd004bb80..f2e2db2105 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html@@ -1,6 +1,6 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>Search For <span class="text-danger">*</span></label>+ <label>Symbol Name <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><p class="form-text text-muted">(* = any string, ? = any character)</p><div wicket:id="feedback" class="mt-2"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.javaindex aea10f4427..7d6ece0e53 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java@@ -1,8 +1,8 @@package io.onedev.server.web.component.codequeryoption;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.SymbolQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.SymbolQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.wicket.behavior.AttributeAppender;@@ -36,6 +36,7 @@ public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOptionWebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));+ term.setRequired(true).setLabel(Model.of("Symbol name"));term.add(validatable -> {if (StringUtils.isBlank(validatable.getValue())) {validatable.error(messageSource -> "This field is required");diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.htmlindex a5859bba0a..9855aefb83 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html@@ -1,6 +1,6 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>Search For <span class="text-danger">*</span></label>+ <label>Text <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><div wicket:id="feedback" class="mt-2"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.javaindex 3207549b4d..7d16a3f10a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java@@ -1,8 +1,7 @@package io.onedev.server.web.component.codequeryoption;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.TextQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.search.code.query.TextQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.wicket.behavior.AttributeAppender;@@ -43,24 +42,21 @@ public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {WebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));+ term.setRequired(true).setLabel(Model.of("Text"));term.add(validatable -> {- if (StringUtils.isBlank(validatable.getValue())) {- validatable.error((IValidationError) messageSource -> "This field is required");- } else {- boolean regex = this.regex.getInput()!=null?true:false;- BlobQuery query = new TextQuery.Builder()- .term(validatable.getValue()).regex(regex)- .count(1)- .build();- try {- if (regex)- Pattern.compile(validatable.getValue());- query.asLuceneQuery();- } catch (PatternSyntaxException e) {- validatable.error((IValidationError) messageSource -> "Invalid PCRE syntax");- } catch (TooGeneralQueryException e) {- validatable.error((IValidationError) messageSource -> "Search is too general");- }+ boolean regex = this.regex.getInput()!=null?true:false;+ BlobQuery query = new TextQuery.Builder()+ .term(validatable.getValue()).regex(regex)+ .count(1)+ .build();+ try {+ if (regex)+ Pattern.compile(validatable.getValue());+ query.asLuceneQuery();+ } catch (PatternSyntaxException e) {+ validatable.error((IValidationError) messageSource -> "Invalid PCRE syntax");+ } catch (TooGeneralQueryException e) {+ validatable.error((IValidationError) messageSource -> "Search is too general");}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.javaindex 99c15fa1af..da5ee24612 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java@@ -3,14 +3,14 @@ package io.onedev.server.web.component.commandpalette;import java.util.LinkedHashMap;import java.util.Map;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;+import io.onedev.server.search.code.query.BlobQuery;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.model.Project;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.query.FileQuery;+import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;public class RevisionAndPathParam extends ParamSegment {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 9759a30bda..08a3b23ca6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -81,7 +81,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;-import io.onedev.server.search.code.insidecommit.CodeIndexManager;+import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Pair;import io.onedev.server.util.PathComparator;diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex b485eefb50..36bcf84cc5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -6,13 +6,13 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.IndexConstants;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.SymbolHit;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.SymbolQuery;-import io.onedev.server.search.code.insidecommit.query.TextQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.SymbolQuery;+import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.CtrlClickBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 2052332cf1..efdf87dc81 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -149,7 +149,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~init", ServerInitPage.class));add(new BasePageMapper("~loading", BrowserInfoPage.class));addProjectPages();-// add(new BasePageMapper("~code-search", CodeSearchPage.class));add(new BasePageMapper("~issues", IssueListPage.class));add(new BasePageMapper("~pulls", PullRequestListPage.class));add(new BasePageMapper("~builds", BuildListPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.html b/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.htmldeleted file mode 100644index 97e58ded9e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.html+++ /dev/null@@ -1,9 +0,0 @@-<wicket:extend>- <div id="code-search" class="m-2 m-sm-5">- <div class="card">- <div class="card-body">-- </div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.java b/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.javadeleted file mode 100644index 5bcd57bee9..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.java+++ /dev/null@@ -1,18 +0,0 @@-package io.onedev.server.web.page.codesearch;--import io.onedev.server.web.page.layout.LayoutPage;-import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.request.mapper.parameter.PageParameters;--public class CodeSearchPage extends LayoutPage {-- public CodeSearchPage(PageParameters params) {- super(params);- }-- @Override- protected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Code Search");- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.javaindex 997cbb110e..0df8795de7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java@@ -26,7 +26,6 @@ public class DefaultMainMenuCustomization implements MainMenuCustomization {menuItems.add(new SidebarMenuItem.Page("project", "Projects", ProjectListPage.class,ProjectListPage.paramsOf(0, 0), Lists.newArrayList(NewProjectPage.class)));-// menuItems.add(new SidebarMenuItem.Page("code", "Code Search", CodeSearchPage.class, new PageParameters()));menuItems.add(new SidebarMenuItem.Page("pull-request", "Pull Requests", PullRequestListPage.class,PullRequestListPage.paramsOf(0)));menuItems.add(new SidebarMenuItem.Page("bug", "Issues", IssueListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 3989c29880..b0494e2046 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -26,10 +26,10 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.CodeIndexManager;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.TextQuery;+import io.onedev.server.search.code.CodeIndexManager;+import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.FilenameUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex cc761dd0b8..39aec49596 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -90,7 +90,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.htmlindex 6676a51bfe..3d55dd724c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html@@ -1,7 +1,7 @@<wicket:panel><form wicket:id="form" class="advanced-search"><div class="modal-header">- <h5 class="modal-title">Advanced Search</h5>+ <h5 class="modal-title">Advanced Search <span class="text-muted font-size-sm">in current commit</span></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 05c59ea0d3..8dccb218a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -7,8 +7,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;-import io.onedev.server.search.code.insidecommit.query.SymbolQuery;+import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.FileQueryOption;import io.onedev.server.search.code.query.QueryOption;import io.onedev.server.search.code.query.SymbolQueryOption;@@ -105,7 +105,7 @@ public abstract class AdvancedSearchPanel extends Panel {});List<Tab> tabs = new ArrayList<Tab>();- tabs.add(new AjaxActionTab(Model.of("Text occurrences")) {+ tabs.add(new AjaxActionTab(Model.of("Text")) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -115,7 +115,7 @@ public abstract class AdvancedSearchPanel extends Panel {}.setSelected(option instanceof TextQueryOption));- tabs.add(new AjaxActionTab(Model.of("File names")) {+ tabs.add(new AjaxActionTab(Model.of("Files")) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -125,7 +125,7 @@ public abstract class AdvancedSearchPanel extends Panel {}.setSelected(option instanceof FileQueryOption));- tabs.add(new AjaxActionTab(Model.of("Symbol names")) {+ tabs.add(new AjaxActionTab(Model.of("Symbols")) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.htmlindex 2ca10a0c5e..e768f9882e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="quick-search"><div class="modal-header">- <h5 class="modal-title">File and Symbol Search</h5>+ <h5 class="modal-title">File and Symbol Search <span class="text-muted font-size-sm">in current commit</span></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 0fc0cc59e2..4f0c4b751f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -6,11 +6,11 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;-import io.onedev.server.search.code.insidecommit.query.FileQuery;-import io.onedev.server.search.code.insidecommit.query.SymbolQuery;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.FileQuery;+import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex aa8aafc3c4..71fd4ab807 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -28,6 +28,7 @@ import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.Permission;import javax.annotation.Nullable;import java.util.*;@@ -181,9 +182,13 @@ public class SuggestionUtils {private static ProjectManager getProjectManager() {return OneDev.getInstance(ProjectManager.class);}-+public static List<InputSuggestion> suggestProjectPaths(String matchWith) {- Collection<Project> projects = getProjectManager().getPermittedProjects(new AccessProject());+ return suggestProjectPaths(matchWith, new AccessProject());+ }++ public static List<InputSuggestion> suggestProjectPaths(String matchWith, Permission permission) {+ Collection<Project> projects = getProjectManager().getPermittedProjects(permission);ProjectCache cache = getProjectManager().cloneCache();List<String> projectPaths = projects.stream()diff --git a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.javaindex 2b107e427d..75701a842a 100644--- a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java+++ b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java@@ -29,7 +29,7 @@ import io.onedev.server.plugin.report.coverage.CoverageReport;import io.onedev.server.plugin.report.coverage.FileCoverageInfo;import io.onedev.server.plugin.report.coverage.PackageCoverageInfo;import io.onedev.server.plugin.report.coverage.PublishCoverageReportStep;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.util.XmlUtils;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.javaindex ffc8c06cfe..9ba4537c87 100644--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Build;import io.onedev.server.plugin.report.unittest.UnitTestReport.Status;import io.onedev.server.plugin.report.unittest.UnitTestReport.TestCase;import io.onedev.server.plugin.report.unittest.UnitTestReport.TestSuite;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;+import io.onedev.server.search.code.CodeSearchManager;public class JUnitReportParser {diff --git a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.javaindex 40077e00a9..e6b02404c1 100644--- a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java+++ b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java@@ -9,8 +9,8 @@ import io.onedev.server.model.Project;import io.onedev.server.plugin.report.unittest.UnitTestReport;import io.onedev.server.plugin.report.unittest.UnitTestReport.Status;import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.search.code.insidecommit.CodeSearchManager;-import io.onedev.server.search.code.insidecommit.query.BlobQuery;+import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.lucene.search.IndexSearcher;import org.dom4j.DocumentException;