Only takes effect when IndexWriter is first created. */ public IndexWriterConfig setOpenMode(OpenMode openMode) { + if (openMode == null) { + throw new IllegalArgumentException("openMode must not be null"); + } this.openMode = openMode; return this; } @@ -187,13 +189,15 @@ * like NFS that do not support "delete on last close" semantics, which * Lucene's "point in time" search normally relies on. *
- * NOTE: the deletion policy cannot be null. If null is
- * passed, the deletion policy will be set to the default.
+ * NOTE: the deletion policy cannot be null.
*
*
Only takes effect when IndexWriter is first created. */ public IndexWriterConfig setIndexDeletionPolicy(IndexDeletionPolicy delPolicy) { - this.delPolicy = delPolicy == null ? new KeepOnlyLastCommitDeletionPolicy() : delPolicy; + if (delPolicy == null) { + throw new IllegalArgumentException("indexDeletionPolicy must not be null"); + } + this.delPolicy = delPolicy; return this; } @@ -220,12 +224,14 @@ /** * Expert: set the {@link Similarity} implementation used by this IndexWriter. *
- * NOTE: the similarity cannot be null. If null is passed,
- * the similarity will be set to the default implementation (unspecified).
+ * NOTE: the similarity cannot be null.
*
*
Only takes effect when IndexWriter is first created. */ public IndexWriterConfig setSimilarity(Similarity similarity) { - this.similarity = similarity == null ? IndexSearcher.getDefaultSimilarity() : similarity; + if (similarity == null) { + throw new IllegalArgumentException("similarity must not be null"); + } + this.similarity = similarity; return this; } @@ -238,12 +244,14 @@ * Expert: sets the merge scheduler used by this writer. The default is * {@link ConcurrentMergeScheduler}. *
- * NOTE: the merge scheduler cannot be null. If null is
- * passed, the merge scheduler will be set to the default.
+ * NOTE: the merge scheduler cannot be null.
*
*
Only takes effect when IndexWriter is first created. */ public IndexWriterConfig setMergeScheduler(MergeScheduler mergeScheduler) { - this.mergeScheduler = mergeScheduler == null ? new ConcurrentMergeScheduler() : mergeScheduler; + if (mergeScheduler == null) { + throw new IllegalArgumentException("mergeScheduler must not be null"); + } + this.mergeScheduler = mergeScheduler; return this; } @@ -272,12 +280,14 @@ * Expert: {@link MergePolicy} is invoked whenever there are changes to the * segments in the index. Its role is to select which merges to do, if any, * and return a {@link MergePolicy.MergeSpecification} describing the merges. - * It also selects merges to do for forceMerge. (The default is - * {@link LogByteSizeMergePolicy}. + * It also selects merges to do for forceMerge. * *
Only takes effect when IndexWriter is first created. */ public IndexWriterConfig setMergePolicy(MergePolicy mergePolicy) { - this.mergePolicy = mergePolicy == null ? new LogByteSizeMergePolicy() : mergePolicy; + if (mergePolicy == null) { + throw new IllegalArgumentException("mergePolicy must not be null"); + } + this.mergePolicy = mergePolicy; return this; } @@ -289,7 +299,7 @@ */ public IndexWriterConfig setCodec(Codec codec) { if (codec == null) { - throw new NullPointerException(); + throw new IllegalArgumentException("codec must not be null"); } this.codec = codec; return this; @@ -378,7 +388,10 @@ * *
Only takes effect when IndexWriter is first created. */ IndexWriterConfig setIndexingChain(IndexingChain indexingChain) { - this.indexingChain = indexingChain == null ? DocumentsWriterPerThread.defaultIndexingChain : indexingChain; + if (indexingChain == null) { + throw new IllegalArgumentException("indexingChain must not be null"); + } + this.indexingChain = indexingChain; return this; } @@ -396,6 +409,9 @@ * @see #setRAMBufferSizeMB(double) */ IndexWriterConfig setFlushPolicy(FlushPolicy flushPolicy) { + if (flushPolicy == null) { + throw new IllegalArgumentException("flushPolicy must not be null"); + } this.flushPolicy = flushPolicy; return this; } @@ -484,7 +500,10 @@ /** Convenience method that uses {@link PrintStreamInfoStream} */ public IndexWriterConfig setInfoStream(PrintStream printStream) { - return setInfoStream(printStream == null ? InfoStream.NO_OUTPUT : new PrintStreamInfoStream(printStream)); + if (printStream == null) { + throw new IllegalArgumentException("printStream must not be null"); + } + return setInfoStream(new PrintStreamInfoStream(printStream)); } @Override Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (révision 1456447) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (copie de travail) @@ -231,30 +231,46 @@ assertEquals(KeepOnlyLastCommitDeletionPolicy.class, conf.getIndexDeletionPolicy().getClass()); conf.setIndexDeletionPolicy(new SnapshotDeletionPolicy(null)); assertEquals(SnapshotDeletionPolicy.class, conf.getIndexDeletionPolicy().getClass()); - conf.setIndexDeletionPolicy(null); - assertEquals(KeepOnlyLastCommitDeletionPolicy.class, conf.getIndexDeletionPolicy().getClass()); + try { + conf.setIndexDeletionPolicy(null); + fail(); + } catch (IllegalArgumentException e) { + // ok + } // Test MergeScheduler assertEquals(ConcurrentMergeScheduler.class, conf.getMergeScheduler().getClass()); conf.setMergeScheduler(new SerialMergeScheduler()); assertEquals(SerialMergeScheduler.class, conf.getMergeScheduler().getClass()); - conf.setMergeScheduler(null); - assertEquals(ConcurrentMergeScheduler.class, conf.getMergeScheduler().getClass()); + try { + conf.setMergeScheduler(null); + fail(); + } catch (IllegalArgumentException e) { + // ok + } // Test Similarity: // we shouldnt assert what the default is, just that its not null. assertTrue(IndexSearcher.getDefaultSimilarity() == conf.getSimilarity()); conf.setSimilarity(new MySimilarity()); assertEquals(MySimilarity.class, conf.getSimilarity().getClass()); - conf.setSimilarity(null); - assertTrue(IndexSearcher.getDefaultSimilarity() == conf.getSimilarity()); + try { + conf.setSimilarity(null); + fail(); + } catch (IllegalArgumentException e) { + // ok + } // Test IndexingChain assertTrue(DocumentsWriterPerThread.defaultIndexingChain == conf.getIndexingChain()); conf.setIndexingChain(new MyIndexingChain()); assertEquals(MyIndexingChain.class, conf.getIndexingChain().getClass()); - conf.setIndexingChain(null); - assertTrue(DocumentsWriterPerThread.defaultIndexingChain == conf.getIndexingChain()); + try { + conf.setIndexingChain(null); + fail(); + } catch (IllegalArgumentException e) { + // ok + } try { conf.setMaxBufferedDeleteTerms(0); @@ -324,8 +340,12 @@ assertEquals(TieredMergePolicy.class, conf.getMergePolicy().getClass()); conf.setMergePolicy(new LogDocMergePolicy()); assertEquals(LogDocMergePolicy.class, conf.getMergePolicy().getClass()); - conf.setMergePolicy(null); - assertEquals(LogByteSizeMergePolicy.class, conf.getMergePolicy().getClass()); + try { + conf.setMergePolicy(null); + fail(); + } catch (IllegalArgumentException e) { + // ok + } } public void testLiveChangeToCFS() throws Exception {