Skip to content

The Unified and Autonomous Development Platform

chore: refactor code query option

Robin Shend76ee0d4bc80
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index c4bdcfd7d8..f9a369c56a 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -82,10 +82,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.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.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.entitytext.*;
import io.onedev.server.security.*;
import io.onedev.server.security.realm.AbstractAuthorizingRealm;
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.java
index 59372a7d3f..e0a3d44f83 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.CodeIndexManager;
+import io.onedev.server.search.code.insidecommit.CodeIndexManager;
import io.onedev.server.security.CodePullAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessBuild;
@@ -101,7 +101,6 @@ import java.util.function.Consumer;
import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;
import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;
-import static java.util.stream.Collectors.toSet;
@Singleton
public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource,
diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/PathHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
deleted file mode 100644
index 51c0db36a7..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.onedev.server.search.code.hit;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.request.resource.PackageResourceReference;
-
-import io.onedev.commons.jsymbol.util.HighlightableLabel;
-import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
-import io.onedev.commons.utils.LinearRange;
-
-public class PathHit extends QueryHit {
-
- private static final long serialVersionUID = 1L;
-
- private final LinearRange match;
-
- public PathHit(String blobPath, @Nullable LinearRange match) {
- super(blobPath, null);
- this.match = match;
- }
-
- @Override
- public String toString() {
- return getBlobPath();
- }
-
- @Override
- public Component render(String componentId) {
- return new HighlightableLabel(componentId, getBlobPath(), match);
- }
-
- @Override
- public Image renderIcon(String componentId) {
- return new NoAntiCacheImage(componentId, new PackageResourceReference(PathHit.class, "file.png"));
- }
-
- @Override
- public String getNamespace() {
- return null;
- }
-
- public LinearRange getMatch() {
- return match;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.java
index 2392cf6c0b..9f4ae2e3c5 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeIndexManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.search.code;
+package io.onedev.server.search.code.insidecommit;
import javax.annotation.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.java
index a56835ca7c..a9c53594f3 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/CodeSearchManager.java
@@ -1,16 +1,16 @@
-package io.onedev.server.search.code;
+package io.onedev.server.search.code.insidecommit;
import java.util.List;
import javax.annotation.Nullable;
+import io.onedev.server.search.code.insidecommit.query.BlobQuery;
import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.jsymbol.Symbol;
import io.onedev.server.model.Project;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.search.code.query.BlobQuery;
import io.onedev.server.search.code.query.TooGeneralQueryException;
public interface CodeSearchManager {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.java
index 6e34a5868a..6fb64c05b3 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeIndexManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.search.code;
+package io.onedev.server.search.code.insidecommit;
import com.google.common.base.Preconditions;
import io.onedev.commons.jsymbol.Symbol;
@@ -18,6 +18,7 @@ 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;
@@ -55,7 +56,7 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
-import static io.onedev.server.search.code.FieldConstants.*;
+import static io.onedev.server.search.code.insidecommit.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/DefaultCodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.java
index 0816991a7d..9ef0eed345 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/DefaultCodeSearchManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.search.code;
+package io.onedev.server.search.code.insidecommit;
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.query.BlobQuery;
-import io.onedev.server.search.code.query.FileQuery;
+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.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.FieldConstants.*;
+import static io.onedev.server.search.code.insidecommit.FieldConstants.*;
@Singleton
public class DefaultCodeSearchManager implements CodeSearchManager, Serializable {
@@ -94,7 +94,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializable
} catch (ClosedByInterruptException e) {
// catch this exception and convert to normal InterruptedException as
// we do not want to throw the original exception to surprise the user
- // when they searches by typing fast (and subsequent typing will cancel
+ // when they search by typing fast (and subsequent typing will cancel
// search of previous typing by interrupting previous search thread
// which may creating the searcher manager if it does not exist yet
throw new InterruptedException();
@@ -331,7 +331,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializable
builder.count(MAX_BLOB_PATH_QUERY_COUNT);
String blobPath = null;
- FileQuery query = builder.fileNames(fileName).build();
+ BlobQuery query = builder.fileNames(fileName).build();
try {
for (QueryHit hit: search(projectId, commit, query)) {
if (partialBlobPath == null || hit.getBlobPath().contains(partialBlobPath)) {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.java
index a66a0fd98e..b7ef108f1f 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/FieldConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.search.code;
+package io.onedev.server.search.code.insidecommit;
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/query/BlobQuery.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.java
similarity index 70%
rename from server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.java
index 976795685c..01aa848b0b 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/BlobQuery.java
@@ -1,12 +1,7 @@
-package io.onedev.server.search.code.query;
-
-import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
+package io.onedev.server.search.code.insidecommit.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;
@@ -14,7 +9,11 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.server.search.code.hit.QueryHit;
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.List;
+
+import static io.onedev.server.search.code.insidecommit.FieldConstants.BLOB_PATH;
public abstract class BlobQuery implements Serializable {
@@ -46,7 +45,7 @@ public abstract class BlobQuery implements Serializable {
* @return
* lucene query
* @throws
- * TooGeneralQueryException if supplied query term is too general to possibly cause query slow
+ * TooGeneralQueryException if supplied query term is too general to possibly cause query slow
*/
public Query asLuceneQuery() throws TooGeneralQueryException {
BooleanQuery.Builder luceneQueryBuilder = new BooleanQuery.Builder();
@@ -64,5 +63,25 @@ public abstract class BlobQuery implements Serializable {
}
protected abstract void applyConstraints(BooleanQuery.Builder query);
+
+ public static abstract class Builder {
+
+ protected String directory;
+
+ protected int count;
+
+ public Builder directory(String directory) {
+ this.directory = directory;
+ return this;
+ }
+
+ public Builder count(int count) {
+ this.count = count;
+ return this;
+ }
+
+ public abstract BlobQuery build();
+
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.java
index b2328ec665..d3f4197131 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/FileQuery.java
@@ -1,11 +1,12 @@
-package io.onedev.server.search.code.query;
+package io.onedev.server.search.code.insidecommit.query;
-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.insidecommit.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;
@@ -73,11 +74,7 @@ public class FileQuery extends BlobQuery {
builder.add(new WildcardQuery(new Term(BLOB_NAME.name(), fileNames.toLowerCase())), Occur.MUST);
}
- public static class Builder {
-
- private int count;
-
- private String directory;
+ public static class Builder extends BlobQuery.Builder {
private String excludeFileName;
@@ -85,16 +82,6 @@ public class FileQuery extends BlobQuery {
private String fileNames;
- public Builder count(int count) {
- this.count = count;
- return this;
- }
-
- public Builder directory(String directory) {
- this.directory = directory;
- return this;
- }
-
public Builder excludeFileName(String excludeFileName) {
this.excludeFileName = excludeFileName;
return this;
@@ -110,7 +97,8 @@ public class FileQuery extends BlobQuery {
return this;
}
- public FileQuery build() {
+ @Override
+ public BlobQuery build() {
Preconditions.checkArgument(fileNames!=null, "File names should be specified");
Preconditions.checkArgument(count!=0, "Query count should be specified");
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.java
index 243821533d..050f56d83b 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/SymbolQuery.java
@@ -1,13 +1,15 @@
-package io.onedev.server.search.code.query;
-
-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
-import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
+package io.onedev.server.search.code.insidecommit.query;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import io.onedev.commons.jsymbol.Symbol;
+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.util.match.WildcardUtils;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
@@ -16,16 +18,10 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.commons.jsymbol.Symbol;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.OneDev;
-import io.onedev.server.search.code.CodeSearchManager;
-import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.search.code.hit.SymbolHit;
-import io.onedev.server.util.match.WildcardUtils;
+import javax.annotation.Nullable;
+import java.util.List;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
+import static io.onedev.server.search.code.insidecommit.FieldConstants.*;
public class SymbolQuery extends BlobQuery {
@@ -139,13 +135,9 @@ public class SymbolQuery extends BlobQuery {
}
}
- public static class Builder {
+ public static class Builder extends BlobQuery.Builder {
private String term;
-
- private int count;
-
- private String directory;
private String excludeTerm;
@@ -164,16 +156,6 @@ public class SymbolQuery extends BlobQuery {
return this;
}
- public Builder count(int count) {
- this.count = count;
- return this;
- }
-
- public Builder directory(String directory) {
- this.directory = directory;
- return this;
- }
-
public Builder excludeTerm(String excludeTerm) {
this.excludeTerm = excludeTerm;
return this;
@@ -204,7 +186,8 @@ public class SymbolQuery extends BlobQuery {
return this;
}
- public SymbolQuery build() {
+ @Override
+ public BlobQuery build() {
Preconditions.checkArgument(term!=null, "Query term should be specified");
Preconditions.checkArgument(count!=0, "Query count should be specified");
return new SymbolQuery(term, excludeTerm, excludeBlobPath, primary, local,
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
rename to server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.java
index 21589453a0..2714251ae4 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/insidecommit/query/TextQuery.java
@@ -1,16 +1,16 @@
-package io.onedev.server.search.code.query;
-
-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
-import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;
-import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
+package io.onedev.server.search.code.insidecommit.query;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import io.onedev.commons.utils.LinearRange;
+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;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -20,16 +20,15 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-import io.onedev.commons.utils.LinearRange;
-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.regex.RegexLiterals;
-import io.onedev.server.util.ContentDetector;
+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;
public class TextQuery extends BlobQuery {
@@ -193,11 +192,9 @@ public class TextQuery extends BlobQuery {
throw new TooGeneralQueryException();
}
- public static class Builder {
+ public static class Builder extends BlobQuery.Builder {
private String term;
-
- private int count;
private boolean regex;
@@ -205,8 +202,6 @@ public class TextQuery extends BlobQuery {
private boolean caseSensitive;
- private String directory;
-
private String fileNames;
public Builder term(String term) {
@@ -244,7 +239,8 @@ public class TextQuery extends BlobQuery {
return this;
}
- public TextQuery build() {
+ @Override
+ public BlobQuery build() {
Preconditions.checkArgument(term!=null, "Query term should be specified");
Preconditions.checkArgument(count!=0, "Query count should be specified");
return new TextQuery(term, regex, caseSensitive, wholeWord, directory, fileNames, count);
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.java
new file mode 100644
index 0000000000..0460a1be68
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
@@ -0,0 +1,45 @@
+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;
+
+public class FileQueryOption implements QueryOption {
+
+ private static final long serialVersionUID = 1L;
+
+ private String term;
+
+ private boolean caseSensitive;
+
+ public String getTerm() {
+ return term;
+ }
+
+ public void setTerm(String term) {
+ this.term = term;
+ }
+
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ public void setCaseSensitive(boolean caseSensitive) {
+ this.caseSensitive = caseSensitive;
+ }
+
+ @Override
+ public BlobQuery.Builder newInsideCommitQueryBuilder() {
+ return new FileQuery.Builder()
+ .fileNames(term.toLowerCase())
+ .caseSensitive(caseSensitive);
+ }
+
+ @Override
+ public FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {
+ return new FileQueryOptionPanel(componentId, Model.of(this));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/PathQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
deleted file mode 100644
index 8823f7f30f..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.onedev.server.search.code.query;
-
-import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.WildcardQuery;
-import org.eclipse.jgit.treewalk.TreeWalk;
-
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.search.code.hit.PathHit;
-import io.onedev.server.search.code.hit.QueryHit;
-
-public class PathQuery extends BlobQuery {
-
- private static final long serialVersionUID = 1L;
-
- private final String match;
-
- public PathQuery(@Nullable String directory, String match, int count) {
- super(directory, count);
- this.match = match;
- }
-
- @Override
- public void collect(IndexSearcher searcher, TreeWalk treeWalk, List<QueryHit> hits) {
- String blobPath = treeWalk.getPathString();
- LinearRange range = PathUtils.matchSegments(blobPath, match, true);
- if (range != null) {
- hits.add(new PathHit(blobPath, range));
- }
- }
-
- @Override
- protected void applyConstraints(BooleanQuery.Builder builder) {
- builder.add(new WildcardQuery(new Term(BLOB_PATH.name(), "*"+match+"*")), Occur.MUST);
- }
-
-}
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.java
new file mode 100644
index 0000000000..1c400c807c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java
@@ -0,0 +1,14 @@
+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;
+
+public interface QueryOption extends Serializable {
+
+ BlobQuery.Builder newInsideCommitQueryBuilder();
+
+ FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId);
+
+}
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.java
new file mode 100644
index 0000000000..86411c2873
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
@@ -0,0 +1,57 @@
+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;
+
+public class SymbolQueryOption implements QueryOption {
+
+ private static final long serialVersionUID = 1L;
+
+ private String term;
+
+ private String fileNames;
+
+ private boolean caseSensitive;
+
+ public String getTerm() {
+ return term;
+ }
+
+ public void setTerm(String term) {
+ this.term = term;
+ }
+
+ public String getFileNames() {
+ return fileNames;
+ }
+
+ public void setFileNames(String fileNames) {
+ this.fileNames = fileNames;
+ }
+
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ public void setCaseSensitive(boolean caseSensitive) {
+ this.caseSensitive = caseSensitive;
+ }
+
+ @Override
+ public BlobQuery.Builder newInsideCommitQueryBuilder() {
+ return new SymbolQuery.Builder()
+ .term(term)
+ .primary(true)
+ .caseSensitive(caseSensitive)
+ .fileNames(fileNames);
+ }
+
+ @Override
+ public FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {
+ return new SymbolQueryOptionPanel(componentId, Model.of(this));
+ }
+
+}
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.java
new file mode 100644
index 0000000000..1b72a999e6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
@@ -0,0 +1,78 @@
+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;
+
+public class TextQueryOption implements QueryOption {
+
+ private static final long serialVersionUID = 1L;
+
+ private String term;
+
+ private boolean regex;
+
+ private boolean caseSensitive;
+
+ private boolean wholeWord;
+
+ private String fileNames;
+
+ public String getTerm() {
+ return term;
+ }
+
+ public void setTerm(String term) {
+ this.term = term;
+ }
+
+ public boolean isRegex() {
+ return regex;
+ }
+
+ public void setRegex(boolean regex) {
+ this.regex = regex;
+ }
+
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ public void setCaseSensitive(boolean caseSensitive) {
+ this.caseSensitive = caseSensitive;
+ }
+
+ public boolean isWholeWord() {
+ return wholeWord;
+ }
+
+ public void setWholeWord(boolean wholeWord) {
+ this.wholeWord = wholeWord;
+ }
+
+ public String getFileNames() {
+ return fileNames;
+ }
+
+ public void setFileNames(String fileNames) {
+ this.fileNames = fileNames;
+ }
+
+ @Override
+ public BlobQuery.Builder newInsideCommitQueryBuilder() {
+ return new TextQuery.Builder()
+ .term(term)
+ .regex(regex)
+ .caseSensitive(caseSensitive)
+ .wholeWord(wholeWord)
+ .fileNames(fileNames);
+ }
+
+ @Override
+ public FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {
+ return new TextQueryOptionPanel(componentId, Model.of(this));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
index 500d492359..d9efd0b29b 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
@@ -5,38 +5,30 @@ import java.util.List;
import javax.annotation.Nullable;
-import io.onedev.server.search.code.query.regex.PCREParser.AlternationContext;
-import io.onedev.server.search.code.query.regex.PCREParser.AtomContext;
-import io.onedev.server.search.code.query.regex.PCREParser.Cc_atomContext;
-import io.onedev.server.search.code.query.regex.PCREParser.ElementContext;
-import io.onedev.server.search.code.query.regex.PCREParser.ExprContext;
-import io.onedev.server.search.code.query.regex.PCREParser.ParseContext;
-import io.onedev.server.search.code.query.regex.PCREParser.QuantifierContext;
-
public class LiteralVisitor extends PCREBaseVisitor<Literals> {
@Override
- public Literals visitParse(ParseContext ctx) {
+ public Literals visitParse(PCREParser.ParseContext ctx) {
return visitAlternation(ctx.alternation());
}
@Override
- public Literals visitAlternation(AlternationContext ctx) {
+ public Literals visitAlternation(PCREParser.AlternationContext ctx) {
List<Literals> elementLiterals = new ArrayList<>();
- for (ExprContext expr: ctx.expr())
+ for (PCREParser.ExprContext expr: ctx.expr())
elementLiterals.add(visitExpr(expr));
return new OrLiterals(elementLiterals);
}
@Override
- public Literals visitExpr(ExprContext ctx) {
+ public Literals visitExpr(PCREParser.ExprContext ctx) {
List<Literals> elementLiterals = new ArrayList<>();
- for (ElementContext element: ctx.element()) {
+ for (PCREParser.ElementContext element: ctx.element()) {
Literals atomLiterals = visitAtom(element.atom());
if (atomLiterals != null) {
- QuantifierContext quantifier = element.quantifier();
+ PCREParser.QuantifierContext quantifier = element.quantifier();
if (quantifier != null) {
if (quantifier.Plus() != null) {
elementLiterals.add(oneOrMore(atomLiterals));
@@ -85,7 +77,7 @@ public class LiteralVisitor extends PCREBaseVisitor<Literals> {
@Nullable
@Override
- public Literals visitAtom(AtomContext ctx) {
+ public Literals visitAtom(PCREParser.AtomContext ctx) {
if (ctx.literal() != null) {
return new LeafLiterals(ctx.literal().getText());
} else if (ctx.capture() != null) {
@@ -94,7 +86,7 @@ public class LiteralVisitor extends PCREBaseVisitor<Literals> {
return visitAlternation(ctx.non_capture().alternation());
} else if (ctx.character_class() != null && ctx.character_class().simple_character_class() != null) {
List<Literals> literals = new ArrayList<>();
- for (Cc_atomContext cc_atom: ctx.character_class().simple_character_class().cc_atom()) {
+ for (PCREParser.Cc_atomContext cc_atom: ctx.character_class().simple_character_class().cc_atom()) {
if (cc_atom.cc_atom_literal != null && cc_atom.cc_atom_literal.shared_literal() != null)
literals.add(new LeafLiterals(cc_atom.cc_atom_literal.shared_literal().getText()));
else
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.html
new file mode 100644
index 0000000000..fce7616690
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html
@@ -0,0 +1,11 @@
+<wicket:panel>
+ <div wicket:id="term" class="form-group">
+ <label>Search For <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>
+ </div>
+ <div class="form-group">
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
+ </div>
+</wicket:panel>
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.java
new file mode 100644
index 0000000000..9fa2db7cb3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java
@@ -0,0 +1,77 @@
+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.FileQueryOption;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+public class FileQueryOptionPanel extends FormComponentPanel<FileQueryOption> {
+
+ private TextField<String> term;
+
+ private CheckBox caseSensitive;
+
+ public FileQueryOptionPanel(String id, IModel<FileQueryOption> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var option = getModelObject();
+ WebMarkupContainer termContainer = new WebMarkupContainer("term");
+ add(termContainer);
+ term = new TextField<>("term", Model.of(option.getTerm()));
+ 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");
+ }
+ }
+ });
+
+ termContainer.add(term);
+ termContainer.add(new FencedFeedbackPanel("feedback", term));
+ termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (term.hasErrorMessage())
+ return " is-invalid";
+ else
+ return "";
+ }
+
+ }));
+
+ add(caseSensitive = new CheckBox("caseSensitive", Model.of(option.isCaseSensitive())));
+ }
+
+ @Override
+ public void convertInput() {
+ var option = new FileQueryOption();
+ option.setTerm(term.getConvertedInput());
+ option.setCaseSensitive(caseSensitive.getConvertedInput());
+ setConvertedInput(option);
+ }
+
+}
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.html
new file mode 100644
index 0000000000..6bd004bb80
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <div wicket:id="term" class="form-group">
+ <label>Search For <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>
+ </div>
+ <div class="form-group">
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
+ </div>
+ <div class="form-group">
+ <label>File name patterns (separated by comma)</label>
+ <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
+ </div>
+</wicket:panel>
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.java
new file mode 100644
index 0000000000..aea10f4427
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java
@@ -0,0 +1,79 @@
+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.SymbolQueryOption;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.validation.IValidationError;
+
+public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOption> {
+
+ private TextField<String> term;
+
+ private CheckBox caseSensitive;
+
+ private TextField<String> fileNames;
+
+ public SymbolQueryOptionPanel(String id, IModel<SymbolQueryOption> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var option = getModelObject();
+ WebMarkupContainer termContainer = new WebMarkupContainer("term");
+ add(termContainer);
+ term = new TextField<>("term", Model.of(option.getTerm()));
+ term.add(validatable -> {
+ if (StringUtils.isBlank(validatable.getValue())) {
+ validatable.error(messageSource -> "This field is required");
+ } else {
+ BlobQuery query = new SymbolQuery.Builder().term(validatable.getValue()).count(1).build();
+ try {
+ query.asLuceneQuery();
+ } catch (TooGeneralQueryException e) {
+ validatable.error((IValidationError) messageSource -> "Search is too general");
+ }
+ }
+ });
+ termContainer.add(term);
+ termContainer.add(new FencedFeedbackPanel("feedback", term));
+ termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (term.hasErrorMessage())
+ return " is-invalid";
+ else
+ return "";
+ }
+
+ }));
+
+ add(caseSensitive = new CheckBox("caseSensitive", Model.of(option.isCaseSensitive())));
+
+ add(fileNames = new TextField<String>("fileNames", Model.of(option.getFileNames())));
+ }
+
+ @Override
+ public void convertInput() {
+ var option = new SymbolQueryOption();
+ option.setTerm(term.getConvertedInput());
+ option.setCaseSensitive(caseSensitive.getConvertedInput());
+ option.setFileNames(fileNames.getConvertedInput());
+ setConvertedInput(option);
+ }
+
+}
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.html
new file mode 100644
index 0000000000..a5859bba0a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html
@@ -0,0 +1,18 @@
+<wicket:panel>
+ <div wicket:id="term" class="form-group">
+ <label>Search For <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>
+ <div class="form-group">
+ <div class="checkbox-inline">
+ <label class="checkbox"><input wicket:id="regex" type="checkbox"> Regular expression</label>
+ <label class="checkbox"><input wicket:id="wholeWord" type="checkbox"> Whole word</label>
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
+ </div>
+ </div>
+ <div class="form-group">
+ <label>File name patterns (separated by comma)</label>
+ <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
+ </div>
+</wicket:panel>
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.java
new file mode 100644
index 0000000000..3207549b4d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java
@@ -0,0 +1,97 @@
+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.TextQueryOption;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.validation.IValidationError;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {
+
+ private TextField<String> term;
+
+ private CheckBox regex;
+
+ private CheckBox wholeWord;
+
+ private CheckBox caseSensitive;
+
+ private TextField<String> fileNames;
+
+ public TextQueryOptionPanel(String id, IModel<TextQueryOption> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var option = getModelObject();
+ WebMarkupContainer termContainer = new WebMarkupContainer("term");
+ add(termContainer);
+ term = new TextField<>("term", Model.of(option.getTerm()));
+ 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");
+ }
+ }
+ });
+
+ termContainer.add(term);
+ termContainer.add(new FencedFeedbackPanel("feedback", term));
+ termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (term.hasErrorMessage())
+ return " is-invalid";
+ else
+ return "";
+ }
+
+ }));
+
+ add(regex = new CheckBox("regex", Model.of(option.isRegex())));
+ add(wholeWord = new CheckBox("wholeWord", Model.of(option.isWholeWord())));
+ add(caseSensitive = new CheckBox("caseSensitive", Model.of(option.isCaseSensitive())));
+ add(fileNames = new TextField<>("fileNames", Model.of(option.getFileNames())));
+ }
+
+ @Override
+ public void convertInput() {
+ var option = new TextQueryOption();
+ option.setTerm(term.getConvertedInput());
+ option.setRegex(regex.getConvertedInput());
+ option.setWholeWord(wholeWord.getConvertedInput());
+ option.setCaseSensitive(caseSensitive.getConvertedInput());
+ option.setFileNames(fileNames.getConvertedInput());
+ setConvertedInput(option);
+ }
+}
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.java
index b5f1f1755b..99c15fa1af 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,13 +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 org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
import io.onedev.server.model.Project;
-import io.onedev.server.search.code.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.CodeSearchManager;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.search.code.query.FileQuery;
+import io.onedev.server.search.code.insidecommit.query.FileQuery;
import io.onedev.server.search.code.query.TooGeneralQueryException;
public class RevisionAndPathParam extends ParamSegment {
@@ -36,7 +37,7 @@ public class RevisionAndPathParam extends ParamSegment {
FileQuery.Builder builder = new FileQuery.Builder();
builder.fileNames("*" + matchWith + "*");
builder.count(count);
- FileQuery query = builder.build();
+ BlobQuery query = builder.build();
try {
for (QueryHit hit: codeSearchManager.search(project, commitId, query)) {
String revisionAndPath = project.getDefaultBranch() + "/" + hit.getBlobPath();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
index cf62cffa3a..ec2d4a4ca0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
@@ -35,28 +35,23 @@ public abstract class CommentInput extends MarkdownEditor {
@Override
protected final UserMentionSupport getUserMentionSupport() {
- return new UserMentionSupport() {
-
- @Override
- public List<User> findUsers(String query, int count) {
- List<User> mentionables = getMentionables();
- UserCache cache = getUserManager().cloneCache();
-
- List<User> similarities = new Similarities<User>(mentionables) {
+ return (query, count) -> {
+ List<User> mentionables = getMentionables();
+ UserCache cache = getUserManager().cloneCache();
+
+ List<User> similarities = new Similarities<User>(mentionables) {
- @Override
- public double getSimilarScore(User object) {
- return cache.getSimilarScore(object, query);
- }
-
- };
+ @Override
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, query);
+ }
- if (similarities.size() > count)
- return similarities.subList(0, count);
- else
- return similarities;
- }
+ };
+ if (similarities.size() > count)
+ return similarities.subList(0, count);
+ else
+ return similarities;
};
}
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.java
index 08a3b23ca6..9759a30bda 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.CodeIndexManager;
+import io.onedev.server.search.code.insidecommit.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/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 2b8b167533..125417a875 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -274,13 +274,13 @@ public class MarkdownEditor extends FormComponentPanel<String> {
});
- edit.add(input = new TextArea<String>("input", Model.of(getModelObject())) {
+ edit.add(input = new TextArea<>("input", Model.of(getModelObject())) {
@Override
protected boolean shouldTrimInput() {
return MarkdownEditor.this.shouldTrimInput();
}
-
+
});
for (Behavior behavior: getInputBehaviors())
input.add(behavior);
@@ -629,15 +629,5 @@ public class MarkdownEditor extends FormComponentPanel<String> {
public BlobRenderContext getBlobRenderContext() {
return blobRenderContext;
}
-
- static class ReferencedEntity implements Serializable {
- String entityType;
-
- String entityTitle;
-
- String entityNumber;
-
- String searchKey;
- }
}
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.java
index 36bcf84cc5..b485eefb50 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.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.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.query.BlobQuery;
-import io.onedev.server.search.code.query.SymbolQuery;
-import io.onedev.server.search.code.query.TextQuery;
+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.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.java
index 64c42e86d0..2052332cf1 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
@@ -21,9 +21,9 @@ import io.onedev.server.web.page.admin.groupmanagement.authorization.GroupAuthor
import io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;
import io.onedev.server.web.page.admin.groupmanagement.membership.GroupMembershipsPage;
import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;
+import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
-import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
@@ -149,6 +149,7 @@ 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.html
new file mode 100644
index 0000000000..97e58ded9e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.html
@@ -0,0 +1,9 @@
+<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 file
diff --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.java
new file mode 100644
index 0000000000..5bcd57bee9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/codesearch/CodeSearchPage.java
@@ -0,0 +1,18 @@
+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.java
index 20c9278134..997cbb110e 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
@@ -1,17 +1,15 @@
package io.onedev.server.web.page.layout;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.core.request.handler.PageProvider;
-
import com.google.common.collect.Lists;
-
import io.onedev.server.web.page.builds.BuildListPage;
import io.onedev.server.web.page.issues.IssueListPage;
import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.pullrequests.PullRequestListPage;
+import org.apache.wicket.core.request.handler.PageProvider;
+
+import java.util.ArrayList;
+import java.util.List;
public class DefaultMainMenuCustomization implements MainMenuCustomization {
@@ -28,6 +26,7 @@ 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/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index f798f725c6..682e4db6fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -141,7 +141,7 @@ public abstract class LayoutPage extends BasePage {
});
- sidebar.add(new ListView<SidebarMenu>("menus", new LoadableDetachableModel<List<SidebarMenu>>() {
+ sidebar.add(new ListView<SidebarMenu>("menus", new LoadableDetachableModel<>() {
@Override
protected List<SidebarMenu> load() {
@@ -149,84 +149,84 @@ public abstract class LayoutPage extends BasePage {
List<SidebarMenuItem> menuItems = new ArrayList<>(customization.getMainMenuItems());
if (SecurityUtils.isAdministrator()) {
List<SidebarMenuItem> administrationMenuItems = new ArrayList<>();
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "System Settings",
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "System Settings",
SystemSettingPage.class, new PageParameters()));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Security Settings",
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Security Settings",
SecuritySettingPage.class, new PageParameters()));
List<SidebarMenuItem> userManagementMenuItems = new ArrayList<>();
- userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Users", UserListPage.class,
+ userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Users", UserListPage.class,
new PageParameters(), Lists.newArrayList(NewUserPage.class, UserPage.class)));
- userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Invitations", InvitationListPage.class,
+ userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Invitations", InvitationListPage.class,
new PageParameters(), Lists.newArrayList(NewInvitationPage.class)));
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "User Management", userManagementMenuItems));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Role Management", RoleListPage.class,
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Role Management", RoleListPage.class,
new PageParameters(), Lists.newArrayList(NewRolePage.class, RoleDetailPage.class)));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Group Management", GroupListPage.class,
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Group Management", GroupListPage.class,
new PageParameters(), Lists.newArrayList(NewGroupPage.class, GroupPage.class)));
-
+
List<SidebarMenuItem> authenticationMenuItems = new ArrayList<>();
- authenticationMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",
+ authenticationMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",
AuthenticatorPage.class, new PageParameters()));
- authenticationMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",
+ authenticationMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",
SsoConnectorListPage.class, new PageParameters()));
-
+
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Authentication Source", authenticationMenuItems));
-
+
List<SidebarMenuItem> keyManagementMenuItems = new ArrayList<>();
- keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "SSH Server Key",
+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "SSH Server Key",
SshServerKeyPage.class, new PageParameters()));
- keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Signing Key",
+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Signing Key",
GpgSigningKeyPage.class, new PageParameters()));
- keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Trusted Keys",
+ keyManagementMenuItems.add(new SidebarMenuItem.Page(null, "GPG Trusted Keys",
GpgTrustedKeysPage.class, new PageParameters()));
-
+
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "SSH & GPG Keys", keyManagementMenuItems));
-
+
List<SidebarMenuItem> issueSettingMenuItems = new ArrayList<>();
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Custom Fields",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Custom Fields",
IssueFieldListPage.class, new PageParameters()));
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "States",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "States",
IssueStateListPage.class, new PageParameters()));
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "State Transitions",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "State Transitions",
StateTransitionListPage.class, new PageParameters()));
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Boards",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Boards",
DefaultBoardListPage.class, new PageParameters()));
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Links",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Links",
LinkSpecListPage.class, new PageParameters()));
- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
IssueTemplateListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Commit Message Fix Patterns",
CommitMessageFixPatternsPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Settings", issueSettingMenuItems));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
JobExecutorsPage.class, new PageParameters()));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Agents",
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Agents",
AgentListPage.class, AgentListPage.paramsOf(0), Lists.newArrayList(AgentDetailPage.class)));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Settings",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Settings",
MailSettingPage.class, new PageParameters()));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Settings",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Settings",
ServiceDeskSettingPage.class, new PageParameters()));
-
+
List<SidebarMenuItem> notificationTemplateSettingMenuItems = new ArrayList<>();
- notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue",
+ notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue",
IssueNotificationTemplatePage.class, new PageParameters()));
- notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request",
+ notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request",
PullRequestNotificationTemplatePage.class, new PageParameters()));
-
- administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
notificationTemplateSettingMenuItems));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Label Management",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Label Management",
LabelManagementPage.class, new PageParameters()));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Performance Settings",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Performance Settings",
PerformanceSettingPage.class, new PageParameters()));
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
GroovyScriptListPage.class, new PageParameters()));
if (OneDev.getInstance(ClusterManager.class).isClusteringSupported()) {
@@ -235,14 +235,14 @@ public abstract class LayoutPage extends BasePage {
}
List<Class<? extends ContributedAdministrationSetting>> contributedSettingClasses = new ArrayList<>();
- for (AdministrationSettingContribution contribution:OneDev.getExtensions(AdministrationSettingContribution.class)) {
- for (Class<? extends ContributedAdministrationSetting> settingClass: contribution.getSettingClasses())
+ for (AdministrationSettingContribution contribution : OneDev.getExtensions(AdministrationSettingContribution.class)) {
+ for (Class<? extends ContributedAdministrationSetting> settingClass : contribution.getSettingClasses())
contributedSettingClasses.add(settingClass);
}
contributedSettingClasses.sort(Comparator.comparingInt(EditableUtils::getOrder));
Map<String, List<SidebarMenuItem>> contributedMenuItems = new HashMap<>();
- for (var contributedSettingClass: contributedSettingClasses) {
+ for (var contributedSettingClass : contributedSettingClasses) {
var group = EditableUtils.getGroup(contributedSettingClass);
if (group == null)
group = "";
@@ -257,25 +257,25 @@ public abstract class LayoutPage extends BasePage {
ContributedAdministrationSettingPage.class,
ContributedAdministrationSettingPage.paramsOf(contributedSettingClass)));
}
- for (var entry: contributedMenuItems.entrySet()) {
+ for (var entry : contributedMenuItems.entrySet()) {
if (entry.getKey().length() == 0) {
administrationMenuItems.addAll(entry.getValue());
} else {
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, entry.getKey(), entry.getValue()));
}
}
-
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Branding",
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Branding",
BrandingSettingPage.class, new PageParameters()));
-
+
List<SidebarMenuItem> maintenanceMenuItems = new ArrayList<>();
- maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Database Backup",
+ maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Database Backup",
DatabaseBackupPage.class, new PageParameters()));
var servers = OneDev.getInstance(ClusterManager.class).getServerAddresses();
if (servers.size() > 1) {
List<SidebarMenuItem> serverLogMenuItems = new ArrayList<>();
List<SidebarMenuItem> serverInformationMenuItems = new ArrayList<>();
- for (var server: servers) {
+ for (var server : servers) {
serverLogMenuItems.add(new SidebarMenuItem.Page(null, server,
ServerLogPage.class, ServerLogPage.paramsOf(server)));
serverInformationMenuItems.add(new SidebarMenuItem.Page(null, server,
@@ -289,16 +289,16 @@ public abstract class LayoutPage extends BasePage {
maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Server Information",
ServerInformationPage.class, new PageParameters()));
}
-
+
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "System Maintenance", maintenanceMenuItems));
-
+
menuItems.add(new SidebarMenuItem.SubMenu("gear", "Administration", administrationMenuItems));
- }
+ }
menus.add(new SidebarMenu(null, menuItems));
menus.addAll(getSidebarMenus());
return menus;
}
-
+
}) {
@Override
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.java
index 7cf02265d4..3989c29880 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
@@ -25,11 +25,11 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.code.CodeIndexManager;
-import io.onedev.server.search.code.CodeSearchManager;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.search.code.query.BlobQuery;
-import io.onedev.server.search.code.query.TextQuery;
+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.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.java
index 39aec49596..cc761dd0b8 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.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.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.html
index d96c2b81cd..6676a51bfe 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
@@ -6,68 +6,16 @@
</div>
<div class="modal-body">
<ul wicket:id="tabs" class="nav nav-tabs nav-tabs-line nav-bold"></ul>
- <div wicket:id="searchOptions"></div>
+ <div wicket:id="option"></div>
+ <wicket:enclosure child="insideCurrentDir">
+ <div class="form-group">
+ <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
+ </div>
+ </wicket:enclosure>
</div>
<div class="modal-footer">
<button wicket:id="search" class="btn btn-primary">Search</button>
<button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
</div>
</form>
- <wicket:fragment wicket:id="symbolSearchFrag">
- <div wicket:id="term" class="form-group">
- <label>Search For <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>
- </div>
- <div class="form-group">
- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
- </div>
- <div class="form-group">
- <label>File name patterns (separated by comma)</label>
- <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
- </div>
- <wicket:enclosure child="insideCurrentDir">
- <div class="form-group">
- <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
- </div>
- </wicket:enclosure>
- </wicket:fragment>
- <wicket:fragment wicket:id="fileSearchFrag">
- <div wicket:id="term" class="form-group">
- <label>Search For <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>
- </div>
- <div class="checkbox-inline">
- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
- <wicket:enclosure child="insideCurrentDir">
- <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
- </wicket:enclosure>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="textSearchFrag">
- <div wicket:id="term" class="form-group">
- <label>Search For <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>
- <div class="form-group">
- <div class="checkbox-inline">
- <label class="checkbox"><input wicket:id="regex" type="checkbox"> Regular expression</label>
- <label class="checkbox"><input wicket:id="wholeWord" type="checkbox"> Whole word</label>
- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
- </div>
- </div>
- <div class="form-group">
- <label>File name patterns (separated by comma)</label>
- <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
- </div>
- <wicket:enclosure child="insideCurrentDir">
- <div class="form-group">
- <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
- </div>
- </wicket:enclosure>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
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.java
index 3730ec195b..05c59ea0d3 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
@@ -1,83 +1,75 @@
package io.onedev.server.web.page.project.blob.search.advanced;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import javax.annotation.Nullable;
-
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
+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.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.query.FileQueryOption;
+import io.onedev.server.search.code.query.QueryOption;
+import io.onedev.server.search.code.query.SymbolQueryOption;
+import io.onedev.server.search.code.query.TextQueryOption;
+import io.onedev.server.web.WebSession;
+import io.onedev.server.web.behavior.RunTaskBehavior;
+import io.onedev.server.web.component.tabbable.AjaxActionTab;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.INullAcceptingValidator;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.StringUtils;
-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.CodeSearchManager;
-import io.onedev.server.search.code.hit.QueryHit;
-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.TextQuery;
-import io.onedev.server.search.code.query.TooGeneralQueryException;
-import io.onedev.server.web.WebSession;
-import io.onedev.server.web.behavior.RunTaskBehavior;
-import io.onedev.server.web.component.tabbable.AjaxActionTab;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@SuppressWarnings("serial")
public abstract class AdvancedSearchPanel extends Panel {
- private static final MetaDataKey<Class<? extends SearchOption>> ACTIVE_TAB =
- new MetaDataKey<Class<? extends SearchOption>>(){};
+ private static final MetaDataKey<Class<? extends QueryOption>> ACTIVE_TAB =
+ new MetaDataKey<>() {};
- private static final MetaDataKey<HashMap<Class<?>, SearchOption>> SEARCH_OPTIONS =
- new MetaDataKey<HashMap<Class<?>, SearchOption>>(){};
+ private static final MetaDataKey<HashMap<Class<?>, QueryOption>> QUERY_OPTIONS =
+ new MetaDataKey<>() {};
+
+ private static final MetaDataKey<Boolean> INSIDE_CURRENT_DIR =
+ new MetaDataKey<>() {};
private final IModel<Project> projectModel;
private final IModel<String> revisionModel;
private Form<?> form;
+
+ private FormComponentPanel<? extends QueryOption> optionEditor;
+
+ private QueryOption option = new TextQueryOption();
- private SearchOption option = new TextSearchOption();
+ private boolean insideCurrentDir;
public AdvancedSearchPanel(String id, IModel<Project> projectModel, IModel<String> revisionModel) {
super(id);
this.projectModel = projectModel;
this.revisionModel = revisionModel;
-
- Class<? extends SearchOption> activeTab = WebSession.get().getMetaData(ACTIVE_TAB);
+
+ Class<? extends QueryOption> activeTab = WebSession.get().getMetaData(ACTIVE_TAB);
if (activeTab != null) {
try {
option = activeTab.getDeclaredConstructor().newInstance();
@@ -85,6 +77,14 @@ public abstract class AdvancedSearchPanel extends Panel {
throw ExceptionUtils.unchecked(e);
}
}
+
+ Map<Class<?>, QueryOption> savedOptions = getSavedOptions();
+ if (savedOptions.containsKey(option.getClass()))
+ option = savedOptions.get(option.getClass());
+
+ Boolean insideCurrentDir = WebSession.get().getMetaData(INSIDE_CURRENT_DIR);
+ if (insideCurrentDir != null)
+ this.insideCurrentDir = insideCurrentDir;
}
@Override
@@ -109,35 +109,60 @@ public abstract class AdvancedSearchPanel extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- option = new TextSearchOption();
+ option = new TextQueryOption();
onSelectTab(target);
}
- }.setSelected(option instanceof TextSearchOption));
+ }.setSelected(option instanceof TextQueryOption));
tabs.add(new AjaxActionTab(Model.of("File names")) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- option = new FileSearchOption();
+ option = new FileQueryOption();
onSelectTab(target);
}
- }.setSelected(option instanceof FileSearchOption));
+ }.setSelected(option instanceof FileQueryOption));
tabs.add(new AjaxActionTab(Model.of("Symbol names")) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- option = new SymbolSearchOption();
+ option = new SymbolQueryOption();
onSelectTab(target);
}
- }.setSelected(option instanceof SymbolSearchOption));
+ }.setSelected(option instanceof SymbolQueryOption));
form.add(new Tabbable("tabs", tabs));
+ form.add(optionEditor = option.newOptionEditor("option"));
+ optionEditor.setOutputMarkupId(true);
+ form.add(new CheckBox("insideCurrentDir", new IModel<>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Boolean getObject() {
+ return insideCurrentDir;
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ insideCurrentDir = object;
+ }
+
+ }) {
- form.add(newSearchOptionEditor(option));
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getCurrentBlob() != null && getCurrentBlob().path != null);
+ }
+
+ });
form.add(new AjaxButton("search") {
@@ -152,9 +177,36 @@ public abstract class AdvancedSearchPanel extends Panel {
@Override
protected void runTask(AjaxRequestTarget target) {
List<QueryHit> hits;
- if (revisionModel.getObject() != null) {
+ var project = projectModel.getObject();
+ var revision = revisionModel.getObject();
+ var count = getMaxQueryEntries();
+ if (revision != null) {
try {
- hits = option.query(AdvancedSearchPanel.this);
+ var searchManager = OneDev.getInstance(CodeSearchManager.class);
+ if (option instanceof SymbolQueryOption) {
+ SymbolQuery.Builder builder = (SymbolQuery.Builder) option.newInsideCommitQueryBuilder();
+ var query = builder.primary(true)
+ .directory(getDirectory(insideCurrentDir))
+ .count(count)
+ .build();
+ ObjectId commit = project.getRevCommit(revision, true);
+ hits = searchManager.search(project, commit, query);
+
+ if (hits.size() < count) {
+ query = builder.primary(false)
+ .directory(getDirectory(insideCurrentDir))
+ .count(count)
+ .build();
+ hits.addAll(searchManager.search(project, commit, query));
+ }
+ } else {
+ var query = option.newInsideCommitQueryBuilder()
+ .directory(getDirectory(insideCurrentDir))
+ .count(count)
+ .build();
+ ObjectId commit = project.getRevCommit(revision, true);
+ hits = searchManager.search(project, commit, query);
+ }
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -162,9 +214,9 @@ public abstract class AdvancedSearchPanel extends Panel {
hits = new ArrayList<>();
}
- HashMap<Class<?>, SearchOption> savedOptions = getSavedOptions();
+ HashMap<Class<?>, QueryOption> savedOptions = getSavedOptions();
savedOptions.put(option.getClass(), option);
- WebSession.get().setMetaData(SEARCH_OPTIONS, savedOptions);
+ WebSession.get().setMetaData(QUERY_OPTIONS, savedOptions);
onSearchComplete(target, hits);
}
@@ -181,7 +233,7 @@ public abstract class AdvancedSearchPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
-
+ option = optionEditor.getModelObject();
runTaskBehavior.requestRun(target);
}
@@ -199,282 +251,19 @@ public abstract class AdvancedSearchPanel extends Panel {
private void onSelectTab(AjaxRequestTarget target) {
WebSession.get().setMetaData(ACTIVE_TAB, option.getClass());
- SearchOptionEditor editor = newSearchOptionEditor(option);
- form.replace(editor);
- target.add(editor);
+ optionEditor = option.newOptionEditor("option");
+ optionEditor.setOutputMarkupId(true);
+ form.replace(optionEditor);
+ target.add(optionEditor);
}
- private SearchOptionEditor newSearchOptionEditor(SearchOption option) {
- if (option instanceof SymbolSearchOption)
- return newSymbolSearchOptionEditor();
- else if (option instanceof FileSearchOption)
- return newFileSearchOptionEditor();
- else
- return newTextSearchOptionEditor();
- }
-
- private HashMap<Class<?>, SearchOption> getSavedOptions() {
- HashMap<Class<?>, SearchOption> savedOptions = WebSession.get().getMetaData(SEARCH_OPTIONS);
+ private HashMap<Class<?>, QueryOption> getSavedOptions() {
+ HashMap<Class<?>, QueryOption> savedOptions = WebSession.get().getMetaData(QUERY_OPTIONS);
if (savedOptions == null)
savedOptions = new HashMap<>();
return savedOptions;
}
- private SearchOptionEditor newSymbolSearchOptionEditor() {
- return new SearchOptionEditor("symbolSearchFrag") {
-
- private TextField<String> termInput;
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer termContainer = new WebMarkupContainer("term");
- add(termContainer);
- termInput = new TextField<String>("term", new PropertyModel<String>(option, "term"));
- termInput.add(new INullAcceptingValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- if (StringUtils.isBlank(validatable.getValue())) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "This field is required";
- }
-
- });
- } else {
- SymbolQuery query = new SymbolQuery.Builder().term(validatable.getValue()).count(1).build();
- try {
- query.asLuceneQuery();
- } catch (TooGeneralQueryException e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "Search is too general";
- }
-
- });
- }
- }
- }
-
- });
- termContainer.add(termInput);
- termContainer.add(new FencedFeedbackPanel("feedback", termInput));
- termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (termInput.hasErrorMessage())
- return " is-invalid";
- else
- return "";
- }
-
- }));
-
- add(new CheckBox("caseSensitive", new PropertyModel<Boolean>(option, "caseSensitive")));
-
- add(new TextField<String>("fileNames", new PropertyModel<String>(option, "fileNames")));
-
- add(new CheckBox("insideCurrentDir", new PropertyModel<Boolean>(option, "insideCurrentDir")) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(getCurrentBlob().path != null);
- }
-
- });
-
- }
-
- };
- }
-
- private SearchOptionEditor newFileSearchOptionEditor() {
- return new SearchOptionEditor("fileSearchFrag") {
-
- private TextField<String> termInput;
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer termContainer = new WebMarkupContainer("term");
- add(termContainer);
- termInput = new TextField<String>("term", new PropertyModel<String>(option, "term"));
- termInput.add(new INullAcceptingValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- if (StringUtils.isBlank(validatable.getValue())) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "This field is required";
- }
-
- });
- } else {
- FileQuery query = new FileQuery.Builder()
- .fileNames(validatable.getValue())
- .count(1)
- .build();
- try {
- query.asLuceneQuery();
- } catch (TooGeneralQueryException e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "Search is too general";
- }
-
- });
- }
- }
- }
-
- });
-
- termContainer.add(termInput);
- termContainer.add(new FencedFeedbackPanel("feedback", termInput));
- termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (termInput.hasErrorMessage())
- return " is-invalid";
- else
- return "";
- }
-
- }));
-
- add(new CheckBox("caseSensitive", new PropertyModel<Boolean>(option, "caseSensitive")));
-
- add(new CheckBox("insideCurrentDir", new PropertyModel<Boolean>(option, "insideCurrentDir")) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(getCurrentBlob().path != null);
- }
-
- });
-
- }
-
- };
- }
-
- private SearchOptionEditor newTextSearchOptionEditor() {
- return new SearchOptionEditor("textSearchFrag") {
-
- private TextField<String> termInput;
-
- private CheckBox regexCheck;
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer termContainer = new WebMarkupContainer("term");
- add(termContainer);
- termInput = new TextField<String>("term", new PropertyModel<String>(option, "term"));
- termInput.add(new INullAcceptingValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- if (StringUtils.isBlank(validatable.getValue())) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "This field is required";
- }
-
- });
- } else {
- boolean regex = regexCheck.getInput()!=null?true:false;
- TextQuery 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(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "Invalid PCRE syntax";
- }
-
- });
- } catch (TooGeneralQueryException e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- return "Search is too general";
- }
-
- });
- }
- }
- }
-
- });
-
- termContainer.add(termInput);
- termContainer.add(new FencedFeedbackPanel("feedback", termInput));
- termContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (termInput.hasErrorMessage())
- return " is-invalid";
- else
- return "";
- }
-
- }));
-
- add(regexCheck = new CheckBox("regex", new PropertyModel<Boolean>(option, "regex")));
-
- add(new CheckBox("wholeWord", new PropertyModel<Boolean>(option, "wholeWord")));
-
- add(new CheckBox("caseSensitive", new PropertyModel<Boolean>(option, "caseSensitive")));
-
- add(new TextField<String>("fileNames", new PropertyModel<String>(option, "fileNames")));
-
- add(new CheckBox("insideCurrentDir", new PropertyModel<Boolean>(option, "insideCurrentDir")) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(getCurrentBlob().path != null);
- }
-
- });
-
- }
-
- };
- }
-
@Override
protected void onDetach() {
projectModel.detach();
@@ -496,24 +285,6 @@ public abstract class AdvancedSearchPanel extends Panel {
@Nullable
protected abstract BlobIdent getCurrentBlob();
- private class SearchOptionEditor extends Fragment {
-
- public SearchOptionEditor(String markupId) {
- super("searchOptions", markupId, AdvancedSearchPanel.this);
-
- Map<Class<?>, SearchOption> savedOptions = getSavedOptions();
- if (savedOptions.containsKey(option.getClass()))
- option = savedOptions.get(option.getClass());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- setOutputMarkupId(true);
- }
-
- }
-
private static int getMaxQueryEntries() {
return OneDev.getInstance(SettingManager.class).getPerformanceSetting().getMaxCodeSearchEntries();
}
@@ -527,106 +298,5 @@ public abstract class AdvancedSearchPanel extends Panel {
else
return StringUtils.substringBeforeLast(blobIdent.path, "/");
}
-
- static interface SearchOption extends Serializable {
- List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException;
- }
-
- static class SymbolSearchOption implements SearchOption {
- private String term;
-
- private String fileNames;
-
- private boolean caseSensitive;
-
- private boolean insideCurrentDir;
-
- @Override
- public List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {
- int maxQueryEntries = getMaxQueryEntries();
-
- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);
- List<QueryHit> hits;
- BlobQuery query = new SymbolQuery.Builder()
- .term(term)
- .primary(true)
- .caseSensitive(caseSensitive)
- .directory(context.getDirectory(insideCurrentDir))
- .fileNames(fileNames)
- .count(maxQueryEntries)
- .build();
- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);
- hits = searchManager.search(context.projectModel.getObject(), commit, query);
-
- if (hits.size() < maxQueryEntries) {
- query = new SymbolQuery.Builder()
- .term(term)
- .primary(false)
- .caseSensitive(caseSensitive)
- .directory(context.getDirectory(insideCurrentDir))
- .fileNames(fileNames)
- .count(maxQueryEntries - hits.size())
- .build();
- hits.addAll(searchManager.search(context.projectModel.getObject(), commit, query));
- }
-
- return hits;
- }
-
- }
-
- static class FileSearchOption implements SearchOption {
-
- private String term;
-
- private boolean caseSensitive;
-
- private boolean insideCurrentDir;
-
- @Override
- public List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {
- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);
- BlobQuery query = new FileQuery.Builder()
- .fileNames(term.toLowerCase())
- .caseSensitive(caseSensitive)
- .directory(context.getDirectory(insideCurrentDir))
- .count(getMaxQueryEntries())
- .build();
- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);
- return searchManager.search(context.projectModel.getObject(), commit, query);
- }
-
- }
-
- static class TextSearchOption implements SearchOption {
- private String term;
-
- private boolean regex;
-
- private boolean caseSensitive;
-
- private boolean wholeWord;
-
- private String fileNames;
-
- private boolean insideCurrentDir;
-
- @Override
- public List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {
- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);
- BlobQuery query = new TextQuery.Builder()
- .term(term)
- .regex(regex)
- .caseSensitive(caseSensitive)
- .wholeWord(wholeWord)
- .directory(context.getDirectory(insideCurrentDir))
- .fileNames(fileNames)
- .count(getMaxQueryEntries())
- .build();
- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);
- return searchManager.search(context.projectModel.getObject(), commit, query);
- }
-
- }
}
\ No newline at end of file
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.java
index 4f0c4b751f..0fc0cc59e2 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.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.CodeSearchManager;
import io.onedev.server.search.code.hit.QueryHit;
-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.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.TooGeneralQueryException;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
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.java
index 75701a842a..2b107e427d 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.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.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.java
index 9ba4537c87..ffc8c06cfe 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.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.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.java
index e7eebdd6bc..40077e00a9 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
@@ -1,21 +1,6 @@
package io.onedev.server.plugin.report.junit;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.lucene.search.IndexSearcher;
-import org.dom4j.DocumentException;
-import org.dom4j.io.SAXReader;
-import org.eclipse.jgit.lib.ObjectId;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.internal.util.collections.Sets;
-
import com.google.common.io.Resources;
-
import io.onedev.commons.jsymbol.Symbol;
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.loader.AppLoaderMocker;
@@ -23,10 +8,23 @@ import io.onedev.server.model.Build;
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.CodeSearchManager;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.insidecommit.CodeSearchManager;
+import io.onedev.server.search.code.insidecommit.query.BlobQuery;
import io.onedev.server.search.code.query.TooGeneralQueryException;
+import org.apache.lucene.search.IndexSearcher;
+import org.dom4j.DocumentException;
+import org.dom4j.io.SAXReader;
+import org.eclipse.jgit.lib.ObjectId;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.internal.util.collections.Sets;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
public class JUnitReportParserTest extends AppLoaderMocker {