svn commit: r1429928 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/CHANGES.txt lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java

[rm...@apache.org]

Author: rmuir
Date: Mon Jan  7 18:13:38 2013
New Revision: 1429928

URL: http://svn.apache.org/viewvc?rev=1429928&view=rev
Log:
LUCENE-4663: IndexSearcher.document should not be final

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java

Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1429928&r1=1429927&r2=1429928&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Mon Jan  7 18:13:38 2013
@@ -191,6 +191,10 @@ API Changes
   create your fst with finish(), and then call pack() to get another FST.
   Instead just pass true for doPackFST to Builder and finish() returns a packed FST.
   (Robert Muir)
+
+* LUCENE-4663: Deprecate IndexSearcher.document(int, Set). This was not intended
+  to be final, nor named document(). Use IndexSearcher.doc(int, Set) instead.
+  (Robert Muir)
   
 Bug Fixes
 

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1429928&r1=1429927&r2=1429928&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Mon Jan  7 18:13:38 2013
@@ -200,9 +200,17 @@ public class IndexSearcher {
    * Sugar for <code>.getIndexReader().document(docID, fieldsToLoad)</code>
    * @see IndexReader#document(int, Set) 
    */
-  public final Document document(int docID, Set<String> fieldsToLoad) throws IOException {
+  public Document doc(int docID, Set<String> fieldsToLoad) throws IOException {
     return reader.document(docID, fieldsToLoad);
   }
+  
+  /**
+   * @deprecated Use {@link #doc(int, Set)} instead.
+   */
+  @Deprecated
+  public final Document document(int docID, Set<String> fieldsToLoad) throws IOException {
+    return doc(docID, fieldsToLoad);
+  }
 
   /** Expert: Set the Similarity implementation used by this IndexSearcher.
    *

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1429928&r1=1429927&r2=1429928&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Jan  7 18:13:38 2013
@@ -570,6 +570,7 @@ public class SolrIndexSearcher extends I
    * filter is provided, only the provided fields will be loaded (the 
    * remainder will be available lazily).
    */
+  @Override
   public Document doc(int i, Set<String> fields) throws IOException {
     
     Document d;