Skip to content

Commit d7c9f36

Browse files
basilbasil
authored
Migrate from EE 8 to EE 9 (#2599)
1 parent f95d8b9 commit d7c9f36

File tree

70 files changed

+273
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+273
-273
lines changed

‎blueocean-bitbucket-pipeline/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/AbstractBitbucketScm.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.kohsuke.accmod.restrictions.NoExternalUse;
2424
import org.kohsuke.stapler.HttpResponse;
2525
import org.kohsuke.stapler.Stapler;
26-
import org.kohsuke.stapler.StaplerRequest;
26+
import org.kohsuke.stapler.StaplerRequest2;
2727
import org.kohsuke.stapler.json.JsonBody;
2828

2929
import edu.umd.cs.findbugs.annotations.NonNull;
@@ -48,7 +48,7 @@ public AbstractBitbucketScm(Reachable parent) {
4848

4949
@Override
5050
public Object getState() {
51-
StaplerRequest request = Stapler.getCurrentRequest();
51+
StaplerRequest2 request = Stapler.getCurrentRequest2();
5252
Objects.requireNonNull(request, "Must be called in HTTP request context");
5353
String method = request.getMethod();
5454
if (!"POST".equalsIgnoreCase(method)) {
@@ -110,7 +110,7 @@ StandardUsernamePasswordCredentials getCredential(String apiUrl){
110110

111111
@Override
112112
public Container<ScmOrganization> getOrganizations() {
113-
StaplerRequest request = Stapler.getCurrentRequest();
113+
StaplerRequest2 request = Stapler.getCurrentRequest2();
114114
Objects.requireNonNull(request, "This request must be made in HTTP context");
115115
String method = request.getMethod();
116116
if (!"POST".equalsIgnoreCase(method)) {
@@ -339,17 +339,17 @@ public static BitbucketApi getApi(String apiUrl, String scmId, StandardUsernameP
339339

340340
protected abstract @NonNull String getDomainId();
341341

342-
protected StaplerRequest getStaplerRequest(){
343-
StaplerRequest request = Stapler.getCurrentRequest();
342+
protected StaplerRequest2 getStaplerRequest2(){
343+
StaplerRequest2 request = Stapler.getCurrentRequest2();
344344
Objects.requireNonNull(request, "Must be called in HTTP request context");
345345
return request;
346346
}
347347

348348
protected @NonNull String getApiUrlParameter(){
349-
return getApiUrlParameter(getStaplerRequest());
349+
return getApiUrlParameter(getStaplerRequest2());
350350
}
351351

352-
private @NonNull String getApiUrlParameter(StaplerRequest request){
352+
private @NonNull String getApiUrlParameter(StaplerRequest2 request){
353353
String apiUrl = request.getParameter("apiUrl");
354354
// Ensure apiUrl is not blank/null, otherwise BitbucketEndpointConfiguration.normalizeServerUrl() will
355355
// return bitbucket cloud API

‎blueocean-bitbucket-pipeline/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/AbstractBitbucketScmContentProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.commons.io.IOUtils;
2727
import org.apache.commons.lang.StringUtils;
2828
import org.kohsuke.stapler.Stapler;
29-
import org.kohsuke.stapler.StaplerRequest;
29+
import org.kohsuke.stapler.StaplerRequest2;
3030

3131
import java.io.IOException;
3232
import java.nio.charset.StandardCharsets;
@@ -90,7 +90,7 @@ protected ScmContentProviderParams getScmParamsFromItem(Item item) {
9090
}
9191

9292
@Override
93-
public Object saveContent(@NonNull StaplerRequest staplerRequest, @NonNull Item item) {
93+
public Object saveContent(@NonNull StaplerRequest2 staplerRequest, @NonNull Item item) {
9494
JSONObject body;
9595
try {
9696
body = JSONObject.fromObject(IOUtils.toString(staplerRequest.getReader()));
@@ -196,7 +196,7 @@ protected StandardUsernamePasswordCredentials getCredentialForUser(@NonNull fina
196196
throw new ServiceException.UnauthorizedException("No logged in user found");
197197
}
198198

199-
StaplerRequest request = Stapler.getCurrentRequest();
199+
StaplerRequest2 request = Stapler.getCurrentRequest2();
200200
String scmId = request.getParameter("scmId");
201201

202202
//get credential for this user

‎blueocean-bitbucket-pipeline/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/BitbucketRepositoryContainer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.jenkins.blueocean.rest.impl.pipeline.scm.ScmRepositoryContainer;
1212
import org.apache.commons.lang.StringUtils;
1313
import org.kohsuke.stapler.Stapler;
14-
import org.kohsuke.stapler.StaplerRequest;
14+
import org.kohsuke.stapler.StaplerRequest2;
1515
import org.kohsuke.stapler.export.Exported;
1616

1717
import java.util.ArrayList;
@@ -60,7 +60,7 @@ public class BitbucketRepositories extends ScmRepositories{
6060

6161
public BitbucketRepositories() {
6262
this.self = BitbucketRepositoryContainer.this.getLink().rel("repositories");
63-
StaplerRequest request = Stapler.getCurrentRequest();
63+
StaplerRequest2 request = Stapler.getCurrentRequest2();
6464
int pageNumber = 0;
6565

6666
if (!StringUtils.isBlank(request.getParameter("pageNumber"))) {

‎blueocean-bitbucket-pipeline/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerEndpoint.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import io.jenkins.blueocean.rest.impl.pipeline.scm.ScmServerEndpoint;
1111
import org.apache.commons.lang.StringUtils;
1212
import org.kohsuke.stapler.HttpResponse;
13-
import org.kohsuke.stapler.StaplerRequest;
14-
import org.kohsuke.stapler.StaplerResponse;
13+
import org.kohsuke.stapler.StaplerRequest2;
14+
import org.kohsuke.stapler.StaplerResponse2;
1515
import org.kohsuke.stapler.WebMethod;
1616
import org.kohsuke.stapler.verb.DELETE;
1717
import org.kohsuke.stapler.verb.GET;
1818

19-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.http.HttpServletResponse;
2020

2121
/**
2222
* @author Vivek Pandey
@@ -69,14 +69,14 @@ public HttpResponse validate(){
6969
}
7070
return new HttpResponse() {
7171
@Override
72-
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) {
72+
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) {
7373
rsp.setStatus(200);
7474
}
7575
};
7676
}
7777

7878
@WebMethod(name="") @DELETE
79-
public void doDelete(StaplerResponse resp) {
79+
public void doDelete(StaplerResponse2 resp) {
8080
final BitbucketEndpointConfiguration config = BitbucketEndpointConfiguration.get();
8181
config.removeEndpoint(getApiUrl());
8282
resp.setStatus(HttpServletResponse.SC_NO_CONTENT);

‎blueocean-bitbucket-pipeline/src/test/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/cloud/BitbucketCloudScmContentProviderTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import net.sf.json.JSONObject;
2020
import org.junit.Test;
2121
import org.kohsuke.stapler.Stapler;
22-
import org.kohsuke.stapler.StaplerRequest;
22+
import org.kohsuke.stapler.StaplerRequest2;
2323
import org.mockito.Mockito;
2424

2525
import java.io.BufferedReader;
@@ -38,7 +38,7 @@ public class BitbucketCloudScmContentProviderTest extends BbCloudWireMock {
3838
@Test
3939
public void getContent() throws UnirestException, IOException {
4040
String credentialId = createCredential(BitbucketCloudScm.ID);
41-
StaplerRequest staplerRequest = mockStapler();
41+
StaplerRequest2 staplerRequest = mockStapler();
4242
MultiBranchProject mbp = mockMbp(credentialId);
4343

4444
ScmFile<GitContent> content = (ScmFile<GitContent>) new BitbucketCloudScmContentProvider().getContent(staplerRequest, mbp);
@@ -56,7 +56,7 @@ public void unauthorizedAccessToContentShouldFail() throws UnirestException, IOE
5656

5757
String aliceCredentialId = createCredential(BitbucketCloudScm.ID, "cloud", alice);
5858

59-
StaplerRequest staplerRequest = mockStapler();
59+
StaplerRequest2 staplerRequest = mockStapler();
6060

6161
MultiBranchProject mbp = mockMbp(aliceCredentialId, alice);
6262

@@ -74,7 +74,7 @@ public void unauthorizedAccessToContentShouldFail() throws UnirestException, IOE
7474
@Test
7575
public void newContent() throws UnirestException, IOException {
7676
String credentialId = createCredential(BitbucketCloudScm.ID);
77-
StaplerRequest staplerRequest = mockStapler();
77+
StaplerRequest2 staplerRequest = mockStapler();
7878
MultiBranchProject mbp = mockMbp(credentialId);
7979

8080
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("VGhpcyBpcyB0ZXN0IGNvbnRlbnQgaW4gbmV3IGZpbGUK")
@@ -126,7 +126,7 @@ public void unauthorizedSaveContentShouldFail() throws UnirestException, IOExcep
126126
alice.addProperty(new Mailer.UserProperty("[email protected]"));
127127

128128
String aliceCredentialId = createCredential(BitbucketCloudScm.ID, alice);
129-
StaplerRequest staplerRequest = mockStapler();
129+
StaplerRequest2 staplerRequest = mockStapler();
130130
MultiBranchProject mbp = mockMbp(aliceCredentialId, alice);
131131

132132
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("bm9kZXsKICBlY2hvICdoZWxsbyB3b3JsZCEnCn0K")
@@ -155,10 +155,10 @@ public void unauthorizedSaveContentShouldFail() throws UnirestException, IOExcep
155155
fail("Should have failed with PreConditionException");
156156
}
157157

158-
private StaplerRequest mockStapler() {
158+
private StaplerRequest2 mockStapler() {
159159
mockStatic(Stapler.class);
160-
StaplerRequest staplerRequest = mock(StaplerRequest.class);
161-
when(Stapler.getCurrentRequest()).thenReturn(staplerRequest);
160+
StaplerRequest2 staplerRequest = mock(StaplerRequest2.class);
161+
when(Stapler.getCurrentRequest2()).thenReturn(staplerRequest);
162162
when(staplerRequest.getRequestURI()).thenReturn("http://localhost:8080/jenkins/blue/rest/");
163163
when(staplerRequest.getParameter("path")).thenReturn("Jenkinsfile");
164164
when(staplerRequest.getParameter("repo")).thenReturn("demo1");

‎blueocean-bitbucket-pipeline/src/test/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerScmContentProviderTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import net.sf.json.JSONObject;
2020
import org.junit.Test;
2121
import org.kohsuke.stapler.Stapler;
22-
import org.kohsuke.stapler.StaplerRequest;
22+
import org.kohsuke.stapler.StaplerRequest2;
2323
import org.mockito.Mockito;
2424

2525
import java.io.BufferedReader;
@@ -40,7 +40,7 @@ public class BitbucketServerScmContentProviderTest extends BbServerWireMock {
4040
@Test
4141
public void getContent() throws UnirestException, IOException {
4242
String credentialId = createCredential(BitbucketServerScm.ID);
43-
StaplerRequest staplerRequest = mockStapler();
43+
StaplerRequest2 staplerRequest = mockStapler();
4444
MultiBranchProject mbp = mockMbp(credentialId);
4545

4646
ScmFile<GitContent> content = (ScmFile<GitContent>) new BitbucketServerScmContentProvider().getContent(staplerRequest, mbp);
@@ -58,7 +58,7 @@ public void unauthorizedAccessToContentShouldFail() throws UnirestException, IOE
5858

5959
String aliceCredentialId = createCredential(BitbucketServerScm.ID, alice);
6060

61-
StaplerRequest staplerRequest = mockStapler();
61+
StaplerRequest2 staplerRequest = mockStapler();
6262

6363
MultiBranchProject mbp = mockMbp(aliceCredentialId, alice);
6464

@@ -75,7 +75,7 @@ public void unauthorizedAccessToContentShouldFail() throws UnirestException, IOE
7575
@Test
7676
public void newContent() throws UnirestException, IOException {
7777
String credentialId = createCredential(BitbucketServerScm.ID);
78-
StaplerRequest staplerRequest = mockStapler();
78+
StaplerRequest2 staplerRequest = mockStapler();
7979
MultiBranchProject mbp = mockMbp(credentialId);
8080

8181
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("bm9kZXsKICBlY2hvICdoZWxsbyB3b3JsZCEnCn0K")
@@ -111,7 +111,7 @@ public void unauthorizedSaveContentShouldFail() throws UnirestException, IOExcep
111111
alice.addProperty(new Mailer.UserProperty("[email protected]"));
112112

113113
String aliceCredentialId = createCredential(BitbucketServerScm.ID, alice);
114-
StaplerRequest staplerRequest = mockStapler();
114+
StaplerRequest2 staplerRequest = mockStapler();
115115
MultiBranchProject mbp = mockMbp(aliceCredentialId, alice);
116116

117117
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("bm9kZXsKICBlY2hvICdoZWxsbyB3b3JsZCEnCn0K")
@@ -143,7 +143,7 @@ public void unauthorizedSaveContentShouldFail() throws UnirestException, IOExcep
143143
@Test
144144
public void handleSaveErrorsWithEmptyStatusLine() throws UnirestException, IOException {
145145
String credentialId = createCredential(BitbucketServerScm.ID);
146-
StaplerRequest staplerRequest = mockStapler();
146+
StaplerRequest2 staplerRequest = mockStapler();
147147
MultiBranchProject mbp = mockMbp(credentialId);
148148

149149
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("bm9kZXsKICBlY2hvICdoZWxsbyB3b3JsZCEnCn0K")
@@ -177,7 +177,7 @@ public void handleSaveErrorsWithEmptyStatusLine() throws UnirestException, IOExc
177177
@Test
178178
public void updateContent() throws UnirestException, IOException {
179179
String credentialId = createCredential(BitbucketServerScm.ID);
180-
StaplerRequest staplerRequest = mockStapler();
180+
StaplerRequest2 staplerRequest = mockStapler();
181181
MultiBranchProject mbp = mockMbp(credentialId);
182182

183183
GitContent content = new GitContent.Builder().autoCreateBranch(true).base64Data("bm9kZXsKICBlY2hvICdoZWxsbyB3b3JsZCEnCn0K")
@@ -220,10 +220,10 @@ public void checkScmProperties() throws Exception {
220220
assertFalse(provider.support(mbp));
221221
}
222222

223-
private StaplerRequest mockStapler() {
223+
private StaplerRequest2 mockStapler() {
224224
mockStatic(Stapler.class);
225-
StaplerRequest staplerRequest = mock(StaplerRequest.class);
226-
when(Stapler.getCurrentRequest()).thenReturn(staplerRequest);
225+
StaplerRequest2 staplerRequest = mock(StaplerRequest2.class);
226+
when(Stapler.getCurrentRequest2()).thenReturn(staplerRequest);
227227
when(staplerRequest.getRequestURI()).thenReturn("http://localhost:8080/jenkins/blue/rest/");
228228
when(staplerRequest.getParameter("path")).thenReturn("Jenkinsfile");
229229
when(staplerRequest.getParameter("repo")).thenReturn("pipeline-demo-test");

‎blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ServiceException.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.jenkins.blueocean.commons;
22

33
import org.kohsuke.stapler.HttpResponse;
4-
import org.kohsuke.stapler.StaplerRequest;
5-
import org.kohsuke.stapler.StaplerResponse;
4+
import org.kohsuke.stapler.StaplerRequest2;
5+
import org.kohsuke.stapler.StaplerResponse2;
66

7-
import javax.servlet.ServletException;
7+
import jakarta.servlet.ServletException;
88
import java.io.IOException;
99
import java.io.PrintWriter;
1010

@@ -45,7 +45,7 @@ public String toJson(){
4545
}
4646

4747
@Override
48-
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
48+
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
4949
rsp.setStatus(status);
5050
rsp.setContentType("application/json");
5151
PrintWriter w = rsp.getWriter();

‎blueocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/Export.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import io.jenkins.blueocean.commons.stapler.export.TreePruner.ByDepth;
1919
import jenkins.model.Jenkins;
2020
import jenkins.security.SecureRequester;
21-
import org.kohsuke.stapler.StaplerRequest;
22-
import org.kohsuke.stapler.StaplerResponse;
21+
import org.kohsuke.stapler.StaplerRequest2;
22+
import org.kohsuke.stapler.StaplerResponse2;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

26-
import javax.servlet.ServletException;
26+
import jakarta.servlet.ServletException;
2727
import java.io.IOException;
2828
import java.io.StringWriter;
2929
import java.io.Writer;
@@ -97,7 +97,7 @@ public static void toJson(@NonNull Object object, @NonNull Writer writer, boolea
9797
* @throws IOException if cannot be written
9898
* @throws ServletException if something goes wrong processing the request
9999
*/
100-
public static void doJson(StaplerRequest req, StaplerResponse rsp, Object bean) throws IOException, ServletException {
100+
public static void doJson(StaplerRequest2 req, StaplerResponse2 rsp, Object bean) throws IOException, ServletException {
101101
if (req.getParameter("jsonp") == null || permit(req, bean)) {
102102
rsp.setHeader("X-Jenkins", Jenkins.VERSION);
103103
rsp.setHeader("X-Jenkins-Session", Jenkins.SESSION_HASH);
@@ -114,7 +114,7 @@ private static ExportConfig createExportConfig() {
114114
return new ExportConfig().withExportInterceptor(new BlueOceanExportInterceptor());
115115
}
116116

117-
private static boolean permit(StaplerRequest req, Object bean) {
117+
private static boolean permit(StaplerRequest2 req, Object bean) {
118118
for (SecureRequester r : ExtensionList.lookup(SecureRequester.class)) {
119119
if (r.permit(req, bean)) {
120120
return true;
@@ -123,7 +123,7 @@ private static boolean permit(StaplerRequest req, Object bean) {
123123
return false;
124124
}
125125

126-
private static void serveExposedBean(StaplerRequest req, StaplerResponse resp, Object exposedBean, ExportConfig config) throws ServletException, IOException {
126+
private static void serveExposedBean(StaplerRequest2 req, StaplerResponse2 resp, Object exposedBean, ExportConfig config) throws ServletException, IOException {
127127
Flavor flavor = config.getFlavor();
128128
String pad=null;
129129
resp.setContentType(flavor.contentType);

‎blueocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/JsonBody.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import net.sf.json.JSONObject;
55
import org.kohsuke.stapler.AnnotationHandler;
66
import org.kohsuke.stapler.InjectedParameter;
7-
import org.kohsuke.stapler.StaplerRequest;
7+
import org.kohsuke.stapler.StaplerRequest2;
88

9-
import javax.servlet.ServletException;
9+
import jakarta.servlet.ServletException;
1010
import java.io.IOException;
1111
import java.lang.annotation.Annotation;
1212
import java.lang.annotation.Documented;
@@ -61,7 +61,7 @@
6161
public @interface JsonBody {
6262
class Handler extends AnnotationHandler {
6363
@Override
64-
public Object parse(StaplerRequest request, Annotation a, Class type, String parameterName) throws ServletException {
64+
public Object parse(StaplerRequest2 request, Annotation a, Class type, String parameterName) throws ServletException {
6565
/*
6666
TODO: exception thrown here results in error page rendered in HTML.
6767
To fix this, change oops.jelly in Jenkins to recognize the Accept header and serve JSON if

0 commit comments

Comments
 (0)