Apache Lucene open-source search software
Replace consecutive close() calls and close() calls with null checks with IOUtils.close() (#12428)
Shubham Chaudhary368dbffef3d2
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 0e495247936..266a9958ba2 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -206,6 +206,9 @@ Other* GITHUB#12410: Refactor vectorization support (split provider from implementation classes).(Uwe Schindler, Chris Hegarty)+* GITHUB#12428: Replace consecutive close() calls and close() calls with null checks with IOUtils.close().+ (Shubham Chaudhary)+======================== Lucene 9.7.0 =======================API Changesdiff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.javaindex e33443415d6..2e3e3b4eddf 100644--- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java+++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java@@ -35,6 +35,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;/** trivial test of ICUCollationDocValuesField */public class TestICUCollationDocValuesField extends LuceneTestCase {@@ -68,8 +69,7 @@ public class TestICUCollationDocValuesField extends LuceneTestCase {StoredFields storedFields = ir.storedFields();assertEquals("abc", storedFields.document(td.scoreDocs[0].doc).get("field"));assertEquals("ABC", storedFields.document(td.scoreDocs[1].doc).get("field"));- ir.close();- dir.close();+ IOUtils.close(ir, dir);}public void testRanges() throws Exception {@@ -107,8 +107,7 @@ public class TestICUCollationDocValuesField extends LuceneTestCase {doTestRanges(is, start, end, lowerVal, upperVal, collator);}- ir.close();- dir.close();+ IOUtils.close(ir, dir);}private void doTestRanges(diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.javaindex 581898cd904..5c346664bf5 100644--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java@@ -163,10 +163,8 @@ public class PerfRunData implements Closeable {@Overridepublic void close() throws IOException {- if (indexWriter != null) {- indexWriter.close();- }IOUtils.close(+ indexWriter,indexReader,directory,taxonomyWriter,@@ -190,10 +188,7 @@ public class PerfRunData implements Closeable {public void reinit(boolean eraseIndex) throws Exception {// cleanup index- if (indexWriter != null) {- indexWriter.close();- }- IOUtils.close(indexReader, directory);+ IOUtils.close(indexWriter, indexReader, directory);indexWriter = null;indexReader = null;diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.javaindex d55a6a762f0..be0a6e8ffb5 100644--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java@@ -303,10 +303,8 @@ public class EnwikiContentSource extends ContentSource {public void close() throws IOException {synchronized (EnwikiContentSource.this) {parser.stop();- if (is != null) {- is.close();- is = null;- }+ IOUtils.close(is);+ is = null;}}diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.javaindex 7b4ce3c1ed1..46828ae8364 100644--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java@@ -204,9 +204,7 @@ public class LineDocSource extends ContentSource {private synchronized void openFile() {try {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);InputStream is = StreamUtils.inputStream(file);reader = new BufferedReader(new InputStreamReader(is, encoding), StreamUtils.BUFFER_SIZE);if (skipHeaderLine) {@@ -219,10 +217,8 @@ public class LineDocSource extends ContentSource {@Overridepublic void close() throws IOException {- if (reader != null) {- reader.close();- reader = null;- }+ IOUtils.close(reader);+ reader = null;}@Overridediff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.javaindex 06a914dade9..ecc2d3cbd02 100644--- a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java+++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java@@ -39,6 +39,7 @@ import org.apache.lucene.search.grouping.GroupDocs;import org.apache.lucene.search.grouping.GroupingSearch;import org.apache.lucene.search.grouping.TopGroups;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/*** Utility class for creating training / test / cross validation indexes from the original index.@@ -174,10 +175,7 @@ public class DatasetSplitter {throw new IOException(e);} finally {// close IWs- testWriter.close();- cvWriter.close();- trainingWriter.close();- originalIndex.close();+ IOUtils.close(testWriter, cvWriter, trainingWriter, originalIndex);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.javaindex edc880fbee4..988a6eada9f 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java@@ -31,6 +31,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.After;import org.junit.Before;@@ -83,8 +84,7 @@ public abstract class ClassificationTestBase<T> extends LuceneTestCase {@Afterpublic void tearDown() throws Exception {super.tearDown();- indexWriter.close();- dir.close();+ IOUtils.close(indexWriter, dir);}protected ClassificationResult<T> checkCorrectClassification(diff --git a/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java b/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.javaindex 77c8d4f2fa4..6d5f5881a75 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java@@ -63,6 +63,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.NamedThreadFactory;import org.junit.Test;@@ -330,22 +331,7 @@ public final class Test20NewsgroupsClassification extends LuceneTestCase {service.shutdown();} finally {- if (reader != null) {- reader.close();- }- directory.close();- if (testReader != null) {- testReader.close();- }- if (test != null) {- test.close();- }- if (train != null) {- train.close();- }- if (cv != null) {- cv.close();- }+ IOUtils.close(reader, directory, testReader, test, train, cv);for (Classifier<BytesRef> c : classifiers) {if (c instanceof Closeable) {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.javaindex f6d538e80fb..aa9163d4adf 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java@@ -30,6 +30,7 @@ import org.apache.lucene.index.TermsEnum;import org.apache.lucene.search.TermQuery;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Tests for {@link BM25NBClassifier} */@@ -45,9 +46,7 @@ public class TestBM25NBClassifier extends ClassificationTestBase<BytesRef> {new BM25NBClassifier(leafReader, analyzer, null, categoryFieldName, textFieldName);checkCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -62,9 +61,7 @@ public class TestBM25NBClassifier extends ClassificationTestBase<BytesRef> {new BM25NBClassifier(leafReader, analyzer, query, categoryFieldName, textFieldName);checkCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -78,9 +75,7 @@ public class TestBM25NBClassifier extends ClassificationTestBase<BytesRef> {new BM25NBClassifier(leafReader, analyzer, null, categoryFieldName, textFieldName);checkCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.javaindex a6abd5796c8..dcec5864f13 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java@@ -25,6 +25,7 @@ import org.apache.lucene.index.TermsEnum;import org.apache.lucene.search.TermQuery;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.BooleanPerceptronClassifier} */@@ -42,9 +43,7 @@ public class TestBooleanPerceptronClassifier extends ClassificationTestBase<BoolcheckCorrectClassification(classifier, TECHNOLOGY_INPUT, false);checkCorrectClassification(classifier, POLITICS_INPUT, true);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -60,9 +59,7 @@ public class TestBooleanPerceptronClassifier extends ClassificationTestBase<BoolcheckCorrectClassification(classifier, TECHNOLOGY_INPUT, false);checkCorrectClassification(classifier, POLITICS_INPUT, true);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -79,9 +76,7 @@ public class TestBooleanPerceptronClassifier extends ClassificationTestBase<BoolcheckCorrectClassification(classifier, TECHNOLOGY_INPUT, false);checkCorrectClassification(classifier, POLITICS_INPUT, true);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.javaindex c4868c0549e..e12093a105d 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java@@ -30,6 +30,7 @@ import org.apache.lucene.index.TermsEnum;import org.apache.lucene.search.TermQuery;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.CachingNaiveBayesClassifier} */@@ -52,9 +53,7 @@ public class TestCachingNaiveBayesClassifier extends ClassificationTestBase<BytePOLITICS_INPUT,POLITICS_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -71,9 +70,7 @@ public class TestCachingNaiveBayesClassifier extends ClassificationTestBase<ByteTECHNOLOGY_INPUT,TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -89,9 +86,7 @@ public class TestCachingNaiveBayesClassifier extends ClassificationTestBase<ByteTECHNOLOGY_INPUT,TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.javaindex e4428ada7bd..19d614f730c 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java@@ -25,6 +25,7 @@ import org.apache.lucene.index.TermsEnum;import org.apache.lucene.search.TermQuery;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Tests for {@link KNearestFuzzyClassifier} */@@ -42,9 +43,7 @@ public class TestKNearestFuzzyClassifier extends ClassificationTestBase<BytesRefcheckCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);checkCorrectClassification(classifier, POLITICS_INPUT, POLITICS_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -60,9 +59,7 @@ public class TestKNearestFuzzyClassifier extends ClassificationTestBase<BytesRefleafReader, null, analyzer, query, 3, categoryFieldName, textFieldName);checkCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.javaindex 364758dc034..f437dc57556 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java@@ -30,6 +30,7 @@ import org.apache.lucene.search.similarities.BM25Similarity;import org.apache.lucene.search.similarities.LMDirichletSimilarity;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Testcase for {@link KNearestNeighborClassifier} */@@ -89,9 +90,7 @@ public class TestKNearestNeighborClassifier extends ClassificationTestBase<BytesTECHNOLOGY_RESULT);assertTrue(resultDS.getScore() != resultLMS.getScore());} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -117,9 +116,7 @@ public class TestKNearestNeighborClassifier extends ClassificationTestBase<BytesassertTrue(classes.get(0).getScore() > classes.get(1).getScore());checkCorrectClassification(knnClassifier, STRONG_TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -145,9 +142,7 @@ public class TestKNearestNeighborClassifier extends ClassificationTestBase<BytesassertTrue(classes.get(0).getScore() > classes.get(1).getScore());checkCorrectClassification(knnClassifier, SUPER_STRONG_TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -164,9 +159,7 @@ public class TestKNearestNeighborClassifier extends ClassificationTestBase<BytesTECHNOLOGY_INPUT,TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.javaindex 82c2b871c9c..dac15dfca2f 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java@@ -30,6 +30,7 @@ import org.apache.lucene.index.TermsEnum;import org.apache.lucene.search.TermQuery;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Testcase for {@link SimpleNaiveBayesClassifier} */@@ -47,9 +48,7 @@ public class TestSimpleNaiveBayesClassifier extends ClassificationTestBase<BytescheckCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);checkCorrectClassification(classifier, POLITICS_INPUT, POLITICS_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -66,9 +65,7 @@ public class TestSimpleNaiveBayesClassifier extends ClassificationTestBase<BytescheckCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);checkCorrectClassification(classifier, POLITICS_INPUT, POLITICS_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}@@ -83,9 +80,7 @@ public class TestSimpleNaiveBayesClassifier extends ClassificationTestBase<BytesleafReader, analyzer, null, categoryFieldName, textFieldName);checkCorrectClassification(classifier, TECHNOLOGY_INPUT, TECHNOLOGY_RESULT);} finally {- if (leafReader != null) {- leafReader.close();- }+ IOUtils.close(leafReader);}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.javaindex 1432fb9c0c9..926b831d35c 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.java@@ -20,6 +20,7 @@ import org.apache.lucene.document.Document;import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Tests for {@link org.apache.lucene.classification.KNearestNeighborClassifier} */@@ -74,9 +75,7 @@ public class TestKNearestNeighborDocumentClassifierVIDEOGAME_RESULT);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}@@ -134,9 +133,7 @@ public class TestKNearestNeighborDocumentClassifierVIDEOGAME_RESULT);assertEquals(1.0, score4, 0);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}@@ -171,9 +168,7 @@ public class TestKNearestNeighborDocumentClassifiergetBatmanAmbiguosDocument(),VIDEOGAME_RESULT);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}@@ -208,9 +203,7 @@ public class TestKNearestNeighborDocumentClassifiergetBatmanDocument(),VIDEOGAME_RESULT);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.javaindex 8e497983c5c..5aa6f2d183d 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.java@@ -17,6 +17,7 @@package org.apache.lucene.classification.document;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Tests for {@link org.apache.lucene.classification.SimpleNaiveBayesClassifier} */@@ -56,9 +57,7 @@ public class TestSimpleNaiveBayesDocumentClassifiergetBatmanDocument(),VIDEOGAME_ANALYZED_RESULT);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}@@ -111,9 +110,7 @@ public class TestSimpleNaiveBayesDocumentClassifierVIDEOGAME_ANALYZED_RESULT);assertEquals(0.52, score4, 0.01);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}@@ -140,9 +137,7 @@ public class TestSimpleNaiveBayesDocumentClassifiergetBatmanAmbiguosDocument(),VIDEOGAME_ANALYZED_RESULT);} finally {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);}}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.javaindex 41e6575483e..89e3cdd46b9 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java@@ -30,6 +30,7 @@ import org.apache.lucene.classification.SimpleNaiveBayesClassifier;import org.apache.lucene.index.LeafReader;import org.apache.lucene.tests.analysis.MockAnalyzer;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.Test;/** Tests for {@link ConfusionMatrixGenerator} */@@ -81,9 +82,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>assertTrue(f1Measure >= 0d);assertTrue(f1Measure <= 1d);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -100,9 +99,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>reader, classifier, categoryFieldName, textFieldName, -1);checkCM(confusionMatrix);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -138,9 +135,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>reader, classifier, categoryFieldName, textFieldName, -1);checkCM(confusionMatrix);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -157,9 +152,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>reader, classifier, categoryFieldName, textFieldName, -1);checkCM(confusionMatrix);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -177,9 +170,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>reader, classifier, categoryFieldName, textFieldName, -1);checkCM(confusionMatrix);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -197,9 +188,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>reader, classifier, categoryFieldName, textFieldName, -1);checkCM(confusionMatrix);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}@@ -229,9 +218,7 @@ public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object>assertTrue(confusionMatrix.getF1Measure("false") >= 0d);assertTrue(confusionMatrix.getF1Measure("false") <= 1d);} finally {- if (reader != null) {- reader.close();- }+ IOUtils.close(reader);}}}diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.javaindex c7cd6cb2c7e..88637b1a4a6 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java@@ -33,6 +33,7 @@ import org.apache.lucene.tests.store.BaseDirectoryWrapper;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.After;import org.junit.Before;import org.junit.Test;@@ -83,9 +84,7 @@ public class TestDataSplitter extends LuceneTestCase {@Override@Afterpublic void tearDown() throws Exception {- originalIndex.close();- indexWriter.close();- dir.close();+ IOUtils.close(originalIndex, indexWriter, dir);super.tearDown();}@@ -133,28 +132,18 @@ public class TestDataSplitter extends LuceneTestCase {DirectoryReader cvReader = DirectoryReader.open(crossValidationIndex);assertEquals((int) (originalIndex.maxDoc() * crossValidationRatio), cvReader.maxDoc(), 20);- trainingReader.close();- testReader.close();- cvReader.close();+ IOUtils.close(trainingReader, testReader, cvReader);closeQuietly(trainingReader);closeQuietly(testReader);closeQuietly(cvReader);} finally {- if (trainingIndex != null) {- trainingIndex.close();- }- if (testIndex != null) {- testIndex.close();- }- if (crossValidationIndex != null) {- crossValidationIndex.close();- }+ IOUtils.close(trainingIndex, testIndex, crossValidationIndex);}}private static void closeQuietly(IndexReader reader) throws IOException {try {- if (reader != null) reader.close();+ IOUtils.close(reader);} catch (@SuppressWarnings("unused")Exception e) {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.javaindex bd0308108a8..f0f9840e394 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java@@ -30,6 +30,7 @@ import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.store.Directory;import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.util.IOUtils;import org.junit.After;import org.junit.Before;import org.junit.Test;@@ -74,8 +75,7 @@ public class TestDocToDoubleVectorUtils extends LuceneTestCase {@Override@Afterpublic void tearDown() throws Exception {- index.close();- dir.close();+ IOUtils.close(index, dir);super.tearDown();}diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.javaindex 36a456bf63d..3982ab8e073 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java@@ -41,6 +41,7 @@ import org.apache.lucene.util.Accountable;import org.apache.lucene.util.ArrayUtil;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.BytesRefBuilder;+import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.RamUsageEstimator;/**@@ -190,22 +191,16 @@ public class BlockTermsReader extends FieldsProducer {public void close() throws IOException {try {try {- if (indexReader != null) {- indexReader.close();- }+ IOUtils.close(indexReader);} finally {// null so if an app hangs on to us (ie, we are not// GCable, despite being closed) we still free most// ramindexReader = null;- if (in != null) {- in.close();- }+ IOUtils.close(in);}} finally {- if (postingsReader != null) {- postingsReader.close();- }+ IOUtils.close(postingsReader);}}diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.javaindex 3dccdba94f2..be964543d42 100644--- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java+++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java@@ -38,6 +38,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.tests.index.RandomIndexWriter;import org.apache.lucene.tests.search.QueryUtils;import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.lucene.util.IOUtils;public class TestFeatureField extends LuceneTestCase {@@ -177,8 +178,7 @@ public class TestFeatureField extends LuceneTestCase {assertEquals(DocIdSetIterator.NO_MORE_DOCS, s.iterator().nextDoc());- reader.close();- dir.close();+ IOUtils.close(reader, dir);}public void testExplanations() throws Exception {@@ -237,8 +237,7 @@ public class TestFeatureField extends LuceneTestCase {QueryUtils.check(random(), FeatureField.newSigmoidQuery("features", "pagerank", .2f, 12f, 0.6f), searcher);- reader.close();- dir.close();+ IOUtils.close(reader, dir);}public void testLogSimScorer() {@@ -303,8 +302,7 @@ public class TestFeatureField extends LuceneTestCase {double expected = Math.pow(10 * 100 * 1 * 42, 1 / 4.); // geometric meanassertEquals(expected, pivot, 0.1);- reader.close();- dir.close();+ IOUtils.close(reader, dir);}public void testDemo() throws IOException {@@ -359,8 +357,7 @@ public class TestFeatureField extends LuceneTestCase {assertEquals(3, topDocs.scoreDocs[2].doc);assertEquals(2, topDocs.scoreDocs[3].doc);- reader.close();- dir.close();+ IOUtils.close(reader, dir);}public void testBasicsNonScoringCase() throws IOException {diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.javaindex 6de75341fa1..d6dfab6f4e9 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java@@ -79,8 +79,7 @@ public class TestIndexSearcher extends LuceneTestCase {@Overridepublic void tearDown() throws Exception {super.tearDown();- reader.close();- dir.close();+ IOUtils.close(reader, dir);}// should not throw exception@@ -180,8 +179,7 @@ public class TestIndexSearcher extends LuceneTestCase {}reader.close();}- w.close();- dir.close();+ IOUtils.close(w, dir);}public void testGetQueryCache() throws IOException {diff --git a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.javaindex 7ddcd3d85db..690144dad3f 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java@@ -43,6 +43,7 @@ import org.apache.lucene.search.QueryVisitor;import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.FSDirectory;+import org.apache.lucene.util.IOUtils;/** Simple command-line based search demo. */public class SearchFiles {@@ -154,10 +155,7 @@ public class SearchFiles {break;}}- if (vectorDict != null) {- vectorDict.close();- }- reader.close();+ IOUtils.close(vectorDict, reader);}/**diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.javaindex 9d7bfb646fc..22727a66d69 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java@@ -42,6 +42,7 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/** Shows example usage of category associations. */public class AssociationsFacetsExample {@@ -86,8 +87,7 @@ public class AssociationsFacetsExample {doc.add(new FloatAssociationFacetField(0.34f, "genre", "software"));indexWriter.addDocument(config.build(taxoWriter, doc));- indexWriter.close();- taxoWriter.close();+ IOUtils.close(indexWriter, taxoWriter);}/** User runs a query and aggregates facets by summing their association values. */@@ -115,8 +115,7 @@ public class AssociationsFacetsExample {results.add(tags.getTopChildren(10, "tags"));results.add(genre.getTopChildren(10, "genre"));- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return results;}@@ -142,8 +141,7 @@ public class AssociationsFacetsExample {"$genre", taxoReader, config, fc, AssociationAggregationFunction.SUM);FacetResult result = facets.getTopChildren(10, "genre");- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return result;}diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.javaindex d01866b0f17..cd49c08dc04 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java@@ -49,6 +49,7 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/*** Shows simple usage of dynamic range faceting, using the expressions module to calculate distance.@@ -258,8 +259,7 @@ public class DistanceFacetsExample implements Closeable {@Overridepublic void close() throws IOException {- searcher.getIndexReader().close();- indexDir.close();+ IOUtils.close(searcher.getIndexReader(), indexDir);}/** Runs the search and drill-down examples and prints the results. */diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.javaindex 40a16b36bff..87a8400b3b7 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java@@ -45,6 +45,7 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/** Shows facets aggregation by an expression. */public class ExpressionAggregationFacetsExample {@@ -77,8 +78,7 @@ public class ExpressionAggregationFacetsExample {doc.add(new FacetField("A", "C"));indexWriter.addDocument(config.build(taxoWriter, doc));- indexWriter.close();- taxoWriter.close();+ IOUtils.close(indexWriter, taxoWriter);}/** User runs a query and aggregates facets. */@@ -114,8 +114,7 @@ public class ExpressionAggregationFacetsExample {expr.getDoubleValuesSource(bindings));FacetResult result = facets.getTopChildren(10, "A");- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return result;}diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.javaindex f7e21b5d30e..964bd58ad00 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java@@ -38,6 +38,7 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/** Demonstrates indexing categories into different indexed fields. */public class MultiCategoryListsFacetsExample {@@ -87,8 +88,7 @@ public class MultiCategoryListsFacetsExample {doc.add(new FacetField("Publish Date", "1999", "5", "5"));indexWriter.addDocument(config.build(taxoWriter, doc));- indexWriter.close();- taxoWriter.close();+ IOUtils.close(indexWriter, taxoWriter);}/** User runs a query and counts facets. */@@ -114,8 +114,7 @@ public class MultiCategoryListsFacetsExample {Facets pubDate = new FastTaxonomyFacetCounts("pubdate", taxoReader, config, fc);results.add(pubDate.getTopChildren(10, "Publish Date"));- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return results;}diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.javaindex 6d35c7cd256..df87fd87961 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java@@ -42,6 +42,7 @@ import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/** Shows simple usage of dynamic range faceting. */public class RangeFacetsExample implements Closeable {@@ -183,8 +184,7 @@ public class RangeFacetsExample implements Closeable {@Overridepublic void close() throws IOException {- searcher.getIndexReader().close();- indexDir.close();+ IOUtils.close(searcher.getIndexReader(), indexDir);}/** Runs the search and drill-down examples and prints the results. */diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.javaindex a18f2b7a39e..980bc64613d 100644--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java@@ -42,6 +42,7 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;+import org.apache.lucene.util.IOUtils;/** Shows simple usage of faceted indexing and search. */public class SimpleFacetsExample {@@ -89,8 +90,7 @@ public class SimpleFacetsExample {doc.add(new FacetField("Publish Date", "1999", "5", "5"));indexWriter.addDocument(config.build(taxoWriter, doc));- indexWriter.close();- taxoWriter.close();+ IOUtils.close(indexWriter, taxoWriter);}/** User runs a query and counts facets. */@@ -114,8 +114,7 @@ public class SimpleFacetsExample {results.add(facets.getTopChildren(10, "Author"));results.add(facets.getTopChildren(10, "Publish Date"));- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return results;}@@ -140,8 +139,7 @@ public class SimpleFacetsExample {results.add(facets.getTopChildren(10, "Author"));results.add(facets.getTopChildren(10, "Publish Date"));- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return results;}@@ -165,8 +163,7 @@ public class SimpleFacetsExample {Facets facets = new FastTaxonomyFacetCounts(taxoReader, config, fc);FacetResult result = facets.getTopChildren(10, "Author");- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return result;}@@ -193,8 +190,7 @@ public class SimpleFacetsExample {// Retrieve resultsList<FacetResult> facets = result.facets.getAllDims(10);- indexReader.close();- taxoReader.close();+ IOUtils.close(indexReader, taxoReader);return facets;}diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.javaindex 92efe145308..46245fde095 100644--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java@@ -48,6 +48,7 @@ import org.apache.lucene.tests.util.English;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.TestUtil;import org.apache.lucene.util.BytesRef;+import org.apache.lucene.util.IOUtils;import org.junit.AfterClass;import org.junit.BeforeClass;@@ -89,8 +90,7 @@ public class TestPayloadCheckQuery extends LuceneTestCase {@AfterClasspublic static void afterClass() throws Exception {- reader.close();- directory.close();+ IOUtils.close(reader, directory);searcher = null;reader = null;directory = null;