Better error response from doBuildWithParameters (#10954)

Author: jglick

core/src/main/java/jenkins/model/ParameterizedJobMixIn.java

@@ -24,6 +24,7 @@
 
 package jenkins.model;
 
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;
 import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;
 
@@ -201,7 +202,7 @@ public final void doBuild(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParam
         }
 
         if (!asJob().isBuildable()) {
-            throw HttpResponses.error(SC_CONFLICT, new IOException(asJob().getFullName() + " is not buildable"));
+            throw HttpResponses.errorWithoutStack(SC_CONFLICT, asJob().getFullName() + " is not buildable");
         }
 
         // if a build is parameterized, let that take over
@@ -238,12 +239,12 @@ public final void doBuildWithParameters(StaplerRequest2 req, StaplerResponse2 rs
 
         ParametersDefinitionProperty pp = asJob().getProperty(ParametersDefinitionProperty.class);
         if (!asJob().isBuildable()) {
-            throw HttpResponses.error(SC_CONFLICT, new IOException(asJob().getFullName() + " is not buildable!"));
+            throw HttpResponses.errorWithoutStack(SC_CONFLICT, asJob().getFullName() + " is not buildable");
         }
         if (pp != null) {
             pp.buildWithParameters(req, rsp, delay);
         } else {
-            throw new IllegalStateException("This build is not parameterized!");
+            throw HttpResponses.errorWithoutStack(SC_BAD_REQUEST, asJob().getFullName() + " is not parameterized");
         }
     }
 

test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java

@@ -81,9 +81,22 @@ void doBuildWithParameters_shouldFailWhenInvokingDisabledProject() throws Except
 
         FailingHttpStatusCodeException fex = assertThrows(
                 FailingHttpStatusCodeException.class,
-                () -> webClient.getPage(webClient.addCrumb(new WebRequest(new URL(j.getURL(), project.getUrl() + "build?delay=0"), HttpMethod.POST))),
+                () -> webClient.getPage(webClient.addCrumb(new WebRequest(new URL(j.getURL(), project.getUrl() + "buildWithParameters?FOO=x"), HttpMethod.POST))),
                 "should fail when invoking disabled project");
-        assertThat("Should fail with conflict", fex.getStatusCode(), is(409));
+        assertThat("Should fail with conflict", fex.getStatusCode(), is(HttpServletResponse.SC_CONFLICT));
+    }
+
+    @Test
+    void doBuildWithParameters_shouldFailWhenInvokingNonParameterizedProject() throws Exception {
+        final FreeStyleProject project = j.createFreeStyleProject();
+
+        final JenkinsRule.WebClient webClient = j.createWebClient();
+
+        FailingHttpStatusCodeException fex = assertThrows(
+                FailingHttpStatusCodeException.class,
+                () -> webClient.getPage(webClient.addCrumb(new WebRequest(new URL(j.getURL(), project.getUrl() + "buildWithParameters?FOO=x"), HttpMethod.POST))),
+                "should fail when invoking non-parameterized project");
+        assertThat("Should fail with bad request", fex.getStatusCode(), is(HttpServletResponse.SC_BAD_REQUEST));
     }
 
     @Test