Use file to for storeDir representation if GraphDatabaseFacade API.

Use file instead of string to represent store dir, cleanup all the wrapping and converting around that
neo4j · Jul 6, 2017 · 0486e14 · 0486e14
1 parent 7038b68
commit 0486e14
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 54 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -699,9 +699,9 @@ public URL validateURLAccess( URL url ) throws URLAccessValidationError
     }
 
     @Override
-    public String getStoreDir()
+    public File getStoreDir()
     {
-        return spi.storeDir().getAbsolutePath();
+        return spi.storeDir();
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java
@@ -19,6 +19,7 @@
  */
 package org.neo4j.kernel.internal;
 
+import java.io.File;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
@@ -52,7 +53,7 @@ public interface GraphDatabaseAPI extends GraphDatabaseService
      */
     URL validateURLAccess( URL url ) throws URLAccessValidationError;
 
-    String getStoreDir();
+    File getStoreDir();
 
     /**
      * Begin internal transaction with specified type and access mode

diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java
@@ -95,7 +95,7 @@ private long countLogEntries()
     {
         GraphDatabaseAPI db = dbr.getGraphDatabaseAPI();
         FileSystemAbstraction fs = db.getDependencyResolver().resolveDependency( FileSystemAbstraction.class );
-        File storeDir = new File( db.getStoreDir() );
+        File storeDir = db.getStoreDir();
         try
         {
             CountingLogHook<LogEntry> logicalLogCounter = new CountingLogHook<>();

diff --git a/...ty/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java b/...ty/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java
@@ -22,7 +22,6 @@
 import org.junit.After;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
 
 import org.neo4j.graphdb.Node;
@@ -182,7 +181,7 @@ private GraphDatabaseAPI newDb( String logPruning, int rotateEveryNTransactions
         GraphDatabaseBuilder builder = gdf.newImpermanentDatabaseBuilder();
         builder.setConfig( keep_logical_logs, logPruning );
         this.db = (GraphDatabaseAPI) builder.newGraphDatabase();
-        files = new PhysicalLogFiles( new File( db.getStoreDir() ), PhysicalLogFile.DEFAULT_NAME, fs );
+        files = new PhysicalLogFiles( db.getStoreDir(), PhysicalLogFile.DEFAULT_NAME, fs );
         return db;
     }
 

diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java
@@ -114,7 +114,7 @@ public void setUp() throws IOException
 
     private void createIndexDbFile() throws IOException
     {
-        File storeDir = new File( db.getStoreDir() );
+        File storeDir = db.getStoreDir();
         final File indexFile = new File( storeDir, "index.db" );
         if ( !indexFile.exists() )
         {

diff --git a/community/kernel/src/test/java/org/neo4j/test/ImpermanentGraphDatabase.java b/community/kernel/src/test/java/org/neo4j/test/ImpermanentGraphDatabase.java
@@ -176,7 +176,7 @@ public void shutdown()
     {
         if ( TRACK_UNCLOSED_DATABASE_INSTANCES )
         {
-            startedButNotYetClosed.remove( new File( getStoreDir() ) );
+            startedButNotYetClosed.remove( getStoreDir() );
         }
 
         super.shutdown();

diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java
@@ -65,7 +65,7 @@ public abstract class DatabaseRule extends ExternalResource implements GraphData
 {
     private GraphDatabaseBuilder databaseBuilder;
     private GraphDatabaseAPI database;
-    private String storeDir;
+    private File storeDir;
     private Supplier<Statement> statementSupplier;
     private boolean startEagerly = true;
     private Map<Setting<?>, String> config;
@@ -378,7 +378,7 @@ public GraphDatabaseAPI restartDatabase( RestartAction action ) throws IOExcepti
     {
         FileSystemAbstraction fs = resolveDependency( FileSystemAbstraction.class );
         database.shutdown();
-        action.run( fs, new File( storeDir ) );
+        action.run( fs, storeDir );
         database = null;
         return getGraphDatabaseAPI();
     }
@@ -438,19 +438,19 @@ public StoreId storeId()
     }
 
     @Override
-    public String getStoreDir()
+    public File getStoreDir()
     {
         return database.getStoreDir();
     }
 
     public String getStoreDirAbsolutePath()
     {
-        return new File( getStoreDir() ).getAbsolutePath();
+        return getStoreDir().getAbsolutePath();
     }
 
     public File getStoreDirFile()
     {
-        return new File( getStoreDir() );
+        return getStoreDir();
     }
 
     @Override

diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java
@@ -128,17 +128,11 @@ public EmbeddedDatabaseRule startLazily()
     {
         return (EmbeddedDatabaseRule) super.startLazily();
     }
-/*
-    public EmbeddedDatabaseRule withConfig(Config config )
-    {
-        this.config = config;
-        return this;
-    }*/
 
     @Override
-    public String getStoreDir()
+    public File getStoreDir()
     {
-        return temp.root().getPath();
+        return temp.root();
     }
 
     @Override

diff --git a/...ucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java b/...ucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java
@@ -82,7 +82,7 @@ public void shouldNotLeaveLuceneIndexFilesHangingAroundIfConstraintCreationFails
 
         SchemaIndexProvider schemaIndexProvider =
                 db.getDependencyResolver().resolveDependency( SchemaIndexProvider.class );
-        File schemaStoreDir = schemaIndexProvider.getSchemaIndexStoreDirectory( new File( db.getStoreDir() ) );
+        File schemaStoreDir = schemaIndexProvider.getSchemaIndexStoreDirectory( db.getStoreDir() );
 
         assertFalse( new IndexFolderLayout( schemaStoreDir, INDEX_IDENTIFIER ).getIndexFolder().exists() );
     }

