honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Iterators#emptyIterator by JDK one 

`com.google.common.collect.Iterators#emptyIterator()` is marked as deprecated and will be removed in May 2016. We should use JDK7 `Collections#emptyIterator()`
This commit is contained in:
David Pilato 2015-06-18 08:47:31 +02:00
parent b2000a48a4
commit 6a466b9a00
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.termvectors; package org.elasticsearch.action.termvectors;
import com.google.common.collect.Iterators;
import org.apache.lucene.index.Fields; import org.apache.lucene.index.Fields;
import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms; import org.apache.lucene.index.Terms;
@ -43,6 +42,7 @@ import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
@ -154,7 +154,7 @@ public class TermVectorsResponse extends ActionResponse implements ToXContent {
return new Fields() { return new Fields() {
@Override @Override
public Iterator<String> iterator() { public Iterator<String> iterator() {
return Iterators.emptyIterator(); return Collections.emptyIterator();
} }
@Override @Override

4
core/src/main/java/org/elasticsearch/index/get/GetResult.java
View File

@ -34,11 +34,11 @@ import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.search.lookup.SourceLookup; import org.elasticsearch.search.lookup.SourceLookup;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.google.common.collect.Iterators.emptyIterator;
import static com.google.common.collect.Maps.newHashMapWithExpectedSize; import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
import static org.elasticsearch.index.get.GetField.readGetField; import static org.elasticsearch.index.get.GetField.readGetField;
@ -193,7 +193,7 @@ public class GetResult implements Streamable, Iterable<GetField>, ToXContent {
@Override @Override
public Iterator<GetField> iterator() { public Iterator<GetField> iterator() {
if (fields == null) { if (fields == null) {
return emptyIterator(); return Collections.emptyIterator();
} }
return fields.values().iterator(); return fields.values().iterator();
} }