Replaced hard coded filename with Config.DEFAULT_CONFIG_FILE_NAME

neo4j · Aug 15, 2017 · 0729574 · 0729574
1 parent c0857d0
commit 0729574
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java b/community/consistency-check/src/main/java/org/neo4j/consistency/CheckConsistencyCommand.java
@@ -243,7 +243,7 @@ private static Config loadNeo4jConfig( Path homeDir, Path configDir, String data
     {
         additionalConfig.put( DatabaseManagementSystemSettings.active_database.name(), databaseName );
 
-        return Config.fromFile( configDir.resolve( "neo4j.conf" ) ).withHome( homeDir ).withConnectorsDisabled()
+        return Config.fromFile( configDir.resolve( Config.DEFAULT_CONFIG_FILE_NAME ) ).withHome( homeDir ).withConnectorsDisabled()
                 .withSettings( additionalConfig ).build();
     }
 

diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/LoadCommand.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/LoadCommand.java
@@ -82,7 +82,7 @@ public void execute( String[] args ) throws IncorrectUsage, CommandFailed
 
     private Path toDatabaseDirectory( String databaseName )
     {
-        return Config.fromFile( configDir.resolve( "neo4j.conf" ) )
+        return Config.fromFile( configDir.resolve( Config.DEFAULT_CONFIG_FILE_NAME ) )
                 .withHome( homeDir )
                 .withConnectorsDisabled()
                 .withSetting( DatabaseManagementSystemSettings.active_database, databaseName )

diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/OnlineBackupCommandTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/OnlineBackupCommandTest.java
@@ -19,14 +19,6 @@
  */
 package org.neo4j.backup;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -36,6 +28,14 @@
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import org.neo4j.commandline.admin.CommandFailed;
 import org.neo4j.commandline.admin.CommandLocator;
 import org.neo4j.commandline.admin.IncorrectUsage;
@@ -53,7 +53,6 @@
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -68,7 +67,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-
 import static org.neo4j.backup.OnlineBackupCommand.MAX_OLD_BACKUPS;
 import static org.neo4j.backup.OnlineBackupCommand.STATUS_CC_ERROR;
 import static org.neo4j.backup.OnlineBackupCommand.STATUS_CC_INCONSISTENT;
@@ -548,7 +546,7 @@ public void shouldReadStandardConfig() throws IOException, CommandFailed, Incorr
             .ToolFailureException
 
     {
-        Files.write( configDir.resolve( "neo4j.conf" ), singletonList( cypher_planner.name() + "=RULE" ) );
+        Files.write( configDir.resolve( Config.DEFAULT_CONFIG_FILE_NAME ), singletonList( cypher_planner.name() + "=RULE" ) );
         ArgumentCaptor<Config> config = ArgumentCaptor.forClass( Config.class );
 
         execute( backupDir(), "--name=mybackup" );

diff --git a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java
@@ -31,6 +31,7 @@
 import org.neo4j.desktop.Parameters;
 import org.neo4j.desktop.config.Installation;
 import org.neo4j.desktop.model.DesktopModel;
+import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.configuration.HttpConnector;
 import org.neo4j.test.rule.TestDirectory;
 
@@ -79,7 +80,7 @@ public void createFiles() throws IOException
         storeDir = new File( testDirectory.directory(), "store_dir" );
         storeDir.mkdirs();
 
-        configFile = new File( testDirectory.directory(), "neo4j.conf" );
+        configFile = new File( testDirectory.directory(), Config.DEFAULT_CONFIG_FILE_NAME );
         Properties props = new Properties();
         props.setProperty( new HttpConnector( "http" ).type.name(), "HTTP" );
         props.setProperty( new HttpConnector( "http" ).encryption.name(), "NONE" );