Skip to content

Commit d01d180

Browse files
yaroslavafenkinmtughan
authored andcommitted
[JENKINS-74741] Migrate from FromApply#applyResponse in ScriptlerBuilder.java
1 parent 5d0d63f commit d01d180

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
<spotless.check.skip>false</spotless.check.skip>
3030
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
3131
<jenkins.baseline>2.479</jenkins.baseline>
32-
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
32+
<!-- TODO: switch back to the LTS baseline once the CSP fix is in LTS -->
33+
<!--<jenkins.version>${jenkins.baseline}.1</jenkins.version>-->
34+
<jenkins.version>2.482</jenkins.version>
3335
</properties>
3436

3537
<dependencyManagement>

src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,10 @@ private Stream<String> buildMessages() {
437437
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
438438
throws IOException, ServletException {
439439
if (FormApply.isApply(req)) {
440-
String script = buildMessages()
441-
.map(QuotedStringTokenizer::quote)
442-
.map(error -> "notificationBar.show(" + error + ",notificationBar.ERROR)")
443-
.collect(Collectors.joining(""));
444-
FormApply.applyResponse(script).generateResponse(req, rsp, node);
440+
String script =
441+
buildMessages().map(QuotedStringTokenizer::quote).collect(Collectors.joining(""));
442+
FormApply.showNotification(script, FormApply.NotificationType.ERROR)
443+
.generateResponse(req, rsp, node);
445444
} else {
446445
new Failure(getAggregatedMessage()).generateResponse(req, rsp, node);
447446
}

0 commit comments

Comments
 (0)