You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/06/28 18:40:37 UTC
svn commit: r1355069 [6/8] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
lucene/analysis/common/src/java/org/apache/lucene/analys...
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java Thu Jun 28 16:39:25 2012
@@ -18,19 +18,28 @@ package org.apache.lucene.search.groupin
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.*;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.SortedBytesDocValuesField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.CachingWrapperFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.QueryWrapperFilter;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.mutable.MutableValueStr;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -195,7 +204,7 @@ public class GroupingSearchTest extends
}
}
- private GroupingSearch createRandomGroupingSearch(String groupField, Sort groupSort, int docsInGroup, boolean canUseIDV) throws IOException {
+ private GroupingSearch createRandomGroupingSearch(String groupField, Sort groupSort, int docsInGroup, boolean canUseIDV) {
GroupingSearch groupingSearch;
if (random().nextBoolean()) {
ValueSource vs = new BytesRefFieldSource(groupField);
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Thu Jun 28 16:39:25 2012
@@ -191,7 +191,7 @@ public class TokenSources {
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if (currentToken >= tokens.length) {
return false;
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java Thu Jun 28 16:39:25 2012
@@ -105,7 +105,7 @@ public final class TokenStreamFromTermPo
};
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if (this.tokensAtCurrentPosition.hasNext()) {
final Token next = this.tokensAtCurrentPosition.next();
clearAttributes();
@@ -119,7 +119,7 @@ public final class TokenStreamFromTermPo
}
@Override
- public void reset() throws IOException {
+ public void reset() {
this.tokensAtCurrentPosition = this.positionedTokens.iterator();
}
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Thu Jun 28 16:39:25 2012
@@ -125,14 +125,14 @@ public abstract class BaseFragmentsBuild
reader.document(docId, new StoredFieldVisitor() {
@Override
- public void stringField(FieldInfo fieldInfo, String value) throws IOException {
+ public void stringField(FieldInfo fieldInfo, String value) {
FieldType ft = new FieldType(TextField.TYPE_STORED);
ft.setStoreTermVectors(fieldInfo.hasVectors());
fields.add(new Field(fieldInfo.name, value, ft));
}
@Override
- public Status needsField(FieldInfo fieldInfo) throws IOException {
+ public Status needsField(FieldInfo fieldInfo) {
return fieldInfo.name.equals(fieldName) ? Status.YES : Status.NO;
}
});
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java Thu Jun 28 16:39:25 2012
@@ -348,7 +348,7 @@ public class FieldQuery {
return map;
}
- void add( Query query, IndexReader reader ) throws IOException {
+ void add( Query query, IndexReader reader ) {
if( query instanceof TermQuery ){
addTerm( ((TermQuery)query).getTerm(), query.getBoost() );
}
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Thu Jun 28 16:39:25 2012
@@ -31,7 +31,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -46,14 +45,12 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.FixedBitSet;
public class HighlighterPhraseTest extends LuceneTestCase {
private static final String FIELD = "text";
- public void testConcurrentPhrase() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testConcurrentPhrase() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox jumped";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -94,8 +91,7 @@ public class HighlighterPhraseTest exten
}
}
- public void testConcurrentSpan() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testConcurrentSpan() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox jumped";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -129,19 +125,17 @@ public class HighlighterPhraseTest exten
}
@Override
- public void collect(int i) throws IOException {
+ public void collect(int i) {
bitset.set(this.baseDoc + i);
}
@Override
- public void setNextReader(AtomicReaderContext context)
- throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
this.baseDoc = context.docBase;
}
@Override
- public void setScorer(org.apache.lucene.search.Scorer scorer)
- throws IOException {
+ public void setScorer(org.apache.lucene.search.Scorer scorer) {
// Do Nothing
}
});
@@ -165,8 +159,7 @@ public class HighlighterPhraseTest exten
}
}
- public void testSparsePhrase() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testSparsePhrase() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -208,8 +201,7 @@ public class HighlighterPhraseTest exten
}
}
- public void testSparsePhraseWithNoPositions() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testSparsePhraseWithNoPositions() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -248,8 +240,7 @@ public class HighlighterPhraseTest exten
}
}
- public void testSparseSpan() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testSparseSpan() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -304,7 +295,7 @@ public class HighlighterPhraseTest exten
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
this.i++;
if (this.i >= this.tokens.length) {
return false;
@@ -344,7 +335,7 @@ public class HighlighterPhraseTest exten
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
this.i++;
if (this.i >= this.tokens.length) {
return false;
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Thu Jun 28 16:39:25 2012
@@ -1458,7 +1458,7 @@ public class HighlighterTest extends Bas
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if(iter.hasNext()) {
Token token = iter.next();
clearAttributes();
@@ -1509,7 +1509,7 @@ public class HighlighterTest extends Bas
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if(iter.hasNext()) {
Token token = iter.next();
clearAttributes();
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Thu Jun 28 16:39:25 2012
@@ -19,7 +19,8 @@ package org.apache.lucene.search.highlig
import java.io.IOException;
-import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
@@ -27,7 +28,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -40,7 +40,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.LuceneTestCase;
// LUCENE-2874
@@ -57,7 +56,7 @@ public class TokenSourcesTest extends Lu
private final PositionIncrementAttribute positionIncrementAttribute = addAttribute(PositionIncrementAttribute.class);
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
this.i++;
if (this.i >= this.tokens.length) {
return false;
@@ -85,8 +84,7 @@ public class TokenSourcesTest extends Lu
}
}
- public void testOverlapWithOffset() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testOverlapWithOffset() throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -129,8 +127,8 @@ public class TokenSourcesTest extends Lu
}
}
- public void testOverlapWithPositionsAndOffset() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testOverlapWithPositionsAndOffset()
+ throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -174,8 +172,8 @@ public class TokenSourcesTest extends Lu
}
}
- public void testOverlapWithOffsetExactPhrase() throws CorruptIndexException,
- LockObtainFailedException, IOException, InvalidTokenOffsetsException {
+ public void testOverlapWithOffsetExactPhrase()
+ throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
@@ -219,8 +217,7 @@ public class TokenSourcesTest extends Lu
}
public void testOverlapWithPositionsAndOffsetExactPhrase()
- throws CorruptIndexException, LockObtainFailedException, IOException,
- InvalidTokenOffsetsException {
+ throws IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
final Directory directory = newDirectory();
final IndexWriter indexWriter = new IndexWriter(directory,
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Thu Jun 28 16:39:25 2012
@@ -323,7 +323,7 @@ public abstract class AbstractTestCase e
}
@Override
- public void reset() throws IOException {
+ public void reset() {
startTerm = 0;
nextStartOffset = 0;
snippet = null;
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java Thu Jun 28 16:39:25 2012
@@ -303,7 +303,7 @@ public class IndexTimeSynonymTest extend
int p = 0;
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if( p >= tokens.length ) return false;
clearAttributes();
tokens[p++].copyTo(reusableToken);
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java Thu Jun 28 16:39:25 2012
@@ -74,7 +74,7 @@ class TermsQuery extends MultiTermQuery
private BytesRef seekTerm;
private int upto = 0;
- SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms) throws IOException {
+ SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms) {
super(tenum);
this.terms = terms;
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Thu Jun 28 16:39:25 2012
@@ -299,7 +299,7 @@ public class TestJoinUtil extends Lucene
topScoreDocCollector.collect(doc);
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
docBase = context.docBase;
topScoreDocCollector.setNextReader(context);
}
@@ -496,7 +496,7 @@ public class TestJoinUtil extends Lucene
reuse = null;
}
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -528,7 +528,7 @@ public class TestJoinUtil extends Lucene
terms = FieldCache.DEFAULT.getTerms(context.reader(), fromField);
}
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -587,7 +587,7 @@ public class TestJoinUtil extends Lucene
}
public boolean acceptsDocsOutOfOrder() {return false;}
- public void setScorer(Scorer scorer) throws IOException {}
+ public void setScorer(Scorer scorer) {}
});
} else {
toSearcher.search(new MatchAllDocsQuery(), new Collector() {
@@ -596,7 +596,7 @@ public class TestJoinUtil extends Lucene
private int docBase;
private final BytesRef spare = new BytesRef();
- public void collect(int doc) throws IOException {
+ public void collect(int doc) {
JoinScore joinScore = joinValueToJoinScores.get(terms.getTerm(doc, spare));
if (joinScore == null) {
return;
@@ -610,7 +610,7 @@ public class TestJoinUtil extends Lucene
}
public boolean acceptsDocsOutOfOrder() {return false;}
- public void setScorer(Scorer scorer) throws IOException {}
+ public void setScorer(Scorer scorer) {}
});
}
queryVals.put(uniqueRandomValue, docToJoinScore);
@@ -625,7 +625,7 @@ public class TestJoinUtil extends Lucene
private TopDocs createExpectedTopDocs(String queryValue,
final boolean from,
final ScoreMode scoreMode,
- IndexIterationContext context) throws IOException {
+ IndexIterationContext context) {
Map<Integer, JoinScore> hitsToJoinScores;
if (from) {
Modified: lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Thu Jun 28 16:39:25 2012
@@ -32,7 +32,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInfo;
@@ -443,7 +442,7 @@ public class MemoryIndex {
}
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -770,13 +769,13 @@ public class MemoryIndex {
}
@Override
- public long getSumDocFreq() throws IOException {
+ public long getSumDocFreq() {
// each term has df=1
return info.sortedTerms.length;
}
@Override
- public int getDocCount() throws IOException {
+ public int getDocCount() {
return info.sortedTerms.length > 0 ? 1 : 0;
}
@@ -1065,7 +1064,7 @@ public class MemoryIndex {
}
@Override
- public DocValues docValues(String field) throws IOException {
+ public DocValues docValues(String field) {
return null;
}
@@ -1075,7 +1074,7 @@ public class MemoryIndex {
private Similarity cachedSimilarity;
@Override
- public DocValues normValues(String field) throws IOException {
+ public DocValues normValues(String field) {
DocValues norms = cachedNormValues;
Similarity sim = getSimilarity();
if (!field.equals(cachedFieldName) || sim != cachedSimilarity) { // not cached?
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Thu Jun 28 16:39:25 2012
@@ -245,7 +245,7 @@ public class BalancedSegmentMergePolicy
@Override
public MergeSpecification findForcedDeletesMerges(SegmentInfos infos)
- throws CorruptIndexException, IOException {
+ throws IOException {
final int numSegs = infos.size();
final int numLargeSegs = (numSegs < _numLargeSegments ? numSegs : _numLargeSegments);
MergeSpecification spec = null;
@@ -335,7 +335,7 @@ public class BalancedSegmentMergePolicy
}
}
- private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) throws IOException {
+ private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) {
int expungeCandidate = -1;
int maxDelCount = 0;
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Thu Jun 28 16:39:25 2012
@@ -180,11 +180,11 @@ public class MultiPassIndexSplitter {
*/
private static final class FakeDeleteIndexReader extends BaseCompositeReader<FakeDeleteAtomicIndexReader> {
- public FakeDeleteIndexReader(IndexReader reader) throws IOException {
+ public FakeDeleteIndexReader(IndexReader reader) {
super(initSubReaders(reader));
}
- private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) throws IOException {
+ private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) {
final List<AtomicReaderContext> leaves = reader.getTopReaderContext().leaves();
final FakeDeleteAtomicIndexReader[] subs = new FakeDeleteAtomicIndexReader[leaves.size()];
int i = 0;
@@ -206,7 +206,7 @@ public class MultiPassIndexSplitter {
}
@Override
- protected void doClose() throws IOException {}
+ protected void doClose() {}
// no need to override numDocs/hasDeletions,
// as we pass the subreaders directly to IW.addIndexes().
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java Thu Jun 28 16:39:25 2012
@@ -199,7 +199,7 @@ public class NativeUnixDirectory extends
//}
@Override
- public void flush() throws IOException {
+ public void flush() {
// TODO -- I don't think this method is necessary?
}
@@ -257,7 +257,7 @@ public class NativeUnixDirectory extends
}
@Override
- public long length() throws IOException {
+ public long length() {
return fileLength + bufferPos;
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Thu Jun 28 16:39:25 2012
@@ -290,7 +290,7 @@ public class CustomScoreQuery extends Qu
// constructor
private CustomScorer(CustomScoreProvider provider, CustomWeight w, float qWeight,
- Scorer subQueryScorer, Scorer[] valSrcScorers) throws IOException {
+ Scorer subQueryScorer, Scorer[] valSrcScorers) {
super(w);
this.qWeight = qWeight;
this.subQueryScorer = subQueryScorer;
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Thu Jun 28 16:39:25 2012
@@ -87,12 +87,12 @@ public class TFValueSource extends TermF
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return DocIdSetIterator.NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
return DocIdSetIterator.NO_MORE_DOCS;
}
};
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Thu Jun 28 16:39:25 2012
@@ -80,12 +80,12 @@ public class TermFreqValueSource extends
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return DocIdSetIterator.NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
return DocIdSetIterator.NO_MORE_DOCS;
}
};
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Thu Jun 28 16:39:25 2012
@@ -20,8 +20,16 @@ package org.apache.lucene.queries;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.FunctionTestSetup;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.FieldCache;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.TopDocs;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
@@ -178,7 +186,7 @@ public class TestCustomScoreQuery extend
final int[] values = FieldCache.DEFAULT.getInts(context.reader(), INT_FIELD, false);
return new CustomScoreProvider(context) {
@Override
- public float customScore(int doc, float subScore, float valSrcScore) throws IOException {
+ public float customScore(int doc, float subScore, float valSrcScore) {
assertTrue(doc <= context.reader().maxDoc());
return values[doc];
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java Thu Jun 28 16:39:25 2012
@@ -17,12 +17,15 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.valuesource.OrdFieldSource;
import org.apache.lucene.queries.function.valuesource.ReverseOrdFieldSource;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -48,7 +51,7 @@ public class TestOrdValues extends Funct
* Test OrdFieldSource
*/
@Test
- public void testOrdFieldRank() throws CorruptIndexException, Exception {
+ public void testOrdFieldRank() throws Exception {
doTestRank(ID_FIELD, true);
}
@@ -56,12 +59,12 @@ public class TestOrdValues extends Funct
* Test ReverseOrdFieldSource
*/
@Test
- public void testReverseOrdFieldRank() throws CorruptIndexException, Exception {
+ public void testReverseOrdFieldRank() throws Exception {
doTestRank(ID_FIELD, false);
}
// Test that queries based on reverse/ordFieldScore scores correctly
- private void doTestRank(String field, boolean inOrder) throws CorruptIndexException, Exception {
+ private void doTestRank(String field, boolean inOrder) throws Exception {
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = new IndexSearcher(r);
ValueSource vs;
@@ -98,7 +101,7 @@ public class TestOrdValues extends Funct
* Test exact score for OrdFieldSource
*/
@Test
- public void testOrdFieldExactScore() throws CorruptIndexException, Exception {
+ public void testOrdFieldExactScore() throws Exception {
doTestExactScore(ID_FIELD, true);
}
@@ -106,13 +109,13 @@ public class TestOrdValues extends Funct
* Test exact score for ReverseOrdFieldSource
*/
@Test
- public void testReverseOrdFieldExactScore() throws CorruptIndexException, Exception {
+ public void testReverseOrdFieldExactScore() throws Exception {
doTestExactScore(ID_FIELD, false);
}
// Test that queries based on reverse/ordFieldScore returns docs with expected score.
- private void doTestExactScore(String field, boolean inOrder) throws CorruptIndexException, Exception {
+ private void doTestExactScore(String field, boolean inOrder) throws Exception {
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = new IndexSearcher(r);
ValueSource vs;
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java Thu Jun 28 16:39:25 2012
@@ -478,11 +478,7 @@ public abstract class QueryParserBase {
PositionIncrementAttribute posIncrAtt = null;
int numTokens = 0;
- try {
- buffer.reset();
- } catch (IOException e) {
- throw new ParseException("Unable to initialize TokenStream to analyze query text", e);
- }
+ buffer.reset();
if (buffer.hasAttribute(TermToBytesRefAttribute.class)) {
termAtt = buffer.getAttribute(TermToBytesRefAttribute.class);
@@ -1072,7 +1068,7 @@ public abstract class QueryParserBase {
}
// extracted from the .jj grammar
- Query handleBoost(Query q, Token boost) throws ParseException {
+ Query handleBoost(Query q, Token boost) {
if (boost != null) {
float f = (float) 1.0;
try {
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java Thu Jun 28 16:39:25 2012
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.lucene.queryparser.flexible.messages.MessageImpl;
import org.apache.lucene.queryparser.flexible.core.QueryNodeError;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax;
@@ -43,10 +42,8 @@ public class BoostQueryNode extends Quer
* the query to be boosted
* @param value
* the boost value, it may vary from 0.0 to 1.0
- *
- * @throws QueryNodeException
*/
- public BoostQueryNode(QueryNode query, float value) throws QueryNodeException {
+ public BoostQueryNode(QueryNode query, float value) {
if (query == null) {
throw new QueryNodeError(new MessageImpl(
QueryParserMessages.NODE_ACTION_NOT_SUPPORTED, "query", "null"));
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java Thu Jun 28 16:39:25 2012
@@ -19,23 +19,17 @@ package org.apache.lucene.queryparser.fl
import org.apache.lucene.queryparser.flexible.messages.MessageImpl;
import org.apache.lucene.queryparser.flexible.core.QueryNodeError;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
public class PhraseSlopQueryNode extends QueryNodeImpl implements FieldableNode {
private int value = 0;
/**
- * @throws QueryNodeException
- * @throws QueryNodeParseException
- * @exception QueryNodeParseException
- * throw in overridden method to disallow
+ * @exception QueryNodeError throw in overridden method to disallow
*/
- public PhraseSlopQueryNode(QueryNode query, int value)
- throws QueryNodeException {
+ public PhraseSlopQueryNode(QueryNode query, int value) {
if (query == null) {
throw new QueryNodeError(new MessageImpl(
QueryParserMessages.NODE_ACTION_NOT_SUPPORTED, "query", "null"));
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java Thu Jun 28 16:39:25 2012
@@ -83,8 +83,7 @@ public class BooleanQueryNodeBuilder imp
}
- private static BooleanClause.Occur getModifierValue(QueryNode node)
- throws QueryNodeException {
+ private static BooleanClause.Occur getModifierValue(QueryNode node) {
if (node instanceof ModifierQueryNode) {
ModifierQueryNode mNode = ((ModifierQueryNode) node);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java Thu Jun 28 16:39:25 2012
@@ -84,8 +84,7 @@ public class StandardBooleanQueryNodeBui
}
- private static BooleanClause.Occur getModifierValue(QueryNode node)
- throws QueryNodeException {
+ private static BooleanClause.Occur getModifierValue(QueryNode node) {
if (node instanceof ModifierQueryNode) {
ModifierQueryNode mNode = ((ModifierQueryNode) node);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java Thu Jun 28 16:39:25 2012
@@ -97,7 +97,7 @@ public class QueryTemplateManager {
* Fast means of constructing query using a precompiled stylesheet
*/
public static String getQueryAsXmlString(Properties formProperties, Templates template)
- throws SAXException, IOException, ParserConfigurationException, TransformerException {
+ throws ParserConfigurationException, TransformerException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
StreamResult result = new StreamResult(baos);
transformCriteria(formProperties, template, result);
@@ -120,7 +120,7 @@ public class QueryTemplateManager {
* Fast means of constructing query using a cached,precompiled stylesheet
*/
public static Document getQueryAsDOM(Properties formProperties, Templates template)
- throws SAXException, IOException, ParserConfigurationException, TransformerException {
+ throws ParserConfigurationException, TransformerException {
DOMResult result = new DOMResult();
transformCriteria(formProperties, template, result);
return (Document) result.getNode();
@@ -159,13 +159,13 @@ public class QueryTemplateManager {
* Fast transformation using a pre-compiled stylesheet (suitable for production environments)
*/
public static void transformCriteria(Properties formProperties, Templates template, Result result)
- throws SAXException, IOException, ParserConfigurationException, TransformerException {
+ throws ParserConfigurationException, TransformerException {
transformCriteria(formProperties, template.newTransformer(), result);
}
public static void transformCriteria(Properties formProperties, Transformer transformer, Result result)
- throws SAXException, IOException, ParserConfigurationException, TransformerException {
+ throws ParserConfigurationException, TransformerException {
dbf.setNamespaceAware(true);
//Create an XML document representing the search index document.
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java Thu Jun 28 16:39:25 2012
@@ -18,7 +18,6 @@ package org.apache.lucene.queryparser.cl
*/
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
@@ -67,7 +66,7 @@ public class TestMultiPhraseQueryParsing
}
@Override
- public final boolean incrementToken() throws IOException {
+ public final boolean incrementToken() {
clearAttributes();
if (upto < tokens.length) {
final TokenAndPos token = tokens[upto++];
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java Thu Jun 28 16:39:25 2012
@@ -446,7 +446,7 @@ public class TestPrecedenceQueryParser e
}
/** for testing DateTools support */
- private String getDate(Date d, DateTools.Resolution resolution) throws Exception {
+ private String getDate(Date d, DateTools.Resolution resolution) {
return DateTools.dateToString(d, resolution);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Thu Jun 28 16:39:25 2012
@@ -680,8 +680,7 @@ public class TestQPHelper extends Lucene
}
/** for testing DateTools support */
- private String getDate(Date d, DateTools.Resolution resolution)
- throws Exception {
+ private String getDate(Date d, DateTools.Resolution resolution) {
return DateTools.dateToString(d, resolution);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Thu Jun 28 16:39:25 2012
@@ -586,7 +586,7 @@ public abstract class QueryParserTestBas
}
/** for testing DateTools support */
- private String getDate(Date d, DateTools.Resolution resolution) throws Exception {
+ private String getDate(Date d, DateTools.Resolution resolution) {
return DateTools.dateToString(d, resolution);
}
@@ -936,13 +936,13 @@ public abstract class QueryParserTestBas
final int[] type = new int[1];
QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)) {
@Override
- protected Query getWildcardQuery(String field, String termStr) throws ParseException {
+ protected Query getWildcardQuery(String field, String termStr) {
// override error checking of superclass
type[0]=1;
return new TermQuery(new Term(field,termStr));
}
@Override
- protected Query getPrefixQuery(String field, String termStr) throws ParseException {
+ protected Query getPrefixQuery(String field, String termStr) {
// override error checking of superclass
type[0]=2;
return new TermQuery(new Term(field,termStr));
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeTermsEnum.java Thu Jun 28 16:39:25 2012
@@ -63,11 +63,9 @@ public class SlowCollatedTermRangeTermsE
* The collator to use to collate index Terms, to determine their
* membership in the range bounded by <code>lowerTerm</code> and
* <code>upperTerm</code>.
- *
- * @throws IOException
*/
public SlowCollatedTermRangeTermsEnum(TermsEnum tenum, String lowerTermText, String upperTermText,
- boolean includeLower, boolean includeUpper, Collator collator) throws IOException {
+ boolean includeLower, boolean includeUpper, Collator collator) {
super(tenum);
this.collator = collator;
this.upperTermText = upperTermText;
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexTermsEnum.java Thu Jun 28 16:39:25 2012
@@ -23,8 +23,6 @@ import org.apache.lucene.index.TermsEnum
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.StringHelper;
-import java.io.IOException;
-
/**
* Subclass of FilteredTermEnum for enumerating all terms that match the
* specified regular expression term using the specified regular expression
@@ -39,7 +37,7 @@ public class RegexTermsEnum extends Filt
private RegexCapabilities.RegexMatcher regexImpl;
private final BytesRef prefixRef;
- public RegexTermsEnum(TermsEnum tenum, Term term, RegexCapabilities regexCap) throws IOException {
+ public RegexTermsEnum(TermsEnum tenum, Term term, RegexCapabilities regexCap) {
super(tenum);
String text = term.text();
this.regexImpl = regexCap.compile(text);
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Thu Jun 28 16:39:25 2012
@@ -1,6 +1,5 @@
package org.apache.lucene.sandbox.queries;
-import java.io.IOException;
import java.text.Collator;
import java.util.Locale;
@@ -90,7 +89,7 @@ public class TestSlowCollationMethods ex
public void testSort() throws Exception {
SortField sf = new SortField("field", new FieldComparatorSource() {
@Override
- public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
+ public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed) {
return new SlowCollatedStringComparator(numHits, fieldname, collator);
}
});
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java Thu Jun 28 16:39:25 2012
@@ -34,7 +34,6 @@ import org.apache.lucene.spatial.prefix.
import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import org.apache.lucene.spatial.util.CachedDistanceValueSource;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -126,7 +125,7 @@ public abstract class PrefixTreeStrategy
CharSequence nextTokenStringNeedingLeaf = null;
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
clearAttributes();
if (nextTokenStringNeedingLeaf != null) {
termAtt.append(nextTokenStringNeedingLeaf);
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/BytesRefList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/BytesRefList.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/BytesRefList.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/BytesRefList.java Thu Jun 28 16:39:25 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.search.suggest
* the License.
*/
-import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
@@ -190,7 +189,7 @@ public final class BytesRefList {
int pos = 0;
@Override
- public BytesRef next() throws IOException {
+ public BytesRef next() {
if (pos < size) {
return get(spare, ords == null ? pos++ : ords[pos++]);
}
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Thu Jun 28 16:39:25 2012
@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -103,7 +102,7 @@ public class TestSpellChecker extends Lu
}
- public void testBuild() throws CorruptIndexException, IOException {
+ public void testBuild() throws IOException {
IndexReader r = DirectoryReader.open(userindex);
spellChecker.clearIndex();
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java Thu Jun 28 16:39:25 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.search.suggest
* limitations under the License.
*/
-import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
@@ -50,7 +49,7 @@ public final class TermFreqArrayIterator
}
@Override
- public BytesRef next() throws IOException {
+ public BytesRef next() {
if (i.hasNext()) {
current = i.next();
spare.copyBytes(current.term);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java Thu Jun 28 16:39:25 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
@@ -42,7 +40,7 @@ public final class CannedTokenStream ext
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if (upto < tokens.length) {
final Token token = tokens[upto++];
// TODO: can we just capture/restoreState so
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/EmptyTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/EmptyTokenizer.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/EmptyTokenizer.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/EmptyTokenizer.java Thu Jun 28 16:39:25 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
-import java.io.IOException;
import java.io.Reader;
/**
@@ -30,7 +29,7 @@ public final class EmptyTokenizer extend
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
return false;
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java Thu Jun 28 16:39:25 2012
@@ -84,7 +84,7 @@ public class MockFixedIntBlockPostingsFo
return new FixedIntBlockIndexInput(dir.openInput(fileName, context)) {
@Override
- protected BlockReader getBlockReader(final IndexInput in, final int[] buffer) throws IOException {
+ protected BlockReader getBlockReader(final IndexInput in, final int[] buffer) {
return new BlockReader() {
public void seek(long pos) {}
public void readBlock() throws IOException {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java Thu Jun 28 16:39:25 2012
@@ -85,7 +85,7 @@ public class MockVariableIntBlockPosting
return new VariableIntBlockIndexInput(in) {
@Override
- protected BlockReader getBlockReader(final IndexInput in, final int[] buffer) throws IOException {
+ protected BlockReader getBlockReader(final IndexInput in, final int[] buffer) {
return new BlockReader() {
public void seek(long pos) {}
public int readBlock() throws IOException {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Thu Jun 28 16:39:25 2012
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Set;
-import org.apache.lucene.index.FilterAtomicReader;
-
public final class FieldFilterAtomicReader extends FilterAtomicReader {
private final Set<String> fields;
@@ -63,7 +61,7 @@ public final class FieldFilterAtomicRead
}
@Override
- public void document(final int docID, final StoredFieldVisitor visitor) throws CorruptIndexException, IOException {
+ public void document(final int docID, final StoredFieldVisitor visitor) throws IOException {
super.document(docID, new StoredFieldVisitor() {
@Override
public void binaryField(FieldInfo fieldInfo, byte[] value, int offset, int length) throws IOException {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java Thu Jun 28 16:39:25 2012
@@ -60,7 +60,7 @@ public class MockRandomMergePolicy exten
@Override
public MergeSpecification findForcedMerges(
SegmentInfos segmentInfos, int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge)
- throws CorruptIndexException, IOException {
+ throws IOException {
final List<SegmentInfoPerCommit> eligibleSegments = new ArrayList<SegmentInfoPerCommit>();
for(SegmentInfoPerCommit info : segmentInfos) {
@@ -96,9 +96,7 @@ public class MockRandomMergePolicy exten
}
@Override
- public MergeSpecification findForcedDeletesMerges(
- SegmentInfos segmentInfos)
- throws CorruptIndexException, IOException {
+ public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) throws IOException {
return findMerges(segmentInfos);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Thu Jun 28 16:39:25 2012
@@ -326,28 +326,28 @@ public class RandomIndexWriter implement
maybeCommit();
}
- public void addIndexes(Directory... dirs) throws CorruptIndexException, IOException {
+ public void addIndexes(Directory... dirs) throws IOException {
w.addIndexes(dirs);
}
- public void addIndexes(IndexReader... readers) throws CorruptIndexException, IOException {
+ public void addIndexes(IndexReader... readers) throws IOException {
w.addIndexes(readers);
}
- public void deleteDocuments(Term term) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Term term) throws IOException {
w.deleteDocuments(term);
}
- public void deleteDocuments(Query q) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Query q) throws IOException {
w.deleteDocuments(q);
}
- public void commit() throws CorruptIndexException, IOException {
+ public void commit() throws IOException {
w.commit();
switchDoDocValues();
}
- public int numDocs() throws IOException {
+ public int numDocs() {
return w.numDocs();
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Thu Jun 28 16:39:25 2012
@@ -117,8 +117,7 @@ public abstract class ThreadedIndexingAn
final long stopTime,
final Set<String> delIDs,
final Set<String> delPackIDs,
- final List<SubDocs> allSubDocs)
- throws Exception {
+ final List<SubDocs> allSubDocs) {
final Thread[] threads = new Thread[numThreads];
for(int thread=0;thread<numThreads;thread++) {
threads[thread] = new Thread() {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java Thu Jun 28 16:39:25 2012
@@ -91,7 +91,7 @@ public class AssertingIndexSearcher exte
}
@Override
- public float getValueForNormalization() throws IOException {
+ public float getValueForNormalization() {
throw new IllegalStateException("Weight already normalized.");
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java Thu Jun 28 16:39:25 2012
@@ -27,7 +27,6 @@ import junit.framework.Assert;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
/**
@@ -185,8 +184,7 @@ public class CheckHits {
}
/** Tests that a Hits has an expected order of documents */
- public static void checkDocIds(String mes, int[] results, ScoreDoc[] hits)
- throws IOException {
+ public static void checkDocIds(String mes, int[] results, ScoreDoc[] hits) {
Assert.assertEquals(mes + " nr of hits", hits.length, results.length);
for (int i = 0; i < results.length; i++) {
Assert.assertEquals(mes + " doc nrs for hit " + i, results[i], hits[i].doc);
@@ -200,15 +198,14 @@ public class CheckHits {
Query query,
ScoreDoc[] hits1,
ScoreDoc[] hits2,
- int[] results)
- throws IOException {
+ int[] results) {
checkDocIds("hits1", results, hits1);
checkDocIds("hits2", results, hits2);
checkEqual(query, hits1, hits2);
}
- public static void checkEqual(Query query, ScoreDoc[] hits1, ScoreDoc[] hits2) throws IOException {
+ public static void checkEqual(Query query, ScoreDoc[] hits1, ScoreDoc[] hits2) {
final float scoreTolerance = 1.0e-6f;
if (hits1.length != hits2.length) {
Assert.fail("Unequal lengths: hits1="+hits1.length+",hits2="+hits2.length);
@@ -231,7 +228,7 @@ public class CheckHits {
}
}
- public static String hits2str(ScoreDoc[] hits1, ScoreDoc[] hits2, int start, int end) throws IOException {
+ public static String hits2str(ScoreDoc[] hits1, ScoreDoc[] hits2, int start, int end) {
StringBuilder sb = new StringBuilder();
int len1=hits1==null ? 0 : hits1.length;
int len2=hits2==null ? 0 : hits2.length;
@@ -422,7 +419,7 @@ public class CheckHits {
* @see ExplanationAsserter
*/
public static class ExplanationAssertingSearcher extends IndexSearcher {
- public ExplanationAssertingSearcher(IndexReader r) throws IOException {
+ public ExplanationAssertingSearcher(IndexReader r) {
super(r);
}
protected void checkExplanations(Query q) throws IOException {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java Thu Jun 28 16:39:25 2012
@@ -141,7 +141,7 @@ public class QueryUtils {
public static class FCInvisibleMultiReader extends MultiReader {
private final Object cacheKey = new Object();
- public FCInvisibleMultiReader(IndexReader... readers) throws IOException {
+ public FCInvisibleMultiReader(IndexReader... readers) {
super(readers);
}
@@ -268,7 +268,7 @@ public class QueryUtils {
private int leafPtr;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.sc = scorer;
}
@@ -375,7 +375,7 @@ public class QueryUtils {
private int leafPtr;
private Bits liveDocs;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Thu Jun 28 16:39:25 2012
@@ -282,7 +282,7 @@ public class MockDirectoryWrapper extend
}
}
- public synchronized void clearCrash() throws IOException {
+ public synchronized void clearCrash() {
crashed = false;
openLocks.clear();
}
@@ -617,7 +617,7 @@ public class MockDirectoryWrapper extend
* checkIndex() or not. It might mask real problems, where we silently
* don't checkindex at all. instead we look for a segments file.
*/
- private boolean indexPossiblyExists(Directory d) throws IOException {
+ private boolean indexPossiblyExists(Directory d) {
String files[];
try {
files = d.listAll();
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java Thu Jun 28 16:39:25 2012
@@ -1,7 +1,6 @@
package org.apache.lucene.util;
import java.io.Closeable;
-import java.io.IOException;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.junit.Assert;
@@ -39,7 +38,7 @@ final class CloseableDirectory implement
}
@Override
- public void close() throws IOException {
+ public void close() {
// We only attempt to check open/closed state if there were no other test
// failures.
try {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Jun 28 16:39:25 2012
@@ -755,7 +755,7 @@ public abstract class LuceneTestCase ext
* some features of Windows, such as not allowing open files to be
* overwritten.
*/
- public static MockDirectoryWrapper newDirectory() throws IOException {
+ public static MockDirectoryWrapper newDirectory() {
return newDirectory(random());
}
@@ -763,7 +763,7 @@ public abstract class LuceneTestCase ext
* Returns a new Directory instance, using the specified random.
* See {@link #newDirectory()} for more information.
*/
- public static MockDirectoryWrapper newDirectory(Random r) throws IOException {
+ public static MockDirectoryWrapper newDirectory(Random r) {
Directory impl = newDirectoryImpl(r, TEST_DIRECTORY);
MockDirectoryWrapper dir = new MockDirectoryWrapper(r, maybeNRTWrap(r, impl));
closeAfterSuite(new CloseableDirectory(dir, suiteFailureMarker));
@@ -785,12 +785,12 @@ public abstract class LuceneTestCase ext
}
/** Returns a new FSDirectory instance over the given file, which must be a folder. */
- public static MockDirectoryWrapper newFSDirectory(File f) throws IOException {
+ public static MockDirectoryWrapper newFSDirectory(File f) {
return newFSDirectory(f, null);
}
/** Returns a new FSDirectory instance over the given file, which must be a folder. */
- public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) throws IOException {
+ public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) {
String fsdirClass = TEST_DIRECTORY;
if (fsdirClass.equals("random")) {
fsdirClass = RandomPicks.randomFrom(random(), FS_DIRECTORIES);
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Thu Jun 28 16:39:25 2012
@@ -147,7 +147,7 @@ public class CarrotClusteringEngine exte
final IResource foundResource = new IResource() {
@Override
- public InputStream open() throws IOException {
+ public InputStream open() {
return new ByteArrayInputStream(asBytes);
}
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java Thu Jun 28 16:39:25 2012
@@ -180,7 +180,7 @@ public class LuceneCarrot2StemmerFactory
private char[] buffer = new char[0];
- private LuceneStemmerAdapter() throws Exception {
+ private LuceneStemmerAdapter() {
delegate = new org.apache.lucene.analysis.ar.ArabicStemmer();
normalizer = new org.apache.lucene.analysis.ar.ArabicNormalizer();
}
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java Thu Jun 28 16:39:25 2012
@@ -141,7 +141,7 @@ public class LuceneCarrot2TokenizerFacto
array.reset(term.buffer(), 0, term.length());
}
- public void reset(Reader input) throws IOException {
+ public void reset(Reader input) {
try {
sentenceTokenizer.reset(input);
wordTokenFilter = (TokenStream) tokenFilterClass.getConstructor(
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java Thu Jun 28 16:39:25 2012
@@ -39,7 +39,7 @@ public class DuplicatingTokenizerFactory
}
@Override
- public void reset(Reader input) throws IOException {
+ public void reset(Reader input) {
delegate.reset(input);
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java Thu Jun 28 16:39:25 2012
@@ -46,7 +46,7 @@ public class TestErrorHandling extends A
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Thu Jun 28 16:39:25 2012
@@ -101,13 +101,13 @@ public class TestSolrEntityProcessorEndT
//TODO: fix this test to close its directories
static String savedFactory;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java Thu Jun 28 16:39:25 2012
@@ -22,7 +22,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
-import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -70,7 +69,7 @@ public class TestSqlEntityProcessorDelta
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {