Removed IndexStorageFactory#shutdown()

Method was used to close the DirectoryFactory which was passed in as a
constructor dependency. This was not a good idea because DirectoryFactory has
a completely different lifecycle than IndexStorageFactory. Closing of the
in-memory directory factory caused flaky tests because content of in-memory
lucene directories did not survive intentional database restarts.

community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProvider.java

@@ -98,7 +98,6 @@ public IndexAccessor getOnlineAccessor( long indexId, IndexConfiguration config,
     @Override
     public void shutdown() throws Throwable
     {   // Nothing to shut down
-        indexStorageFactory.shutdown();
     }
 
     @Override

community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/IndexStorageFactory.java

@@ -25,25 +25,19 @@
 
 public class IndexStorageFactory
 {
-    private final DirectoryFactory directoryFactory;
+    private final DirectoryFactory dirFactory;
     private final FileSystemAbstraction fileSystem;
     private final File indexRootFolder;
 
-    public IndexStorageFactory( DirectoryFactory directoryFactory, FileSystemAbstraction fileSystem,
-            File indexRootFolder )
+    public IndexStorageFactory( DirectoryFactory dirFactory, FileSystemAbstraction fileSystem, File indexRootFolder )
     {
-        this.directoryFactory = directoryFactory;
+        this.dirFactory = dirFactory;
         this.fileSystem = fileSystem;
         this.indexRootFolder = indexRootFolder;
     }
 
     public PartitionedIndexStorage indexStorageOf( long indexId )
     {
-        return new PartitionedIndexStorage( directoryFactory, fileSystem, indexRootFolder, String.valueOf( indexId ) );
-    }
-
-    public void shutdown()
-    {
-        directoryFactory.close();
+        return new PartitionedIndexStorage( dirFactory, fileSystem, indexRootFolder, String.valueOf( indexId ) );
     }
 }

community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/SchemaIndexAcceptanceTest.java

@@ -19,24 +19,24 @@
  */
 package org.neo4j.kernel.api.impl.index;
 
-import java.util.Arrays;
-import java.util.Map;
-
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.Map;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.graphdb.schema.Schema.IndexState;
+import org.neo4j.test.EphemeralFileSystemRule;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static org.junit.Assert.assertThat;
-
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.graphdb.Neo4jMatchers.containsOnly;
 import static org.neo4j.graphdb.Neo4jMatchers.createIndex;
@@ -51,7 +51,9 @@
 
 public class SchemaIndexAcceptanceTest
 {
-    private EphemeralFileSystemAbstraction fs = new EphemeralFileSystemAbstraction();
+    @Rule
+    public final EphemeralFileSystemRule fsRule = new EphemeralFileSystemRule();
+
     private GraphDatabaseService db;
     private final Label label = label( "PERSON" );
     private final String propertyKey = "key";
@@ -172,15 +174,12 @@ public void recoveryAfterCreateAndDropIndex() throws Exception
 
     private GraphDatabaseService newDb()
     {
-        return new TestGraphDatabaseFactory().setFileSystem( fs ).newImpermanentDatabase();
+        return new TestGraphDatabaseFactory().setFileSystem( fsRule.get() ).newImpermanentDatabase();
     }
 
     private void crashAndRestart()
     {
-        EphemeralFileSystemAbstraction snapshot = fs.snapshot();
-        db.shutdown();
-        fs.shutdown();
-        fs = snapshot;
+        fsRule.snapshot( db::shutdown );
         db = newDb();
     }