PR feedback and fix linter error of writer field name

Author: paulirwin

src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs

@@ -102,7 +102,7 @@ public class AnalyzingInfixSuggester : Lookup, IDisposable
         /// <summary>
         /// Used for ongoing NRT additions/updates. </summary>
         // LUCENENET specific - changed from private to protected internal for LUCENE-7564 test support.
-        protected internal IndexWriter writer;
+        protected internal IndexWriter m_writer;
 
         /// <summary>
         /// <see cref="IndexSearcher"/> used for lookups. </summary>
@@ -307,19 +307,18 @@ public override void Build(IInputEnumerator enumerator)
                     m_searcherMgr = null;
                 }
 
-                if (writer != null)
+                if (m_writer != null)
                 {
-                    writer.Dispose();
-                    writer = null;
+                    m_writer.Dispose();
+                    m_writer = null;
                 }
 
-                AtomicReader r = null;
                 bool success = false;
                 try
                 {
                     // First pass: build a temporary normal Lucene index,
                     // just indexing the suggestions as they iterate:
-                    writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
+                    m_writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
                     //long t0 = System.nanoTime();
 
                     // TODO: use threads?
@@ -345,7 +344,7 @@ public override void Build(IInputEnumerator enumerator)
                     {
                         Commit();
                     }
-                    m_searcherMgr = new SearcherManager(writer, true, null);
+                    m_searcherMgr = new SearcherManager(m_writer, true, null);
                     success = true;
                 }
                 finally
@@ -354,19 +353,17 @@ public override void Build(IInputEnumerator enumerator)
                     {
                         if (closeIndexWriterOnBuild)  // LUCENENET specific - Support for LUCENE-7564.
                         {
-                            writer.Dispose();
-                            writer = null;
+                            m_writer.Dispose();
+                            m_writer = null;
                         }
-                        IOUtils.Dispose(r);
                     }
                     else
                     {
-                        if (writer != null)
+                        if (m_writer != null)
                         {
-                            writer.Rollback();
-                            writer = null;
+                            m_writer.Rollback();
+                            m_writer = null;
                         }
-                        IOUtils.DisposeWhileHandlingException(r);
                     }
                 }
             }
@@ -379,17 +376,17 @@ public override void Build(IInputEnumerator enumerator)
         // LUCENENET specific - Support for LUCENE-5889, LUCENE-7564.
         public void Commit()
         {
-            if (writer is null)
+            if (m_writer is null)
             {
                 if (m_searcherMgr is null || closeIndexWriterOnBuild == false)
                 {
-                    throw IllegalStateException.Create("Cannot commit on an closed writer. Add documents first");
+                    throw IllegalStateException.Create("Cannot commit on a closed writer. Add documents first");
                 }
                 // else no-op: writer was committed and closed after the index was built, so commit is unnecessary
             }
             else
             {
-                writer.Commit();
+                m_writer.Commit();
             }
         }
 
@@ -432,28 +429,28 @@ protected override TokenStreamComponents WrapComponents(string fieldName, TokenS
         // LUCENENET specific - Support for LUCENE-5889, LUCENE-7564.
         private void EnsureOpen()
         {
-            if (writer != null)
+            if (m_writer != null)
                 return;
 
             UninterruptableMonitor.Enter(syncLock);
             try
             {
-                if (writer is null)
+                if (m_writer is null)
                 {
                     if (DirectoryReader.IndexExists(dir))
                     {
                         // Already built; open it:
-                        writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.APPEND));
+                        m_writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.APPEND));
                     }
                     else
                     {
-                        writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
+                        m_writer = new IndexWriter(dir, indexWriterConfigFactory.Get(matchVersion, GetGramAnalyzer(), OpenMode.CREATE));
                     }
                     UninterruptableMonitor.Enter(searcherMgrLock);
                     try
                     {
                         SearcherManager oldSearcherMgr = m_searcherMgr;
-                        m_searcherMgr = new SearcherManager(writer, true, null);
+                        m_searcherMgr = new SearcherManager(m_writer, true, null);
                         if (oldSearcherMgr != null)
                         {
                             oldSearcherMgr.Dispose();
@@ -481,7 +478,7 @@ private void EnsureOpen()
         public virtual void Add(BytesRef text, IEnumerable<BytesRef> contexts, long weight, BytesRef payload)
         {
             EnsureOpen();    // LUCENENET specific - Support for LUCENE-5889.
-            writer.AddDocument(BuildDocument(text, contexts, weight, payload));
+            m_writer.AddDocument(BuildDocument(text, contexts, weight, payload));
         }
 
         /// <summary>
@@ -496,7 +493,7 @@ public virtual void Add(BytesRef text, IEnumerable<BytesRef> contexts, long weig
         public virtual void Update(BytesRef text, IEnumerable<BytesRef> contexts, long weight, BytesRef payload)
         {
             EnsureOpen();    // LUCENENET specific - Support for LUCENE-5889.
-            writer.UpdateDocument(new Term(EXACT_TEXT_FIELD_NAME, text.Utf8ToString()), BuildDocument(text, contexts, weight, payload));
+            m_writer.UpdateDocument(new Term(EXACT_TEXT_FIELD_NAME, text.Utf8ToString()), BuildDocument(text, contexts, weight, payload));
         }
 
         private Document BuildDocument(BytesRef text, IEnumerable<BytesRef> contexts, long weight, BytesRef payload)
@@ -539,7 +536,7 @@ public virtual void Refresh()
             {
                 throw IllegalStateException.Create("suggester was not built");
             }
-            if (writer != null) // LUCENENET specific - Support for LUCENE-7564.
+            if (m_writer != null) // LUCENENET specific - Support for LUCENE-7564.
             {
                 m_searcherMgr.MaybeRefreshBlocking();
             }
@@ -975,10 +972,10 @@ protected virtual void Dispose(bool disposing) // LUCENENET specific - implement
                     m_searcherMgr.Dispose();
                     m_searcherMgr = null;
                 }
-                if (writer != null)
+                if (m_writer != null)
                 {
-                    writer.Dispose();
-                    writer = null;
+                    m_writer.Dispose();
+                    m_writer = null;
                 }
                 if (dir != null) // LUCENENET specific - Support for LUCENE-7564. Close dir even when writer is null.
                 {

src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs

@@ -1047,7 +1047,7 @@ public MyAnalyzingInfixSuggester(Store.Directory dir, Analyzer indexAnalyzer, An
 
             public IndexWriter GetIndexWriter()
             {
-                return writer;
+                return m_writer;
             }
 
             public SearcherManager GetSearcherManager()
@@ -1070,7 +1070,7 @@ public void TestCloseIndexWriterOnBuild()
             // * The IndexWriter should be null
             // * The SearcherManager should be non-null
             // * SearcherManager's IndexWriter reference should be closed
-            //   (as evidenced by MaybeRefreshBlocking() throwing AlreadyClosedException)
+            //   (as evidenced by MaybeRefreshBlocking() throwing AlreadyClosedException/ObjectDisposedException)
             Analyzer a = new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false);
             DirectoryInfo tempDir = CreateTempDir("analyzingInfixContext");
             MyAnalyzingInfixSuggester suggester = new MyAnalyzingInfixSuggester(NewFSDirectory(tempDir), a, a, 3, false, true);