HSEARCH-3118 Ensure we properly close the directory when we close a L…

…ucene index manager

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/LuceneIndexManagerImpl.java

@@ -133,7 +133,7 @@ public void close() {
 		try ( Closer<IOException> closer = new Closer<>() ) {
 			closer.push( LuceneWriteWorkOrchestratorImplementor::close, writeOrchestrator );
 			// Close the index writer after the orchestrators, when we're sure all works have been performed
-			closer.push( IndexWriterHolder::closeIndexWriter, indexWriterHolder );
+			closer.push( IndexWriterHolder::close, indexWriterHolder );
 			closer.push( LuceneIndexModel::close, model );
 		}
 		catch (IOException | RuntimeException e) {

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterHolder.java

@@ -14,6 +14,7 @@
 import org.hibernate.search.backend.lucene.logging.impl.Log;
 import org.hibernate.search.engine.common.spi.ErrorHandler;
 import org.hibernate.search.engine.reporting.spi.EventContexts;
+import org.hibernate.search.util.common.impl.Closer;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
 import org.hibernate.search.util.common.reporting.EventContext;
 
@@ -28,7 +29,7 @@
 /**
  * @author Sanne Grinovero (C) 2011 Red Hat Inc.
  */
-public class IndexWriterHolder {
+public class IndexWriterHolder implements AutoCloseable {
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
 	private final String indexName;
@@ -67,6 +68,14 @@ public IndexWriterHolder(String indexName, Directory directory, Analyzer analyze
 		 */
 	}
 
+	@Override
+	public void close() throws IOException {
+		try ( Closer<IOException> closer = new Closer<>() ) {
+			closer.push( IndexWriterHolder::closeIndexWriter, this );
+			closer.push( Directory::close, directory );
+		}
+	}
+
 	/**
 	 * Gets the IndexWriter, opening one if needed.
 	 *