diff --git a/community/neo4j/src/test/java/org/neo4j/index/IndexFailureOnStartupTest.java b/community/neo4j/src/test/java/org/neo4j/index/IndexFailureOnStartupTest.java
@@ -126,7 +126,7 @@ private File archiveFile() throws IOException
     {
         try ( FileSystemAbstraction fs = new DefaultFileSystemAbstraction() )
         {
-            File indexDir = soleIndexDir( fs, new File( db.getStoreDir() ) );
+            File indexDir = soleIndexDir( fs, db.getStoreDir() );
             File[] files = indexDir.getParentFile()
                     .listFiles( pathname -> pathname.isFile() && pathname.getName().startsWith( "archive-" ) );
             if ( files == null || files.length == 0 )

diff --git a/community/server/src/main/java/org/neo4j/server/database/Database.java b/community/server/src/main/java/org/neo4j/server/database/Database.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.server.database;
 
+import java.io.File;
+
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
@@ -31,7 +33,7 @@ interface Factory
         Database newDatabase( Config config, GraphDatabaseFacadeFactory.Dependencies dependencies );
     }
 
-    String getLocation();
+    File getLocation();
 
     GraphDatabaseFacade getGraph();
 

diff --git a/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java b/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java
@@ -65,10 +65,9 @@ public LifecycleManagingDatabase( Config config, GraphFactory dbFactory,
     }
 
     @Override
-    public String getLocation()
+    public File getLocation()
     {
-        File file = config.get( DatabaseManagementSystemSettings.database_path );
-        return file.getAbsolutePath();
+        return config.get( DatabaseManagementSystemSettings.database_path );
     }
 
     @Override

diff --git a/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java b/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.server.database;
 
+import java.io.File;
+
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 
@@ -40,7 +42,7 @@ public WrappedDatabase( GraphDatabaseFacade graph )
     }
 
     @Override
-    public String getLocation()
+    public File getLocation()
     {
         return graph.getStoreDir();
     }

diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java
@@ -19,6 +19,7 @@
  */
 package org.neo4j.shell.kernel;
 
+import java.io.File;
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Collections;
@@ -1053,7 +1054,7 @@ public DependencyResolver getDependencyResolver()
     }
 
     @Override
-    public String getStoreDir()
+    public File getStoreDir()
     {
         return actual.getStoreDir();
     }

diff --git a/community/shell/src/test/java/org/neo4j/shell/AppsIT.java b/community/shell/src/test/java/org/neo4j/shell/AppsIT.java
@@ -1270,7 +1270,7 @@ private void verifyNumberOfCommits( String query, long expectedCommitCount ) thr
         long txIdBeforeQuery = lastClosedTxId();
 
         // When
