Refactor: getCommand() no longer needed

pesse · pesse · commit 1b65b5128445 · 2019-06-13T22:36:20.000+02:00
diff --git a/src/main/java/org/utplsql/cli/ICommand.java b/src/main/java/org/utplsql/cli/ICommand.java
@@ -1,11 +1,15 @@
 package org.utplsql.cli;
 
-/** Interface to decouple JCommander commands
+/** This is the very basic interface that should be implemented by all utPLSQL cli commands
  *
  * @author pesse
  */
 public interface ICommand {
-    int run();
 
-    String getCommand();
+    /** We expect the command to handle all eventually occuring exceptions
+     * and return an exit code
+     *
+     * @return exit code integer
+     */
+    int run();
 }
diff --git a/src/main/java/org/utplsql/cli/ReportersCommand.java b/src/main/java/org/utplsql/cli/ReportersCommand.java
@@ -6,12 +6,15 @@
 import org.utplsql.api.reporter.inspect.ReporterInfo;
 import org.utplsql.api.reporter.inspect.ReporterInspector;
 import org.utplsql.cli.exception.DatabaseConnectionFailed;
-import picocli.CommandLine.*;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Parameters;
 
 import javax.sql.DataSource;
 import java.io.PrintStream;
 import java.sql.Connection;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
 
 @Command( name = "reporters", description = "prints a list of reporters available in the specified database")
 public class ReportersCommand implements ICommand {
@@ -43,11 +46,6 @@ public int run() {
         return 0;
     }
 
-    @Override
-    public String getCommand() {
-        return "reporters";
-    }
-
     private void writeReporters(List<ReporterInfo> reporterInfos, PrintStream out) {
         reporterInfos.stream()
                 .sorted(Comparator.comparing(ReporterInfo::getName))
diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -249,11 +249,6 @@ public int run() {
         return getRunAction().run();
     }
 
-    @Override
-    public String getCommand() {
-        return null;
-    }
-
     @Override
     public TestRunner newTestRunner(List<Reporter> reporterList) {
         return getRunAction().newTestRunner(reporterList);
diff --git a/src/main/java/org/utplsql/cli/VersionInfoCommand.java b/src/main/java/org/utplsql/cli/VersionInfoCommand.java
@@ -48,9 +48,4 @@ private void writeUtPlsqlVersion( String connectString ) throws SQLException {
             }
         }
     }
-
-    @Override
-    public String getCommand() {
-        return "info";
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,4 @@ private void writeUtPlsqlVersion( String connectString ) throws SQLException {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-`
`52`		`- @Override`
`53`		`- public String getCommand() {`
`54`		`- return "info";`
`55`		`- }`
`56`	`51`	`}`