The Unified and Autonomous Development Platform
Builder pattern for queries and search against local symbols
robin shine0d12622637dd
diff --git a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex 10a4b096b0..34c746e4fb 100644--- a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -269,18 +269,16 @@ public class DefaultIndexManager implements IndexManager {try {List<Symbol> symbols = extractor.extract(content);for (Symbol symbol: symbols) {- if (!symbol.isEffectivelyLocal()) {- String fieldValue = symbol.getName();- if (fieldValue != null) {- fieldValue = fieldValue.toLowerCase();+ String fieldValue = symbol.getName();+ if (fieldValue != null) {+ fieldValue = fieldValue.toLowerCase();- String fieldName;- if (symbol.isPrimary())- fieldName = BLOB_PRIMARY_SYMBOLS.name();- else- fieldName = BLOB_SECONDARY_SYMBOLS.name();- document.add(new StringField(fieldName, fieldValue, Store.NO));- }+ String fieldName;+ if (symbol.isPrimary())+ fieldName = BLOB_PRIMARY_SYMBOLS.name();+ else+ fieldName = BLOB_SECONDARY_SYMBOLS.name();+ document.add(new StringField(fieldName, fieldValue, Store.NO));}}byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);diff --git a/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.javaindex e7af249f1b..b3a5df4285 100644--- a/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java@@ -14,9 +14,10 @@ import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.commons.util.match.WildcardUtils;+import com.gitplex.jsymbol.Range;import com.gitplex.server.search.hit.FileHit;import com.gitplex.server.search.hit.QueryHit;-import com.gitplex.jsymbol.Range;+import com.google.common.base.Preconditions;import com.google.common.base.Splitter;public class FileQuery extends BlobQuery {@@ -27,7 +28,7 @@ public class FileQuery extends BlobQuery {private final boolean caseSensitive;- public FileQuery(String fileNames, @Nullable String excludeFileName, boolean caseSensitive,+ private FileQuery(String fileNames, @Nullable String excludeFileName, boolean caseSensitive,@Nullable String directory, int count) {super(directory, count);@@ -83,4 +84,51 @@ public class FileQuery extends BlobQuery {throw new TooGeneralQueryException();}+ public static class Builder {++ private int count;++ private String directory;++ private String excludeFileName;++ private boolean caseSensitive;++ 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;+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public FileQuery build() {+ Preconditions.checkArgument(fileNames!=null, "File names should be specified");+ Preconditions.checkArgument(count!=0, "Query count should be specified");++ return new FileQuery(fileNames, excludeFileName, caseSensitive,+ directory, count);+ }++ }+}diff --git a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.javaindex 2187efdc5e..d5546b5b2f 100644--- a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java@@ -23,6 +23,7 @@ import com.gitplex.server.core.GitPlex;import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.SymbolHit;+import com.google.common.base.Preconditions;import com.google.common.base.Splitter;public class SymbolQuery extends BlobQuery {@@ -33,7 +34,9 @@ public class SymbolQuery extends BlobQuery {private final String excludeBlobPath;- private final boolean primary;+ private final Boolean primary;++ private final Boolean local;private final boolean caseSensitive;@@ -41,15 +44,16 @@ public class SymbolQuery extends BlobQuery {private final SourceContext sourceContext;- public SymbolQuery(String term, @Nullable String excludeTerm, @Nullable String excludeBlobPath,- boolean primary, boolean caseSensitive, @Nullable String directory, @Nullable String fileNames,- @Nullable SourceContext sourceContext, int count) {+ private SymbolQuery(String term, @Nullable String excludeTerm, @Nullable String excludeBlobPath,+ @Nullable Boolean primary, @Nullable Boolean local, boolean caseSensitive, @Nullable String directory,+ @Nullable String fileNames, @Nullable SourceContext sourceContext, int count) {super(directory, count);this.term = term;this.excludeTerm = excludeTerm;this.excludeBlobPath = excludeBlobPath;this.primary = primary;+ this.local = local;this.caseSensitive = caseSensitive;this.fileNames = fileNames;this.sourceContext = sourceContext;@@ -64,7 +68,9 @@ public class SymbolQuery extends BlobQuery {if (symbols != null) {for (Symbol symbol: symbols) {if (hits.size() < getCount()) {- if (primary == symbol.isPrimary() && symbol.getName() != null && !symbol.isEffectivelyLocal()) {+ if ((primary==null || primary.booleanValue() == symbol.isPrimary())+ && symbol.getName() != null+ && (local == null || local.booleanValue() == symbol.isEffectivelyLocal())) {String normalizedTerm;if (!caseSensitive)normalizedTerm = term.toLowerCase();@@ -130,4 +136,84 @@ public class SymbolQuery extends BlobQuery {query.add(new WildcardQuery(new Term(fieldName, term.toLowerCase())), Occur.MUST);}+ public static class Builder {++ private String term;++ private int count;++ private String directory;++ private String excludeTerm;++ private String excludeBlobPath;++ private Boolean primary;++ private Boolean local;++ private boolean caseSensitive;++ private String fileNames;++ private SourceContext sourceContext;++ public Builder term(String term) {+ this.term = term;+ 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;+ }++ public Builder excludeBlobPath(String excludeBlobPath) {+ this.excludeBlobPath = excludeBlobPath;+ return this;+ }++ public Builder primary(Boolean primary) {+ this.primary = primary;+ return this;+ }++ public Builder local(Boolean local) {+ this.local = local;+ return this;+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public Builder sourceContext(SourceContext sourceContext) {+ this.sourceContext = sourceContext;+ return this;+ }++ public SymbolQuery 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,+ caseSensitive, directory, fileNames, sourceContext, count);+ }++ }}diff --git a/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.javaindex c01e12de99..3b724f6e57 100644--- a/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java+++ b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java@@ -21,12 +21,13 @@ import org.eclipse.jgit.lib.ObjectLoader;import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.commons.util.ContentDetector;+import com.gitplex.jsymbol.Range;+import com.gitplex.jsymbol.TokenPosition;import com.gitplex.server.search.IndexConstants;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.TextHit;import com.gitplex.server.search.query.regex.RegexLiterals;-import com.gitplex.jsymbol.Range;-import com.gitplex.jsymbol.TokenPosition;+import com.google.common.base.Preconditions;import com.google.common.base.Splitter;public class TextQuery extends BlobQuery {@@ -45,14 +46,14 @@ public class TextQuery extends BlobQuery {private transient Pattern pattern;- public TextQuery(String term, boolean regex, boolean caseSensitive, boolean wordMatch,+ private TextQuery(String term, boolean regex, boolean caseSensitive, boolean wholeWord,@Nullable String directory, @Nullable String fileNames, int count) {super(directory, count);this.term = term;this.regex = regex;this.caseSensitive = caseSensitive;- this.wholeWord = wordMatch;+ this.wholeWord = wholeWord;this.fileNames = fileNames;}@@ -188,4 +189,63 @@ public class TextQuery extends BlobQuery {throw new TooGeneralQueryException();}+ public static class Builder {++ private String term;++ private int count;++ private boolean regex;++ private boolean wholeWord;++ private boolean caseSensitive;++ private String directory;++ private String fileNames;++ public Builder term(String term) {+ this.term = term;+ return this;+ }++ public Builder count(int count) {+ this.count = count;+ return this;+ }++ public Builder regex(boolean regex) {+ this.regex = regex;+ return this;+ }++ public Builder wholeWord(boolean wholeWord) {+ this.wholeWord = wholeWord;+ return this;+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder directory(String directory) {+ this.directory = directory;+ return this;+ }++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public TextQuery 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.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javaindex 628dc3bcee..551f9382e3 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java@@ -37,6 +37,12 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.util.StringUtils;+import com.gitplex.commons.wicket.behavior.RunTaskBehavior;+import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;+import com.gitplex.commons.wicket.component.tabbable.Tab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;import com.gitplex.server.core.GitPlex;import com.gitplex.server.core.entity.Depot;import com.gitplex.server.search.SearchManager;@@ -47,12 +53,6 @@ import com.gitplex.server.search.query.SymbolQuery;import com.gitplex.server.search.query.TextQuery;import com.gitplex.server.search.query.TooGeneralQueryException;import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.util.StringUtils;-import com.gitplex.commons.wicket.behavior.RunTaskBehavior;-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;-import com.gitplex.commons.wicket.component.tabbable.Tab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -231,8 +231,7 @@ public abstract class AdvancedSearchPanel extends Panel {});} else {- SymbolQuery query = new SymbolQuery(validatable.getValue(), null, null, true, false, null,- null, null, 0);+ SymbolQuery query = new SymbolQuery.Builder().term(validatable.getValue()).count(1).build();try {query.asLuceneQuery();} catch (TooGeneralQueryException e) {@@ -309,7 +308,10 @@ public abstract class AdvancedSearchPanel extends Panel {});} else {- FileQuery query = new FileQuery(validatable.getValue(), null, false, null, 0);+ FileQuery query = new FileQuery.Builder()+ .fileNames(validatable.getValue())+ .count(1)+ .build();try {query.asLuceneQuery();} catch (TooGeneralQueryException e) {@@ -388,7 +390,10 @@ public abstract class AdvancedSearchPanel extends Panel {});} else {boolean regex = regexCheck.getInput()!=null?true:false;- TextQuery query = new TextQuery(validatable.getValue(), regex, false, false, null, null, 0);+ TextQuery query = new TextQuery.Builder()+ .term(validatable.getValue()).regex(regex)+ .count(1)+ .build();try {query.asLuceneQuery();} catch (TooGeneralQueryException e) {@@ -517,16 +522,26 @@ public abstract class AdvancedSearchPanel extends Panel {public List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);List<QueryHit> hits;- BlobQuery query = new SymbolQuery(term, null, null, true, caseSensitive,- context.getDirectory(insideCurrentDir), fileNames,- null, SearchResultPanel.MAX_QUERY_ENTRIES);+ BlobQuery query = new SymbolQuery.Builder()+ .term(term)+ .primary(true)+ .caseSensitive(caseSensitive)+ .directory(context.getDirectory(insideCurrentDir))+ .fileNames(fileNames)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());hits = searchManager.search(context.depotModel.getObject(), commit, query);if (hits.size() < SearchResultPanel.MAX_QUERY_ENTRIES) {- query = new SymbolQuery(term, null, null, false, caseSensitive,- context.getDirectory(insideCurrentDir), fileNames,- null, SearchResultPanel.MAX_QUERY_ENTRIES - hits.size());+ query = new SymbolQuery.Builder()+ .term(term)+ .primary(false)+ .caseSensitive(caseSensitive)+ .directory(context.getDirectory(insideCurrentDir))+ .fileNames(fileNames)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES - hits.size())+ .build();hits.addAll(searchManager.search(context.depotModel.getObject(), commit, query));}@@ -546,8 +561,12 @@ public abstract class AdvancedSearchPanel extends Panel {@Overridepublic List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- BlobQuery query = new FileQuery(term, null, caseSensitive,- context.getDirectory(insideCurrentDir), SearchResultPanel.MAX_QUERY_ENTRIES);+ BlobQuery query = new FileQuery.Builder()+ .fileNames(term)+ .caseSensitive(caseSensitive)+ .directory(context.getDirectory(insideCurrentDir))+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());return searchManager.search(context.depotModel.getObject(), commit, query);}@@ -570,8 +589,15 @@ public abstract class AdvancedSearchPanel extends Panel {@Overridepublic List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- BlobQuery query = new TextQuery(term, regex, caseSensitive, wholeWord,- context.getDirectory(insideCurrentDir), fileNames, SearchResultPanel.MAX_QUERY_ENTRIES);+ BlobQuery query = new TextQuery.Builder()+ .term(term)+ .regex(regex)+ .caseSensitive(caseSensitive)+ .wholeWord(wholeWord)+ .directory(context.getDirectory(insideCurrentDir))+ .fileNames(fileNames)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();ObjectId commit = context.depotModel.getObject().getRevCommit(context.revisionModel.getObject());return searchManager.search(context.depotModel.getObject(), commit, query);}diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javaindex 30de0d4149..87c7c026ea 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java@@ -84,40 +84,56 @@ public abstract class InstantSearchPanel extends Panel {try {// first try an exact search against primary symbol to make sure the result// always contains exact match if exists- BlobQuery query = new SymbolQuery(searchInput, null, null, true, false,- null, null, null, count);+ BlobQuery query = new SymbolQuery.Builder()+ .term(searchInput)+ .primary(true)+ .count(count)+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));// now do wildcard search but exclude the exact match returned aboveif (symbolHits.size() < count) {- query = new SymbolQuery(searchInput+"*", searchInput, null, true, false,- null, null, null, count-symbolHits.size());+ query = new SymbolQuery.Builder().term(searchInput+"*")+ .excludeTerm(searchInput)+ .primary(true)+ .count(count-symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}// do the same for file namesif (symbolHits.size() < count) {- query = new FileQuery(searchInput, null, false, null,- count-symbolHits.size());+ query = new FileQuery.Builder()+ .fileNames(searchInput)+ .count(count-symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}if (symbolHits.size() < count) {- query = new FileQuery(searchInput+"*", searchInput, false, null,- count-symbolHits.size());+ query = new FileQuery.Builder().fileNames(searchInput+"*")+ .excludeFileName(searchInput)+ .count(count-symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}// do the same for secondary symbolsif (symbolHits.size() < count) {- query = new SymbolQuery(searchInput, null, null, false, false,- null, null, null, count-symbolHits.size());+ query = new SymbolQuery.Builder()+ .term(searchInput)+ .primary(false)+ .count(count-symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}if (symbolHits.size() < count) {- query = new SymbolQuery(searchInput+"*", searchInput, null, false, false,- null, null, null, count-symbolHits.size());+ query = new SymbolQuery.Builder().term(searchInput+"*")+ .excludeTerm(searchInput)+ .primary(false)+ .count(count-symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}diff --git a/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex 298e6d5c13..6c030fd492 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -147,8 +147,12 @@ public abstract class SymbolTooltipPanel extends Panel {List<QueryHit> hits;// do this check to avoid TooGeneralQueryExceptionif (symbolName.length() >= IndexConstants.NGRAM_SIZE) {- BlobQuery query = new TextQuery(symbolName, false, true, true,- null, null, SearchResultPanel.MAX_QUERY_ENTRIES);+ BlobQuery query = new TextQuery.Builder()+ .term(symbolName)+ .wholeWord(true)+ .caseSensitive(true)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);ObjectId commit = depotModel.getObject().getRevCommit(revision);@@ -200,6 +204,7 @@ public abstract class SymbolTooltipPanel extends Panel {Blob blob = depotModel.getObject().getBlob(blobIdent);if (symbolHits.size() < QUERY_ENTRIES) {+ // first find in current file for matched symbolsList<Symbol> symbols = GitPlex.getInstance(SearchManager.class).getSymbols(depotModel.getObject(),blob.getBlobId(), getBlobPath());if (symbols != null) {@@ -223,19 +228,32 @@ public abstract class SymbolTooltipPanel extends Panel {}if (symbolHits.size() < QUERY_ENTRIES) {+ // then find in other files for public symbolsSourceContext sourceContext = new SourceContext(blob);try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);ObjectId commit = depotModel.getObject().getRevCommit(revision);BlobQuery query;if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery(symbolName, null, blobIdent.path, true, true, null, null,- sourceContext, QUERY_ENTRIES);+ query = new SymbolQuery.Builder().term(symbolName)+ .excludeBlobPath(blobIdent.path)+ .primary(true)+ .local(false)+ .caseSensitive(true)+ .sourceContext(sourceContext)+ .count(QUERY_ENTRIES)+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery(symbolName, null, blobIdent.path, false, true, null, null,- sourceContext, QUERY_ENTRIES - symbolHits.size());+ query = new SymbolQuery.Builder().term(symbolName)+ .excludeBlobPath(blobIdent.path)+ .primary(false)+ .local(false)+ .caseSensitive(true)+ .sourceContext(sourceContext)+ .count(QUERY_ENTRIES - symbolHits.size())+ .build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));}if (isString && symbolHits.size() < QUERY_ENTRIES) {diff --git a/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.javaindex d487d3a666..372d655030 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java@@ -206,8 +206,12 @@ public class DepotFilePage extends DepotPage implements BlobViewContext {} else {String symbol = params.get(PARAM_QUERY).toString();if (symbol != null) {- BlobQuery query = new TextQuery(symbol, false, true, true,- null, null, SearchResultPanel.MAX_QUERY_ENTRIES);+ BlobQuery query = new TextQuery.Builder()+ .term(symbol)+ .wholeWord(true)+ .caseSensitive(true)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);queryHits = searchManager.search(depotModel.getObject(), commitId, query);