-        startClient.start( new String[]{"-path", db.getStoreDir(), "-c", query}, ctrlCHandler );
+        startClient.start( new String[]{"-path", db.getStoreDir().getAbsolutePath(), "-c", query}, ctrlCHandler );
 
         // then
         long txId = lastClosedTxId();

diff --git a/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java b/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java
@@ -159,7 +159,8 @@ protected GraphDatabaseShellServer getGraphDatabaseShellServer( File path, boole
         };
 
         // when
-        startClient.start( new String[]{"-path", db.getStoreDir(), "-c", "CREATE (n {foo:'bar'});"}, ctrlCHandler );
+        startClient.start( new String[]{"-path", db.getStoreDir().getAbsolutePath(), "-c", "CREATE (n {foo:'bar'});"},
+                ctrlCHandler );
 
         // verify
         verify( databaseShellServer ).shutdown();
@@ -175,7 +176,7 @@ public void shouldReportEditionThroughDbInfoApp() throws Exception
         StartClient client = new StartClient( new PrintStream( out ), new PrintStream( err ) );
 
         // when
-        client.start( new String[]{"-path", db.getStoreDir() + "testDb", "-c",
+        client.start( new String[]{"-path", db.getStoreDir().getAbsolutePath() + "testDb", "-c",
                         "dbinfo -g Configuration unsupported.dbms.edition"},
                 ctrlCHandler );
         // then
@@ -218,7 +219,7 @@ protected GraphDatabaseShellServer getGraphDatabaseShellServer( File path, boole
                 shellServer = new GraphDatabaseShellServer( factory, path, readOnly, configFile );
                 return shellServer;
             }
-        }.start( new String[]{"-c", "RETURN 1;", "-path", db.getStoreDir() + "test-db", "-config",
+        }.start( new String[]{"-c", "RETURN 1;", "-path", db.getStoreDir().getAbsolutePath() + "test-db", "-config",
                 getClass().getResource( "/config-with-bolt-connector.conf" ).getFile()}, mock( CtrlCHandler.class ) );
         try
         {

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java
@@ -19,7 +19,6 @@
  */
 package org.neo4j.backup;
 
-import java.io.File;
 import java.net.URI;
 import java.util.function.Supplier;
 
@@ -89,7 +88,7 @@ public OnlineBackupKernelExtension( Config config, final GraphDatabaseAPI graphD
         {
             TransactionIdStore transactionIdStore = transactionIdStoreSupplier.get();
             StoreCopyServer copier = new StoreCopyServer( neoStoreDataSource, checkPointerSupplier.get(),
-                    fileSystemAbstraction, new File( graphDatabaseAPI.getStoreDir() ),
+                    fileSystemAbstraction, graphDatabaseAPI.getStoreDir(),
                     monitors.newMonitor( StoreCopyServer.Monitor.class ), pageCache, storeCopyCheckPointMutex );
             LogicalTransactionStore logicalTransactionStore = logicalTransactionStoreSupplier.get();
             LogFileInformation logFileInformation = logFileInformationSupplier.get();

diff --git a/...ustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java b/...ustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Clock;
 import java.util.Collection;
 import java.util.HashSet;
@@ -229,7 +228,7 @@ public void shouldEventuallyPullTransactionDownToAllReadReplicas() throws Except
 
     private void gatherLabelScanStoreFiles( GraphDatabaseAPI db, Set<Path> labelScanStoreFiles )
     {
-        Path dbStoreDirectory = Paths.get( db.getStoreDir() ).toAbsolutePath();
+        Path dbStoreDirectory = db.getStoreDir().toPath().toAbsolutePath();
         LabelScanStore labelScanStore = db.getDependencyResolver().resolveDependency( LabelScanStore.class );
         try ( ResourceIterator<File> files = labelScanStore.snapshotStoreFiles() )
         {

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
@@ -73,6 +73,6 @@ public boolean isMaster()
 
     public File getStoreDirectory()
     {
-        return new File( getStoreDir() );
+        return getStoreDir();
     }
 }
diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java
@@ -102,7 +102,7 @@ public DefaultMasterImplSPI( final GraphDatabaseAPI graphDb,
         this.checkPointer = checkPointer;
         this.neoStoreDataSource = neoStoreDataSource;
         this.mutex = mutex;
-        this.storeDir = new File( graphDb.getStoreDir() );
+        this.storeDir = graphDb.getStoreDir();
         this.txChecksumLookup = new TransactionChecksumLookup( transactionIdStore, logicalTransactionStore );
         this.responsePacker = new ResponsePacker( logicalTransactionStore, transactionIdStore, graphDb::storeId );
         this.monitors = monitors;

diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/BranchedDataIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/BranchedDataIT.java
@@ -122,7 +122,7 @@ public void shouldCopyStoreFromMasterIfBranched() throws Throwable
 
         // WHEN
         HighlyAvailableGraphDatabase slave = cluster.getAnySlave();
-        File storeDir = new File( slave.getStoreDir() );
+        File storeDir = slave.getStoreDir();
         RepairKit starter = cluster.shutdown( slave );
         HighlyAvailableGraphDatabase master = cluster.getMaster();
         createNode( master, "B1" );

diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java
@@ -308,7 +308,7 @@ private ClusterManager.RepairKit bringSlaveOfflineAndRemoveStoreFiles( ManagedCl
     {
         ClusterManager.RepairKit slaveDown = cluster.shutdown( slave );
 
-        File storeDir = new File( slave.getStoreDir() );
+        File storeDir = slave.getStoreDir();
         deleteRecursively( storeDir );
         storeDir.mkdir();
         return slaveDown;

diff --git a/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterIT.java b/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterIT.java
@@ -309,7 +309,7 @@ public void lastTxCommitTimestampShouldGetInitializedOnSlaveIfNotPresent() throw
             cluster.sync();
 
             HighlyAvailableGraphDatabase slave = cluster.getAnySlave();
-            File storeDir = new File( slave.getStoreDir() );
+            File storeDir = slave.getStoreDir();
             ClusterManager.RepairKit slaveRepairKit = cluster.shutdown( slave );
 
             clearLastTransactionCommitTimestampField( storeDir );
@@ -342,7 +342,7 @@ public void lastTxCommitTimestampShouldBeUnknownAfterStartIfNoFiledOrLogsPresent
             cluster.sync();
 
             HighlyAvailableGraphDatabase slave = cluster.getAnySlave();
-            File storeDir = new File( slave.getStoreDir() );
+            File storeDir = slave.getStoreDir();
             ClusterManager.RepairKit slaveRepairKit = cluster.shutdown( slave );
 
             clearLastTransactionCommitTimestampField( storeDir );

diff --git a/...enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java b/...enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java
@@ -115,7 +115,7 @@ private static void assertConsistentStore( GraphDatabaseAPI db ) throws Exceptio
     {
         ConsistencyCheckService service = new ConsistencyCheckService();
 
-        File storeDir = new File( db.getStoreDir() );
+        File storeDir = db.getStoreDir();
         ConsistencyCheckService.Result result = service.runFullConsistencyCheck( storeDir, Config.empty(),
                 ProgressMonitorFactory.textual( System.out ), FormattedLogProvider.toOutputStream( System.out ), true );
 

diff --git a/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java b/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java
@@ -529,7 +529,7 @@ private void cleanup( GraphDatabaseService gdb ) throws IOException
         {
             GraphDatabaseAPI db = (GraphDatabaseAPI) gdb;
             gdb.shutdown();
-            FileUtils.deleteDirectory( new File( db.getStoreDir() ) );
+            FileUtils.deleteDirectory( db.getStoreDir() );
         }
     }
 

diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java
@@ -248,8 +248,8 @@ public void migratingOlderDataAndThanStartAClusterUsingTheNewerDataShouldWork()
                 clusterManager.safeShutdown();
             }
 
-            assertConsistentStore( new File( master.getStoreDir() ) );
-            assertConsistentStore( new File( slave.getStoreDir() ) );
+            assertConsistentStore( master.getStoreDir() );
+            assertConsistentStore( slave.getStoreDir() );
         }
     }