Various cleanups, and rename tuningConfig to additionalConfig.

neo4j · Sep 13, 2016 · ee3c76b · ee3c76b
1 parent 6efc369
commit ee3c76b
Showing 1 changed file with 15 additions and 23 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
@@ -22,7 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,11 +39,9 @@
 import org.neo4j.helpers.collection.MapUtil;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
-import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.util.Converters;
 import org.neo4j.logging.FormattedLogProvider;
-import org.neo4j.logging.LogProvider;
 import org.neo4j.server.configuration.ConfigLoader;
 
 import static org.neo4j.dbms.DatabaseManagementSystemSettings.database_path;
@@ -60,7 +58,7 @@ public Provider()
         @Override
         public Optional<String> arguments()
         {
-            return Optional.of( "--database=<database> [--tuning-config=<file>] [--verbose]" );
+            return Optional.of( "--database=<database> [--additional-config=<file>] [--verbose]" );
         }
 
         @Override
@@ -79,8 +77,6 @@ public AdminCommand create( Path homeDir, Path configDir, OutsideWorld outsideWo
     private final Path homeDir;
     private final Path configDir;
     private final ConsistencyCheckService consistencyCheckService;
-    private final LogProvider logProvider;
-    private final FileSystemAbstraction fileSystemAbstraction;
 
     public CheckConsistencyCommand( Path homeDir, Path configDir )
     {
@@ -92,58 +88,57 @@ public CheckConsistencyCommand( Path homeDir, Path configDir, ConsistencyCheckSe
         this.homeDir = homeDir;
         this.configDir = configDir;
         this.consistencyCheckService = consistencyCheckService;
-        this.logProvider = FormattedLogProvider.toOutputStream( System.out );
-        this.fileSystemAbstraction = new DefaultFileSystemAbstraction();
     }
 
     @Override
     public void execute( String[] args ) throws IncorrectUsage, CommandFailed
     {
         String database;
         Boolean verbose;
-        File tuningConfigFile;
+        File additionalConfigFile;
 
         Args parsedArgs = Args.parse( args );
         try
         {
             database = parsedArgs.interpretOption( "database", Converters.mandatory(), s -> s );
             verbose = parsedArgs.getBoolean( "verbose" );
-            tuningConfigFile =
-                    parsedArgs.interpretOption( "tuning-confing", Converters.optional(), Converters.toFile() );
+            additionalConfigFile =
+                    parsedArgs.interpretOption( "additional-config", Converters.optional(), Converters.toFile() );
         }
         catch ( IllegalArgumentException e )
         {
             throw new IncorrectUsage( e.getMessage() );
         }
 
-        Config config = loadNeo4jConfig( homeDir, configDir, database, loadTuningConfig( tuningConfigFile ) );
+        Config config = loadNeo4jConfig( homeDir, configDir, database, loadAdditionalConfig( additionalConfigFile ) );
 
         try
         {
             consistencyCheckService.runFullConsistencyCheck( config.get( database_path ), config,
-                    ProgressMonitorFactory.textual( System.err ), logProvider, fileSystemAbstraction, verbose );
+                    ProgressMonitorFactory.textual( System.err ), FormattedLogProvider.toOutputStream( System.out ),
+                    new DefaultFileSystemAbstraction(), verbose );
         }
         catch ( ConsistencyCheckIncompleteException | IOException e )
         {
-            throw new CommandFailed( "Consistency checking failed.", e );
+            throw new CommandFailed( "Consistency checking failed." + e.getMessage(), e );
         }
     }
 
-    private Map<String,String> loadTuningConfig( File tuningConfigFile )
+    private Map<String,String> loadAdditionalConfig( File additionalConfigFile )
     {
-        if ( tuningConfigFile == null )
+        if ( additionalConfigFile == null )
         {
             return new HashMap<>();
         }
 
         try
         {
-            return MapUtil.load( tuningConfigFile );
+            return MapUtil.load( additionalConfigFile );
         }
         catch ( IOException e )
         {
             throw new IllegalArgumentException(
-                    String.format( "Could not read configuration file [%s]", tuningConfigFile ), e );
+                    String.format( "Could not read configuration file [%s]", additionalConfigFile ), e );
         }
     }
 
@@ -159,10 +154,7 @@ private static Config loadNeo4jConfig( Path homeDir, Path configDir, String data
 
     private static List<Class<?>> settings()
     {
-        List<Class<?>> settings = new ArrayList<>();
-        settings.add( GraphDatabaseSettings.class );
-        settings.add( DatabaseManagementSystemSettings.class );
-        settings.add( ConsistencyCheckSettings.class );
-        return settings;
+        return Arrays.asList( GraphDatabaseSettings.class, DatabaseManagementSystemSettings.class,
+                ConsistencyCheckSettings.class );
     }
 }