Skip to content

Commit 29792d5

Browse files
limejunymtughan
andcommitted
[JENKINS-71015] Re-Support Job DSL
Detail ====== - After active-choices-plugin 2.6.0, it use `ScriptlerBuilder` instead of `scriptlerScriptId` and `parameter`. But `ScriptlerBuilder` doesn't have `DataBoundConstructor` annotation, so Job DSL can't recognize the scriptler script syntax in `cascadeChoiceParameter`. - Before 2.5.7 - ![image](https://github.com/biouno/uno-choice-plugin/assets/16630665/3ed374fd-5744-4f3c-b567-aa6fedad0450) - ``` scriptlerScript { scriptlerScriptId(String value) parameters { scriptlerScriptParameter { name(String value) } } } ``` - After 2.6.0 - ![image](https://github.com/biouno/uno-choice-plugin/assets/16630665/cec02a53-486f-424b-bebe-c25977c1a46a) - After this commit - ![image](https://github.com/jenkinsci/scriptler-plugin/assets/16630665/8036bfa7-777d-4a2d-9ae8-d75b470bae47) - ``` scriptlerScript { scriptlerBuilder { buildersId(String value) scriptId(String value) propagateParams(boolean value) parameters { parameter { name(String value) value(String value) } } } isSandboxed(Boolean value) scriptlerScriptId(String value) } ``` Co-authored-by: Michael Tughan <mtughan@gmail.com>
1 parent 4522acd commit 29792d5

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.jenkinsci.plugins.scriptler.util.UIHelper;
4141
import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
4242
import org.jenkinsci.plugins.tokenmacro.TokenMacro;
43+
import org.kohsuke.stapler.DataBoundConstructor;
4344
import org.kohsuke.stapler.HttpResponse;
4445
import org.kohsuke.stapler.Stapler;
4546
import org.kohsuke.stapler.StaplerRequest;
@@ -81,6 +82,7 @@ public ScriptlerBuilder(String builderId, String scriptId, boolean propagatePara
8182
this(builderId, scriptId, propagateParams, Arrays.asList(Objects.requireNonNull(parameters)));
8283
}
8384

85+
@DataBoundConstructor
8486
public ScriptlerBuilder(String builderId, String scriptId, boolean propagateParams, @NonNull List<Parameter> parameters) {
8587
this.builderId = builderId;
8688
this.scriptId = scriptId;

src/main/java/org/jenkinsci/plugins/scriptler/config/Parameter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jenkinsci.plugins.scriptler.config;
22

33
import net.sf.json.JSONObject;
4+
import org.kohsuke.stapler.DataBoundConstructor;
45

56
import java.io.Serializable;
67
import java.util.*;
@@ -25,6 +26,7 @@ public Parameter(JSONObject object) {
2526
value = object.getString(VALUE);
2627
}
2728

29+
@DataBoundConstructor
2830
public Parameter(String name, String value) {
2931
this.name = name;
3032
this.value = value;

0 commit comments

Comments
 (0)