Organizing commands

clun · clun · commit 685fd2cf38ce · 2022-06-03T02:39:25.000+02:00
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/AstraCli.java b/astra-shell/src/main/java/com/datastax/astra/shell/AstraCli.java
@@ -1,10 +1,9 @@
 package com.datastax.astra.shell;
 
 import com.datastax.astra.shell.cmd.HelpCustomCommand;
-import com.datastax.astra.shell.cmd.ReplCommand;
 import com.datastax.astra.shell.cmd.db.ShowDatabasesCommand;
-import com.datastax.astra.shell.cmd.db.ShowOrganizationsCommand;
-import com.datastax.astra.shell.cmd.db.ShowOrganizationsCommand;
+import com.datastax.astra.shell.cmd.org.ShowOrganizationsCommand;
+import com.datastax.astra.shell.cmd.repl.ReplCommand;
 import com.datastax.astra.shell.utils.ShellPrinter;
 import com.github.rvesse.airline.annotations.Cli;
 import com.github.rvesse.airline.annotations.Group;
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/AstraShell.java b/astra-shell/src/main/java/com/datastax/astra/shell/AstraShell.java
@@ -1,11 +1,11 @@
 package com.datastax.astra.shell;
 
 import com.datastax.astra.shell.cmd.HelpCustomCommand;
-import com.datastax.astra.shell.cmd.ConnectCommand;
-import com.datastax.astra.shell.cmd.EmptyCommand;
-import com.datastax.astra.shell.cmd.ExitCommand;
 import com.datastax.astra.shell.cmd.db.ShowDatabasesCommand;
-import com.datastax.astra.shell.cmd.db.ShowOrganizationsCommand;
+import com.datastax.astra.shell.cmd.org.ConnectCommand;
+import com.datastax.astra.shell.cmd.org.ShowOrganizationsCommand;
+import com.datastax.astra.shell.cmd.repl.EmptyCommand;
+import com.datastax.astra.shell.cmd.repl.ExitCommand;
 import com.datastax.astra.shell.jansi.Out;
 import com.datastax.astra.shell.jansi.TextColor;
 import com.github.rvesse.airline.annotations.Cli;
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/db/ShowCommandGroup.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/db/ShowCommandGroup.java
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/org/ConnectCommand.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/org/ConnectCommand.java
@@ -1,4 +1,4 @@
-package com.datastax.astra.shell.cmd;
+package com.datastax.astra.shell.cmd.org;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/org/ShowOrganizationsCommand.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/org/ShowOrganizationsCommand.java
@@ -1,4 +1,4 @@
-package com.datastax.astra.shell.cmd.db;
+package com.datastax.astra.shell.cmd.org;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/EmptyCommand.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/EmptyCommand.java
@@ -1,4 +1,4 @@
-package com.datastax.astra.shell.cmd;
+package com.datastax.astra.shell.cmd.repl;
 
 import com.github.rvesse.airline.annotations.Command;
 
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/ExitCommand.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/ExitCommand.java
@@ -1,4 +1,4 @@
-package com.datastax.astra.shell.cmd;
+package com.datastax.astra.shell.cmd.repl;
 
 import com.datastax.astra.shell.ExitCode;
 import com.datastax.astra.shell.jansi.Out;
diff --git a/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/ReplCommand.java b/astra-shell/src/main/java/com/datastax/astra/shell/cmd/repl/ReplCommand.java
@@ -1,10 +1,11 @@
-package com.datastax.astra.shell.cmd;
+package com.datastax.astra.shell.cmd.repl;
 
 import java.util.Scanner;
 
 import com.datastax.astra.shell.AstraCli;
 import com.datastax.astra.shell.AstraShell;
 import com.datastax.astra.shell.ExitCode;
+import com.datastax.astra.shell.cmd.BaseCommand;
 import com.datastax.astra.shell.utils.CommandLineUtils;
 import com.datastax.astra.shell.utils.ShellPrinter;
 import com.github.rvesse.airline.annotations.Command;
diff --git a/astra-shell/src/test/java/com/datastax/processor/SampleGroup.java b/astra-shell/src/test/java/com/datastax/processor/SampleGroup.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.datastax.astra.shell.cmd;`
	`1`	`+package com.datastax.astra.shell.cmd.org;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.List;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.datastax.astra.shell.cmd.db;`
	`1`	`+package com.datastax.astra.shell.cmd.org;`
`2`	`2`
`3`	`3`	`import java.util.HashMap;`
`4`	`4`	`import java.util.Map;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.datastax.astra.shell.cmd;`
	`1`	`+package com.datastax.astra.shell.cmd.repl;`
`2`	`2`
`3`	`3`	`import com.github.rvesse.airline.annotations.Command;`
`4`	`4`