SOLR-13515: remove SolrPluginUtils.IdentityRegenerator in favour of NoOpRegenerator

This commit is contained in:
Christine Poerschke 2019-06-14 12:39:29 +01:00
parent 43fc05c1ed
commit 335aaf801e
2 changed files with 3 additions and 24 deletions

View File

@ -73,6 +73,9 @@ Upgrade Notes
4lw.commands.whitelist=* to enable all ZooKeeper "4 letter commands". 4lw.commands.whitelist=* to enable all ZooKeeper "4 letter commands".
(Erick Erickson) (Erick Erickson)
* SOLR-13515: org.apache.solr.util.SolrPluginUtils.IdentityRegenerator has been removed, please use
the identical org.apache.solr.search.NoOpRegenerator instead. (David Smiley, Christine Poerschke)
New Features New Features
---------------------- ----------------------

View File

@ -63,7 +63,6 @@ import org.apache.solr.request.json.RequestUtil;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField; import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.CacheRegenerator;
import org.apache.solr.search.DocIterator; import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList; import org.apache.solr.search.DocList;
import org.apache.solr.search.DocSet; import org.apache.solr.search.DocSet;
@ -71,7 +70,6 @@ import org.apache.solr.search.FieldParams;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.QueryParsing; import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.ReturnFields; import org.apache.solr.search.ReturnFields;
import org.apache.solr.search.SolrCache;
import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrQueryParser; import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.search.SortSpecParsing; import org.apache.solr.search.SortSpecParsing;
@ -974,28 +972,6 @@ public class SolrPluginUtils {
return out; return out;
} }
/**
* A CacheRegenerator that can be used whenever the items in the cache
* are not dependant on the current searcher.
*
* <p>
* Flat out copies the oldKey=&gt;oldVal pair into the newCache
* </p>
*/
public static class IdentityRegenerator implements CacheRegenerator {
@Override
public boolean regenerateItem(SolrIndexSearcher newSearcher,
SolrCache newCache,
SolrCache oldCache,
Object oldKey,
Object oldVal)
throws IOException {
newCache.put(oldKey,oldVal);
return true;
}
}
public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs) { public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs) {
invokeSetters(bean, initArgs, false); invokeSetters(bean, initArgs, false);
} }