rename to onThrowable

Author: apuig

core/src/main/java/hudson/cli/CLICommand.java

@@ -266,7 +266,7 @@ public int main(List<String> args, Locale locale, InputStream stdin, PrintStream
             return res;
         } catch (Throwable e) {
             int exitCode = handleException(e, context, p);
-            Listeners.notify(CLIListener.class, true, listener -> listener.onException(context, e));
+            Listeners.notify(CLIListener.class, true, listener -> listener.onThrowable(context, e));
             return exitCode;
         } finally {
             if (sc != null)

core/src/main/java/hudson/cli/declarative/CLIRegisterer.java

@@ -233,7 +233,7 @@ public int main(List<String> args, Locale locale, InputStream stdin, PrintStream
                                 }
                             } catch (Throwable e) {
                                 int exitCode = handleException(e, context, parser);
-                                Listeners.notify(CLIListener.class, true, listener -> listener.onException(context, e));
+                                Listeners.notify(CLIListener.class, true, listener -> listener.onThrowable(context, e));
                                 return exitCode;
                             }
                         }

core/src/main/java/jenkins/cli/listeners/CLIListener.java

@@ -38,23 +38,23 @@ public interface CLIListener extends ExtensionPoint {
     /**
      * Invoked before command execution.
      *
-     * @param context Information about the command being executed
+     * @param context Information about the command being executed.
      * */
     default void onExecution(@NonNull CLIContext context) {}
 
     /**
      * Invoked after command execution.
      *
-     * @param context Information about the command being executed
+     * @param context Information about the command being executed.
      * @param exitCode Exit code returned by the implementation of {@link CLICommand#run()}.
      * */
     default void onCompleted(@NonNull CLIContext context, int exitCode) {}
 
     /**
-     * Invoked on command exception.
+     * Invoked when an exception or error occurs during command execution.
      *
-     * @param context Information about the command being executed
+     * @param context Information about the command being executed.
      * @param t Any error during the execution of the command.
      * */
-    default void onException(@NonNull CLIContext context, @NonNull Throwable t) {}
+    default void onThrowable(@NonNull CLIContext context, @NonNull Throwable t) {}
 }

core/src/main/java/jenkins/cli/listeners/DefaultCLIListener.java

@@ -59,7 +59,7 @@ public void onCompleted(CLIContext context, int exitCode) {
     }
 
     @Override
-    public void onException(CLIContext context, Throwable t) {
+    public void onThrowable(CLIContext context, Throwable t) {
         if (t instanceof BadCredentialsException) {
             // to the caller (stderr), we can't reveal whether the user didn't exist or the password didn't match.
             // do that to the server log instead

test/src/test/java/jenkins/cli/DefaultCLIListenerTest.java

@@ -67,7 +67,7 @@ public void setUp() throws IOException {
     }
 
     @Test
-    public void commandExecutionSuccessIsLogged() throws Exception {
+    public void commandOnCompletedIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, new ListJobsCommand());
         command.asUser(USER).invoke();
 
@@ -83,7 +83,7 @@ public void commandExecutionSuccessIsLogged() throws Exception {
     }
 
     @Test
-    public void commandExecutionErrorIsLogged() throws Exception {
+    public void commandOnThrowableIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, new ListJobsCommand());
         command.asUser(USER).invokeWithArgs("view-not-found");
 
@@ -101,7 +101,7 @@ public void commandExecutionErrorIsLogged() throws Exception {
     }
 
     @Test
-    public void commandExecutionUnexpectedErrorIsLogged() throws Exception {
+    public void commandOnThrowableUnexpectedIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, new ThrowsTestCommand());
         command.asUser(USER).invoke();
 
@@ -118,7 +118,7 @@ public void commandExecutionUnexpectedErrorIsLogged() throws Exception {
     }
 
     @Test
-    public void methodExecutionSuccessIsLogged() throws Exception {
+    public void methodOnCompletedIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, "disable-job");
         command.asUser(USER).invokeWithArgs("p");
 
@@ -134,7 +134,7 @@ public void methodExecutionSuccessIsLogged() throws Exception {
     }
 
     @Test
-    public void methodExecutionErrorIsLogged() throws Exception {
+    public void methodOnThrowableIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, "disable-job");
         command.asUser(USER).invokeWithArgs("job-not-found");
 
@@ -153,7 +153,7 @@ public void methodExecutionErrorIsLogged() throws Exception {
     }
 
     @Test
-    public void methodExecutionUnexpectedErrorIsLogged() throws Exception {
+    public void methodOnThrowableUnexpectedIsLogged() throws Exception {
         CLICommandInvoker command = new CLICommandInvoker(j, "restart");
         command.asUser(USER).invoke();