Skip to content

Commit 03411e0

Browse files
rantoniukrantoniuk
authored
Merge pull request #635 from basil/jakarta
2 parents fa470ad + e2b91cd commit 03411e0

11 files changed

+24
-24
lines changed

‎src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.kohsuke.stapler.AncestorInPath;
4040
import org.kohsuke.stapler.DataBoundConstructor;
4141
import org.kohsuke.stapler.QueryParameter;
42-
import org.kohsuke.stapler.StaplerRequest;
42+
import org.kohsuke.stapler.StaplerRequest2;
4343

4444
/**
4545
* When a build fails it creates jira issues.
@@ -520,7 +520,7 @@ public ListBoxModel doFillTypeIdItems(@AncestorInPath final Item item) {
520520
}
521521

522522
@Override
523-
public JiraCreateIssueNotifier newInstance(StaplerRequest req, JSONObject formData) throws FormException {
523+
public JiraCreateIssueNotifier newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
524524
return req.bindJSON(JiraCreateIssueNotifier.class, formData);
525525
}
526526

‎src/main/java/hudson/plugins/jira/JiraIssueMigrator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import hudson.tasks.Publisher;
1313
import net.sf.json.JSONObject;
1414
import org.kohsuke.stapler.DataBoundConstructor;
15-
import org.kohsuke.stapler.StaplerRequest;
15+
import org.kohsuke.stapler.StaplerRequest2;
1616

1717
public class JiraIssueMigrator extends Notifier {
1818

@@ -146,7 +146,7 @@ public DescriptorImpl() {
146146
}
147147

148148
@Override
149-
public JiraIssueMigrator newInstance(StaplerRequest req, JSONObject formData) throws FormException {
149+
public JiraIssueMigrator newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
150150
return req.bindJSON(JiraIssueMigrator.class, formData);
151151
}
152152

‎src/main/java/hudson/plugins/jira/JiraMailAddressResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.logging.Logger;
99
import java.util.regex.Pattern;
1010
import org.kohsuke.stapler.Stapler;
11-
import org.kohsuke.stapler.StaplerRequest;
11+
import org.kohsuke.stapler.StaplerRequest2;
1212

1313
/**
1414
* Resolve user email by searching his userId as username in Jira.
@@ -35,7 +35,7 @@ public String findMailAddressFor(User u) {
3535

3636
Job<?, ?> job = null;
3737

38-
StaplerRequest req = Stapler.getCurrentRequest();
38+
StaplerRequest2 req = Stapler.getCurrentRequest2();
3939
if (req != null) {
4040
job = req.findAncestorObject(Job.class);
4141
}

‎src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import hudson.tasks.Publisher;
1212
import net.sf.json.JSONObject;
1313
import org.kohsuke.stapler.DataBoundConstructor;
14-
import org.kohsuke.stapler.StaplerRequest;
14+
import org.kohsuke.stapler.StaplerRequest2;
1515

1616
/**
1717
* Task which releases the jira version specified in the parameters when the build completes.
@@ -91,7 +91,7 @@ public DescriptorImpl() {
9191
}
9292

9393
@Override
94-
public JiraReleaseVersionUpdater newInstance(StaplerRequest req, JSONObject formData) throws FormException {
94+
public JiraReleaseVersionUpdater newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
9595
return req.bindJSON(JiraReleaseVersionUpdater.class, formData);
9696
}
9797

‎src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import jenkins.tasks.SimpleBuildStep;
1313
import net.sf.json.JSONObject;
1414
import org.kohsuke.stapler.DataBoundConstructor;
15-
import org.kohsuke.stapler.StaplerRequest;
15+
import org.kohsuke.stapler.StaplerRequest2;
1616

1717
/**
1818
* Created by Reda on 18/12/2014.
@@ -96,7 +96,7 @@ public String getHelpFile() {
9696
}
9797

9898
@Override
99-
public JiraReleaseVersionUpdaterBuilder newInstance(StaplerRequest req, JSONObject formData)
99+
public JiraReleaseVersionUpdaterBuilder newInstance(StaplerRequest2 req, JSONObject formData)
100100
throws FormException {
101101
return req.bindJSON(JiraReleaseVersionUpdaterBuilder.class, formData);
102102
}

‎src/main/java/hudson/plugins/jira/JiraSite.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import hudson.util.FormValidation;
4747
import hudson.util.ListBoxModel;
4848
import hudson.util.Secret;
49+
import jakarta.servlet.ServletException;
4950
import java.io.File;
5051
import java.io.IOException;
5152
import java.io.PrintStream;
@@ -76,7 +77,6 @@
7677
import java.util.logging.Logger;
7778
import java.util.regex.Pattern;
7879
import javax.annotation.PreDestroy;
79-
import javax.servlet.ServletException;
8080
import jenkins.model.Jenkins;
8181
import org.kohsuke.stapler.AncestorInPath;
8282
import org.kohsuke.stapler.DataBoundConstructor;

‎src/main/java/hudson/plugins/jira/JiraVersionCreator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import hudson.tasks.Publisher;
1212
import net.sf.json.JSONObject;
1313
import org.kohsuke.stapler.DataBoundConstructor;
14-
import org.kohsuke.stapler.StaplerRequest;
14+
import org.kohsuke.stapler.StaplerRequest2;
1515

1616
/**
1717
* A build step which creates new Jira version
@@ -77,7 +77,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
7777
}
7878

7979
@Override
80-
public JiraVersionCreator newInstance(StaplerRequest req, JSONObject formData) throws FormException {
80+
public JiraVersionCreator newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
8181
return req.bindJSON(JiraVersionCreator.class, formData);
8282
}
8383

‎src/main/java/hudson/plugins/jira/JiraVersionCreatorBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import jenkins.tasks.SimpleBuildStep;
1313
import net.sf.json.JSONObject;
1414
import org.kohsuke.stapler.DataBoundConstructor;
15-
import org.kohsuke.stapler.StaplerRequest;
15+
import org.kohsuke.stapler.StaplerRequest2;
1616

1717
/**
1818
* A build step which creates new Jira version. It has the same functionality as
@@ -78,7 +78,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
7878
}
7979

8080
@Override
81-
public JiraVersionCreatorBuilder newInstance(StaplerRequest req, JSONObject formData) throws FormException {
81+
public JiraVersionCreatorBuilder newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
8282
return req.bindJSON(JiraVersionCreatorBuilder.class, formData);
8383
}
8484

‎src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.kohsuke.stapler.DataBoundConstructor;
3636
import org.kohsuke.stapler.DataBoundSetter;
3737
import org.kohsuke.stapler.Stapler;
38-
import org.kohsuke.stapler.StaplerRequest;
38+
import org.kohsuke.stapler.StaplerRequest2;
3939

4040
public class JiraIssueParameterDefinition extends ParameterDefinition {
4141
private static final long serialVersionUID = 3927562542249244416L;
@@ -50,7 +50,7 @@ public JiraIssueParameterDefinition(String name, String description, String jira
5050
}
5151

5252
@Override
53-
public ParameterValue createValue(StaplerRequest req) {
53+
public ParameterValue createValue(StaplerRequest2 req) {
5454
String[] values = req.getParameterValues(getName());
5555
if (values == null || values.length != 1) {
5656
return null;
@@ -60,7 +60,7 @@ public ParameterValue createValue(StaplerRequest req) {
6060
}
6161

6262
@Override
63-
public ParameterValue createValue(StaplerRequest req, JSONObject formData) {
63+
public ParameterValue createValue(StaplerRequest2 req, JSONObject formData) {
6464
JiraIssueParameterValue value = req.bindJSON(JiraIssueParameterValue.class, formData);
6565
return value;
6666
}
@@ -71,7 +71,7 @@ public ParameterValue createValue(CLICommand command, String value) throws IOExc
7171
}
7272

7373
public List<JiraIssueParameterDefinition.Result> getIssues() throws IOException, TimeoutException {
74-
Job<?, ?> job = Stapler.getCurrentRequest().findAncestorObject(Job.class);
74+
Job<?, ?> job = Stapler.getCurrentRequest2().findAncestorObject(Job.class);
7575

7676
JiraSite site = JiraSite.get(job);
7777
if (site == null) {

‎src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import hudson.tasks.BuildStepDescriptor;
2020
import hudson.tasks.Builder;
2121
import hudson.util.FormValidation;
22+
import jakarta.servlet.ServletException;
2223
import java.io.IOException;
2324
import java.io.PrintStream;
2425
import java.util.Collections;
2526
import java.util.List;
2627
import java.util.Set;
27-
import javax.servlet.ServletException;
2828
import jenkins.tasks.SimpleBuildStep;
2929
import org.kohsuke.stapler.DataBoundConstructor;
3030
import org.kohsuke.stapler.DataBoundSetter;

‎src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import net.sf.json.JSONObject;
1616
import org.kohsuke.stapler.DataBoundConstructor;
1717
import org.kohsuke.stapler.Stapler;
18-
import org.kohsuke.stapler.StaplerRequest;
18+
import org.kohsuke.stapler.StaplerRequest2;
1919

2020
public class JiraVersionParameterDefinition extends ParameterDefinition {
2121
private static final long serialVersionUID = 4232979892748310160L;
@@ -41,7 +41,7 @@ public JiraVersionParameterDefinition(
4141
}
4242

4343
@Override
44-
public ParameterValue createValue(StaplerRequest req) {
44+
public ParameterValue createValue(StaplerRequest2 req) {
4545
String[] values = req.getParameterValues(getName());
4646
if (values == null || values.length != 1) {
4747
return null;
@@ -50,7 +50,7 @@ public ParameterValue createValue(StaplerRequest req) {
5050
}
5151

5252
@Override
53-
public ParameterValue createValue(StaplerRequest req, JSONObject formData) {
53+
public ParameterValue createValue(StaplerRequest2 req, JSONObject formData) {
5454
JiraVersionParameterValue value = req.bindJSON(JiraVersionParameterValue.class, formData);
5555
return value;
5656
}
@@ -61,7 +61,7 @@ public ParameterValue createValue(CLICommand command, String value) throws IOExc
6161
}
6262

6363
public List<JiraVersionParameterDefinition.Result> getVersions() throws IOException {
64-
Job<?, ?> contextJob = Stapler.getCurrentRequest().findAncestorObject(Job.class);
64+
Job<?, ?> contextJob = Stapler.getCurrentRequest2().findAncestorObject(Job.class);
6565

6666
JiraSite site = JiraSite.get(contextJob);
6767
if (site == null) {

0 commit comments

Comments
 (0)