提交 c8e1be6d 编写于 作者: J Jesse Glick

Follow-ups to #893 (search improvements for folders).

上级 fd0ff362
...@@ -64,6 +64,7 @@ Upcoming changes</a> ...@@ -64,6 +64,7 @@ Upcoming changes</a>
<li class=rfe> <li class=rfe>
Improve search to locate items inside folders. Improve search to locate items inside folders.
(<a href="https://github.com/jenkinsci/jenkins/pull/848">pull request 848</a>) (<a href="https://github.com/jenkinsci/jenkins/pull/848">pull request 848</a>)
(<a href="https://github.com/jenkinsci/jenkins/pull/893">pull request 893</a>)
<li class=bug> <li class=bug>
Windows path separators not correctly escaped in Maven properties configuration. Windows path separators not correctly escaped in Maven properties configuration.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-10539">issue 10539</a>) (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10539">issue 10539</a>)
......
...@@ -247,7 +247,7 @@ public class Search { ...@@ -247,7 +247,7 @@ public class Search {
/** /**
* Performs a search and returns the match, or null if no match was found * Performs a search and returns the match, or null if no match was found
* or more than one match was found. * or more than one match was found.
* @since XXX * @since 1.527
*/ */
public static SuggestedItem find(SearchIndex index, String query, SearchableModelObject searchContext) { public static SuggestedItem find(SearchIndex index, String query, SearchableModelObject searchContext) {
List<SuggestedItem> r = find(Mode.FIND, index, query, searchContext); List<SuggestedItem> r = find(Mode.FIND, index, query, searchContext);
...@@ -274,7 +274,7 @@ public class Search { ...@@ -274,7 +274,7 @@ public class Search {
} }
/** /**
* @since XXX * @since 1.527
*/ */
public static List<SuggestedItem> suggest(SearchIndex index, final String tokenList, SearchableModelObject searchContext) { public static List<SuggestedItem> suggest(SearchIndex index, final String tokenList, SearchableModelObject searchContext) {
......
...@@ -88,20 +88,11 @@ public class SuggestedItem { ...@@ -88,20 +88,11 @@ public class SuggestedItem {
return new SuggestedItem(top); return new SuggestedItem(top);
} }
/**
* @since 1.527
* @deprecated Use {@link SuggestedItem#build(SearchableModelObject, SearchItem) instead.}
*/
@Deprecated
public static SuggestedItem build(SearchItem si) {
return build(null, si);
}
/** /**
* Given a SearchItem, builds a SuggestedItem hierarchy by looking up parent items (if applicable). * Given a SearchItem, builds a SuggestedItem hierarchy by looking up parent items (if applicable).
* This allows search results for items not contained within the same {@link ItemGroup} to be distinguished. * This allows search results for items not contained within the same {@link ItemGroup} to be distinguished.
* If provided searchContext is null, results will be interpreted from the root {@link jenkins.model.Jenkins} object * If provided searchContext is null, results will be interpreted from the root {@link jenkins.model.Jenkins} object
* @since XXX * @since 1.527
*/ */
public static SuggestedItem build(SearchableModelObject searchContext, SearchItem si) { public static SuggestedItem build(SearchableModelObject searchContext, SearchItem si) {
if (si instanceof Item) { if (si instanceof Item) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册