You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/15 19:39:31 UTC
svn commit: r1645718 [2/2] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/backward-codecs/src/java/org/apache/lucene/codecs/
lucene/backward-codecs/src/java/org/apache/lucene/codecs/blocktree/
lucene/backward-codecs/src/java/org/apache/lucene/c...
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java Mon Dec 15 18:39:29 2014
@@ -159,7 +159,7 @@ public class CachingWrapperFilter extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
// Sync to pull the current set of values:
synchronized (cache) {
// no need to clone, Accountable#namedAccountables already copies the data
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java Mon Dec 15 18:39:29 2014
@@ -95,7 +95,7 @@ public abstract class DocIdSet implement
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java Mon Dec 15 18:39:29 2014
@@ -70,7 +70,7 @@ public abstract class FilteredDocIdSet e
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return _innerSet.getChildResources();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java Mon Dec 15 18:39:29 2014
@@ -262,7 +262,7 @@ public class LRUFilterCache implements F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
synchronized (this) {
return Accountables.namedAccountables("segment", cache);
}
@@ -327,7 +327,7 @@ public class LRUFilterCache implements F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Mon Dec 15 18:39:29 2014
@@ -260,7 +260,7 @@ public class NRTCachingDirectory extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("cache", cache));
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java Mon Dec 15 18:39:29 2014
@@ -143,7 +143,7 @@ public class RAMDirectory extends BaseDi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("file", fileMap);
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMFile.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMFile.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMFile.java Mon Dec 15 18:39:29 2014
@@ -84,7 +84,7 @@ public class RAMFile implements Accounta
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java Mon Dec 15 18:39:29 2014
@@ -193,7 +193,7 @@ public class RAMOutputStream extends Ind
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("file", file));
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountable.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountable.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountable.java Mon Dec 15 18:39:29 2014
@@ -35,6 +35,6 @@ public interface Accountable {
* @see Accountables
*/
// TODO: on java8 make this a default method returning emptyList
- Iterable<? extends Accountable> getChildResources();
+ Iterable<Accountable> getChildResources();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountables.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountables.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountables.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Accountables.java Mon Dec 15 18:39:29 2014
@@ -128,8 +128,8 @@ public class Accountables {
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return children;
+ public Iterable<Accountable> getChildResources() {
+ return (Iterable<Accountable>) children;
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitSet.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitSet.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitSet.java Mon Dec 15 18:39:29 2014
@@ -147,7 +147,7 @@ public abstract class BitSet implements
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java Mon Dec 15 18:39:29 2014
@@ -137,7 +137,7 @@ public final class PagedBytes implements
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
@@ -259,7 +259,7 @@ public final class PagedBytes implements
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java Mon Dec 15 18:39:29 2014
@@ -483,7 +483,7 @@ class BytesStore extends DataOutput impl
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Mon Dec 15 18:39:29 2014
@@ -445,7 +445,7 @@ public final class FST<T> implements Acc
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (packed) {
resources.add(Accountables.namedAccountable("node ref to address", nodeRefToAddress));
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java Mon Dec 15 18:39:29 2014
@@ -118,7 +118,7 @@ abstract class AbstractPagedMutable<T ex
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java Mon Dec 15 18:39:29 2014
@@ -102,7 +102,7 @@ public final class BlockPackedReader ext
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java Mon Dec 15 18:39:29 2014
@@ -365,7 +365,7 @@ public class EliasFanoEncoder implements
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java Mon Dec 15 18:39:29 2014
@@ -128,7 +128,7 @@ public class MonotonicBlockPackedReader
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java Mon Dec 15 18:39:29 2014
@@ -480,7 +480,7 @@ public class PackedInts {
public abstract int size();
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java Mon Dec 15 18:39:29 2014
@@ -117,7 +117,7 @@ public class PackedLongValues extends Lo
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
@@ -215,7 +215,7 @@ public class PackedLongValues extends Lo
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java Mon Dec 15 18:39:29 2014
@@ -150,7 +150,7 @@ public class CachedOrdinalsReader extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
@@ -166,7 +166,7 @@ public class CachedOrdinalsReader extend
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("segment", ordsCache);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java Mon Dec 15 18:39:29 2014
@@ -90,7 +90,7 @@ public class BitDocIdSetCachingWrapperFi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return filter.getChildResources();
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java Mon Dec 15 18:39:29 2014
@@ -183,7 +183,7 @@ public class DocTermOrds implements Acco
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java Mon Dec 15 18:39:29 2014
@@ -66,7 +66,7 @@ interface FieldCache {
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Mon Dec 15 18:39:29 2014
@@ -385,7 +385,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
@@ -490,7 +490,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
@@ -613,7 +613,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("term bytes", bytes));
resources.add(Accountables.namedAccountable("ord -> term", termOrdToBytesOffset));
@@ -756,7 +756,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("term bytes", bytes));
resources.add(Accountables.namedAccountable("addresses", docToOffset));
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Mon Dec 15 18:39:29 2014
@@ -192,7 +192,7 @@ public final class TermsFilter extends F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
@@ -297,7 +297,7 @@ public final class TermsFilter extends F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java Mon Dec 15 18:39:29 2014
@@ -100,7 +100,7 @@ final class IDVersionPostingsReader exte
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java Mon Dec 15 18:39:29 2014
@@ -232,7 +232,7 @@ public final class VersionBlockTreeTerms
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java Mon Dec 15 18:39:29 2014
@@ -163,7 +163,7 @@ final class VersionFieldReader extends T
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java Mon Dec 15 18:39:29 2014
@@ -275,7 +275,7 @@ public abstract class Lookup implements
* @see Accountables
*/
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return null;
}
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Mon Dec 15 18:39:29 2014
@@ -757,7 +757,7 @@ public class AnalyzingInfixSuggester ext
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
try {
if (searcherMgr != null) {
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java Mon Dec 15 18:39:29 2014
@@ -262,7 +262,7 @@ public class AnalyzingSuggester extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Mon Dec 15 18:39:29 2014
@@ -213,7 +213,7 @@ public class FreeTextSuggester extends L
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java Mon Dec 15 18:39:29 2014
@@ -315,7 +315,7 @@ public class FSTCompletionLookup extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (normalCompletion != null) {
resources.add(Accountables.namedAccountable("fst", normalCompletion.getFST()));
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java Mon Dec 15 18:39:29 2014
@@ -301,7 +301,7 @@ public class WFSTCompletionLookup extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java Mon Dec 15 18:39:29 2014
@@ -113,7 +113,7 @@ public class JaspellTernarySearchTrie im
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
@@ -905,7 +905,7 @@ public class JaspellTernarySearchTrie im
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java Mon Dec 15 18:39:29 2014
@@ -290,8 +290,8 @@ public class AssertingDocValuesFormat ex
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java Mon Dec 15 18:39:29 2014
@@ -112,8 +112,8 @@ public class AssertingNormsFormat extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Mon Dec 15 18:39:29 2014
@@ -100,8 +100,8 @@ public final class AssertingPostingsForm
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java Mon Dec 15 18:39:29 2014
@@ -85,8 +85,8 @@ public class AssertingStoredFieldsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java Mon Dec 15 18:39:29 2014
@@ -84,8 +84,8 @@ public class AssertingTermVectorsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Mon Dec 15 18:39:29 2014
@@ -98,7 +98,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fieldToTerms);
}
@@ -129,7 +129,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
@@ -197,7 +197,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
@@ -226,7 +226,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java Mon Dec 15 18:39:29 2014
@@ -241,7 +241,7 @@ public abstract class BaseBitSetTestCase
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Mon Dec 15 18:39:29 2014
@@ -342,7 +342,7 @@ public class SuggestComponent extends Se
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", suggesters);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java?rev=1645718&r1=1645717&r2=1645718&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java Mon Dec 15 18:39:29 2014
@@ -213,7 +213,7 @@ public class SolrSuggester implements Ac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return lookup.getChildResources();
}