Merge pull request #296 from jglick/CLICommandInvoker

CLICommandInvoker was being too strict about how a CLICommand was registered
jenkinsci · Apr 19, 2021 · 7adf295 · 7adf295
2 parents 2344300 + 98ff4c8
commit 7adf295
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/main/java/hudson/cli/CLICommandInvoker.java b/src/main/java/hudson/cli/CLICommandInvoker.java
@@ -24,7 +24,7 @@
 
 package hudson.cli;
 
-import hudson.Extension;
+import hudson.ExtensionList;
 import hudson.model.User;
 import hudson.security.ACL;
 import hudson.security.AuthorizationStrategy;
@@ -78,13 +78,7 @@ public class CLICommandInvoker {
 
     public CLICommandInvoker(final JenkinsRule rule, final CLICommand command) {
 
-        if (command.getClass().getAnnotation(Extension.class) == null) {
-
-            throw new AssertionError(String.format(
-                    "Command %s is missing @Extension annotation.",
-                    command.getClass()
-            ));
-        }
+        ExtensionList.lookupSingleton(command.getClass()); // verify that it was registered e.g. with @Extension
 
         this.rule = rule;
         this.command = command;