You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/27 17:55:17 UTC
svn commit: r1053107 - in /lucene/dev/trunk/solr/src:
common/org/apache/solr/common/ common/org/apache/solr/common/params/
java/org/apache/solr/search/ java/org/apache/solr/search/function/
Author: yonik
Date: Mon Dec 27 16:55:17 2010
New Revision: 1053107
URL: http://svn.apache.org/viewvc?rev=1053107&view=rev
Log:
SOLR-1930: remove solr deprecations
Modified:
lucene/dev/trunk/solr/src/common/org/apache/solr/common/SolrException.java
lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/SolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ValueSource.java
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/SolrException.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/SolrException.java?rev=1053107&r1=1053106&r2=1053107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/SolrException.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/SolrException.java Mon Dec 27 16:55:17 2010
@@ -93,43 +93,6 @@ public class SolrException extends Runti
this.code=code;
}
- /**
- * @deprecated Use {@link #SolrException(ErrorCode,String,boolean)}.
- */
- @Deprecated
- public SolrException(int code, String msg, boolean alreadyLogged) {
- super(msg);
- this.code=code;
- this.logged=alreadyLogged;
- }
-
- /**
- * @deprecated Use {@link #SolrException(ErrorCode,String,Throwable,boolean)}.
- */
- @Deprecated
- public SolrException(int code, String msg, Throwable th, boolean alreadyLogged) {
- super(msg,th);
- this.code=code;
- logged=alreadyLogged;
- }
-
- /**
- * @deprecated Use {@link #SolrException(ErrorCode,String,Throwable)}.
- */
- @Deprecated
- public SolrException(int code, String msg, Throwable th) {
- this(code,msg,th,true);
- }
-
- /**
- * @deprecated Use {@link #SolrException(ErrorCode,Throwable)}.
- */
- @Deprecated
- public SolrException(int code, Throwable th) {
- super(th);
- this.code=code;
- logged=true;
- }
int code=0;
public int code() { return code; }
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/SolrParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/SolrParams.java?rev=1053107&r1=1053106&r2=1053107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/SolrParams.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/SolrParams.java Mon Dec 27 16:55:17 2010
@@ -249,16 +249,6 @@ public abstract class SolrParams impleme
}
}
-
- /** how to transform a String into a boolean... more flexible than
- * Boolean.parseBoolean() to enable easier integration with html forms.
- * @deprecated Use org.apache.solr.common.util.StrUtils.parseBool
- */
- @Deprecated
- protected boolean parseBool(String s) {
- return StrUtils.parseBool(s);
- }
-
/** Create a Map<String,String> from a NamedList given no keys are repeated */
public static Map<String,String> toMap(NamedList params) {
HashMap<String,String> map = new HashMap<String,String>();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java?rev=1053107&r1=1053106&r2=1053107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java Mon Dec 27 16:55:17 2010
@@ -89,10 +89,7 @@ public interface DocSet /* extends Colle
*
* @return
* An OpenBitSet with the bit number of every docid set in the set.
- *
- * @deprecated Use {@link #iterator()} to access all docs instead.
*/
- @Deprecated
public OpenBitSet getBits();
/**
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1053107&r1=1053106&r2=1053107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Dec 27 16:55:17 2010
@@ -94,14 +94,6 @@ public class SolrIndexSearcher extends I
private final Collection<String> fieldNames;
private Collection<String> storedHighlightFieldNames;
- /** Creates a searcher searching the index in the named directory.
- *
- * @deprecated use alternate constructor
- */
- @Deprecated
- public SolrIndexSearcher(SolrCore core, IndexSchema schema, String name, String path, boolean enableCache) throws IOException {
- this(core, schema,name, core.getIndexReaderFactory().newReader(core.getDirectoryFactory().open(path), false), true, enableCache);
- }
/*
* Creates a searcher searching the index in the provided directory. Note:
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ValueSource.java?rev=1053107&r1=1053106&r2=1053107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ValueSource.java Mon Dec 27 16:55:17 2010
@@ -41,18 +41,11 @@ import java.util.Collections;
*/
public abstract class ValueSource implements Serializable {
- @Deprecated
- public DocValues getValues(IndexReader reader) throws IOException {
- return getValues(null, reader);
- }
-
/**
* Gets the values for this reader and the context that was previously
* passed to createWeight()
*/
- public DocValues getValues(Map context, IndexReader reader) throws IOException {
- return getValues(reader);
- }
+ public abstract DocValues getValues(Map context, IndexReader reader) throws IOException;
public abstract boolean equals(Object o);