Rename neo4j-admin version command to store-info

community/dbms/src/main/java/org/neo4j/commandline/dbms/VersionCommand.java → community/dbms/src/main/java/org/neo4j/commandline/dbms/StoreInfoCommand.java

@@ -40,15 +40,15 @@
 
 import static org.neo4j.kernel.impl.store.format.RecordFormatSelector.findSuccessor;
 
-public class VersionCommand implements AdminCommand
+public class StoreInfoCommand implements AdminCommand
 {
     private static final Arguments arguments = new Arguments()
             .withArgument( new MandatoryCanonicalPath( "store", "path-to-dir",
-                    "Path to database store to check version of." ) );
+                    "Path to database store." ) );
 
     private Consumer<String> out;
 
-    public VersionCommand( Consumer<String> out )
+    public StoreInfoCommand( Consumer<String> out )
     {
         this.out = out;
     }
@@ -69,17 +69,17 @@ public void execute( String[] args ) throws IncorrectUsage, CommandFailed
                             () -> new CommandFailed( String.format( "Could not find version metadata in store '%s'",
                                     storeDir ) ) );
 
-            final String fmt = "%-25s%s";
+            final String fmt = "%-30s%s";
             out.accept( String.format( fmt, "Store format version:", storeVersion ) );
 
             RecordFormats format = RecordFormatSelector.selectForVersion( storeVersion );
-            out.accept( String.format( fmt, "Introduced in version:", format.introductionVersion() ) );
+            out.accept( String.format( fmt, "Store format introduced in:", format.introductionVersion() ) );
 
             findSuccessor( format )
-                    .map( next -> String.format( fmt, "Superseded in version:", next.introductionVersion() ) )
+                    .map( next -> String.format( fmt, "Store format superseded in:", next.introductionVersion() ) )
                     .ifPresent( out );
 
-            out.accept( String.format( fmt, "Current version:", Version.getNeo4jVersion() ) );
+            //out.accept( String.format( fmt, "Current version:", Version.getNeo4jVersion() ) );
         }
         catch ( IOException e )
         {

community/dbms/src/main/java/org/neo4j/commandline/dbms/VersionCommandProvider.java → community/dbms/src/main/java/org/neo4j/commandline/dbms/StoreInfoCommandProvider.java

@@ -27,26 +27,26 @@
 import org.neo4j.commandline.admin.OutsideWorld;
 import org.neo4j.commandline.arguments.Arguments;
 
-public class VersionCommandProvider extends AdminCommand.Provider
+public class StoreInfoCommandProvider extends AdminCommand.Provider
 {
 
-    public VersionCommandProvider()
+    public StoreInfoCommandProvider()
     {
-        super( "version" );
+        super( "store-info" );
     }
 
     @Override
     @Nonnull
     public Arguments allArguments()
     {
-        return VersionCommand.arguments();
+        return StoreInfoCommand.arguments();
     }
 
     @Override
     @Nonnull
     public String summary()
     {
-        return "Check the version of a Neo4j database store.";
+        return "Prints information about a Neo4j database store.";
     }
 
     @Override
@@ -60,14 +60,14 @@ public AdminCommandSection commandSection()
     @Nonnull
     public String description()
     {
-        return "Checks the version of a Neo4j database store. Note that this command expects a path to a store " +
-                "directory, for example --store=data/databases/graph.db.";
+        return "Prints information about a Neo4j database store, such as what version of Neo4j created it. Note that " +
+                "this command expects a path to a store directory, for example --store=data/databases/graph.db.";
     }
 
     @Override
     @Nonnull
     public AdminCommand create( Path homeDir, Path configDir, OutsideWorld outsideWorld )
     {
-        return new VersionCommand( outsideWorld::stdOutLine );
+        return new StoreInfoCommand( outsideWorld::stdOutLine );
     }
 }

community/dbms/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider

@@ -1,4 +1,4 @@
 org.neo4j.commandline.dbms.ImportCommandProvider
 org.neo4j.commandline.dbms.DumpCommandProvider
 org.neo4j.commandline.dbms.LoadCommandProvider
-org.neo4j.commandline.dbms.VersionCommandProvider
+org.neo4j.commandline.dbms.StoreInfoCommandProvider

community/dbms/src/test/java/org/neo4j/commandline/dbms/VersionCommandTest.java → community/dbms/src/test/java/org/neo4j/commandline/dbms/StoreInfoCommandTest.java

@@ -52,7 +52,7 @@
 import static org.mockito.Mockito.verify;
 import static org.neo4j.kernel.impl.store.MetaDataStore.Position.STORE_VERSION;
 
-public class VersionCommandTest
+public class StoreInfoCommandTest
 {
     @Rule
     public TestDirectory testDirectory = TestDirectory.testDirectory();
@@ -65,7 +65,7 @@ public class VersionCommandTest
 
     private Path databaseDirectory;
     private ArgumentCaptor<String> outCaptor;
-    private VersionCommand command;
+    private StoreInfoCommand command;
     private Consumer<String> out;
 
     @Before
@@ -77,7 +77,7 @@ public void setUp() throws Exception
 
         outCaptor = ArgumentCaptor.forClass( String.class );
         out = mock( Consumer.class );
-        command = new VersionCommand( out );
+        command = new StoreInfoCommand( out );
     }
 
     @Test
@@ -87,15 +87,16 @@ public void shouldPrintNiceHelp() throws Exception
         {
             PrintStream ps = new PrintStream( baos );
             Usage usage = new Usage( "neo4j-admin", mock( CommandLocator.class ) );
-            usage.printUsageForCommand( new VersionCommandProvider(), ps::println );
+            usage.printUsageForCommand( new StoreInfoCommandProvider(), ps::println );
 
-            assertEquals( String.format( "usage: neo4j-admin version --store=<path-to-dir>%n" +
+            assertEquals( String.format( "usage: neo4j-admin store-info --store=<path-to-dir>%n" +
                             "%n" +
-                            "Checks the version of a Neo4j database store. Note that this command expects a%n" +
-                            "path to a store directory, for example --store=data/databases/graph.db.%n" +
+                            "Prints information about a Neo4j database store, such as what version of Neo4j%n" +
+                            "created it. Note that this command expects a path to a store directory, for%n" +
+                            "example --store=data/databases/graph.db.%n" +
                             "%n" +
                             "options:%n" +
-                            "  --store=<path-to-dir>   Path to database store to check version of.%n" ),
+                            "  --store=<path-to-dir>   Path to database store.%n" ),
                     baos.toString() );
         }
     }
@@ -135,13 +136,12 @@ public void readsLatestStoreVersionCorrectly() throws Exception
 
         execute( databaseDirectory.toString() );
 
-        verify( out, times( 3 ) ).accept( outCaptor.capture() );
+        verify( out, times( 2 ) ).accept( outCaptor.capture() );
 
         assertEquals(
                 Arrays.asList(
-                        String.format( "Store format version:    %s", currentFormat.storeVersion() ),
-                        String.format( "Introduced in version:   %s", currentFormat.introductionVersion() ),
-                        String.format( "Current version:         %s", Version.getNeo4jVersion() ) ),
+                        String.format( "Store format version:         %s", currentFormat.storeVersion() ),
+                        String.format( "Store format introduced in:   %s", currentFormat.introductionVersion() ) ),
                 outCaptor.getAllValues() );
     }
 
