[jspwiki] 06/36: JSPWIKI-303: move back to jspwiki-main o.a.w.search.QueryItem and o.a.w.search.SearchResult

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 3338f0c476560cfdb1db036c3940da3b0a9a2764
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 20 19:31:24 2020 +0100

    JSPWIKI-303: move back to jspwiki-main o.a.w.search.QueryItem and o.a.w.search.SearchResult
    
    as they will be needed there for page/attachment providers backward compatibility
    also, for the same reason, they extend again from their counterparts at o.a.w.api.search package
---
 .../main/java/org/apache/wiki/search/QueryItem.java    | 18 +-----------------
 .../java/org/apache/wiki/search/SearchMatcher.java     | 18 ++++++++++++++----
 .../main/java/org/apache/wiki/search/SearchResult.java | 17 +----------------
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/search/QueryItem.java b/jspwiki-main/src/main/java/org/apache/wiki/search/QueryItem.java
similarity index 67%
rename from jspwiki-210-adapters/src/main/java/org/apache/wiki/search/QueryItem.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/QueryItem.java
index 280c546..54b6dd7 100644
--- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/search/QueryItem.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/QueryItem.java
@@ -26,21 +26,5 @@ package org.apache.wiki.search;
  * @see org.apache.wiki.api.search.QueryItem
  */
 @Deprecated
-public class QueryItem {
-
-    /** The word is required to be in the pages */
-    public static final int REQUIRED  = 1;
-
-    /** The word may NOT be in the pages */
-    public static final int FORBIDDEN = -1;
-
-    /** The word should be in the pages, but the search engine may use its own discretion. */
-    public static final int REQUESTED = 0;
-
-    /** The word that is being searched */
-    public String word;
-
-    /** The type of the word.  See above for types.  The default is REQUESTED. */
-    public int type = REQUESTED;
-
+public class QueryItem extends org.apache.wiki.api.search.QueryItem {
 }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
index e0e4237..cfe5683 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
@@ -18,10 +18,10 @@
  */
 package org.apache.wiki.search;
 
+import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.core.Engine;
 import org.apache.wiki.api.search.QueryItem;
-import org.apache.wiki.api.search.SearchResult;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -42,7 +42,7 @@ public class SearchMatcher {
 
     /**
      *  Creates a new SearchMatcher.
-     *  
+     *
      *  @param engine The Engine
      *  @param queries A list of queries
      */
@@ -52,6 +52,16 @@ public class SearchMatcher {
     }
 
     /**
+     *  Creates a new SearchMatcher.
+     *
+     *  @param engine The Engine
+     *  @param queries A list of queries
+     */
+    public SearchMatcher( final WikiEngine engine, final org.apache.wiki.search.QueryItem[] queries ) {
+        this( ( Engine )engine, queries );
+    }
+
+    /**
      * Compares the page content, available through the given stream, to the query items of this matcher. Returns a search result
      * object describing the quality of the match.
      *
@@ -62,7 +72,7 @@ public class SearchMatcher {
      * @return A SearchResult item, or null, there are no queries
      * @throws IOException If reading page content fails
      */
-    public SearchResult matchPageContent( final String wikiname, final String pageText ) throws IOException {
+    public org.apache.wiki.search.SearchResult matchPageContent( final String wikiname, final String pageText ) throws IOException {
         if( m_queries == null ) {
             return null;
         }
@@ -116,7 +126,7 @@ public class SearchMatcher {
     /**
      *  A local search result.
      */
-    public class SearchResultImpl implements SearchResult {
+    public class SearchResultImpl implements org.apache.wiki.search.SearchResult {
     	
         int      m_score;
         WikiPage m_page;
diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/search/SearchResult.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
similarity index 74%
rename from jspwiki-210-adapters/src/main/java/org/apache/wiki/search/SearchResult.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
index ae677a9..dbb93ce 100644
--- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/search/SearchResult.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
@@ -28,7 +28,7 @@ import org.apache.wiki.WikiPage;
  * @see org.apache.wiki.api.search.SearchResult
  */
 @Deprecated
-public interface SearchResult {
+public interface SearchResult extends org.apache.wiki.api.search.SearchResult {
     
 	/**
      *  Return the page.
@@ -37,19 +37,4 @@ public interface SearchResult {
      */
     WikiPage getPage();
 
-    /**
-     *  Returns the score.
-     *
-     *  @return A positive score value.  Note that there is no upper limit for the score.
-     */
-    int getScore();
-
-    /**
-     * Collection of XHTML fragments representing some contexts in which the match was made (a.k.a., "snippets").
-     *
-     * @return the search results
-     * @since 2.4
-     */
-    String[] getContexts();
-
 }