@@ -152,14 +152,13 @@ public void readsOlderStoreVersionCorrectly() throws Exception
 
         execute( databaseDirectory.toString() );
 
-        verify( out, times( 4 ) ).accept( outCaptor.capture() );
+        verify( out, times( 3 ) ).accept( outCaptor.capture() );
 
         assertEquals(
                 Arrays.asList(
-                        "Store format version:    v0.A.5",
-                        "Introduced in version:   2.2.0",
-                        "Superseded in version:   2.3.0",
-                        String.format( "Current version:         %s", Version.getNeo4jVersion() ) ),
+                        "Store format version:         v0.A.5",
+                        "Store format introduced in:   2.2.0",
+                        "Store format superseded in:   2.3.0" ),
                 outCaptor.getAllValues() );
     }
 

enterprise/neo4j-enterprise/src/test/java/org/neo4j/commandline/dbms/VersionCommandEnterpriseTest.java → enterprise/neo4j-enterprise/src/test/java/org/neo4j/commandline/dbms/StoreInfoCommandEnterpriseTest.java

@@ -45,7 +45,7 @@
 import static org.mockito.Mockito.verify;
 import static org.neo4j.kernel.impl.store.MetaDataStore.Position.STORE_VERSION;
 
-public class VersionCommandEnterpriseTest
+public class StoreInfoCommandEnterpriseTest
 {
     @Rule
     public TestDirectory testDirectory = TestDirectory.testDirectory();
@@ -58,7 +58,7 @@ public class VersionCommandEnterpriseTest
 
     private Path databaseDirectory;
     private ArgumentCaptor<String> outCaptor;
-    private VersionCommand command;
+    private StoreInfoCommand command;
     private Consumer<String> out;
 
     @Before
@@ -69,7 +69,7 @@ public void setUp() throws Exception
         Files.createDirectories( databaseDirectory );
         outCaptor = ArgumentCaptor.forClass( String.class );
         out = mock( Consumer.class );
-        command = new VersionCommand( out );
+        command = new StoreInfoCommand( out );
     }
 
     @Test
@@ -79,14 +79,13 @@ public void readsEnterpriseStoreVersionCorrectly() throws Exception
 
         execute( databaseDirectory.toString() );
 
-        verify( out, times( 4 ) ).accept( outCaptor.capture() );
+        verify( out, times( 3 ) ).accept( outCaptor.capture() );
 
         assertEquals(
                 Arrays.asList(
-                        "Store format version:    vE.H.0",
-                        "Introduced in version:   3.0.0",
-                        "Superseded in version:   3.0.6",
-                        String.format( "Current version:         %s", Version.getNeo4jVersion() ) ),
+                        "Store format version:         vE.H.0",
+                        "Store format introduced in:   3.0.0",
+                        "Store format superseded in:   3.0.6" ),
                 outCaptor.getAllValues() );
     }