Skip to content

Commit a63b314

Browse files
basilbasil
authored
Migrate from EE 8 to EE 9 (#660)
1 parent 26fb299 commit a63b314

10 files changed

+32
-32
lines changed

‎src/main/java/com/microsoft/jenkins/azuread/AuthorizationMatrixNodeProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.kohsuke.accmod.restrictions.NoExternalUse;
5151
import org.kohsuke.stapler.AncestorInPath;
5252
import org.kohsuke.stapler.QueryParameter;
53-
import org.kohsuke.stapler.StaplerRequest;
53+
import org.kohsuke.stapler.StaplerRequest2;
5454

5555
import java.io.IOException;
5656
import java.util.HashMap;
@@ -165,7 +165,7 @@ public PermissionScope getPermissionScope() {
165165
}
166166

167167
@Override
168-
public AuthorizationMatrixNodeProperty newInstance(StaplerRequest req, @NonNull JSONObject formData)
168+
public AuthorizationMatrixNodeProperty newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
169169
throws FormException {
170170
return createNewInstance(req, formData, false);
171171
}

‎src/main/java/com/microsoft/jenkins/azuread/AuthorizationMatrixProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import org.kohsuke.stapler.DataBoundConstructor;
5353
import org.kohsuke.stapler.DataBoundSetter;
5454
import org.kohsuke.stapler.QueryParameter;
55-
import org.kohsuke.stapler.StaplerRequest;
55+
import org.kohsuke.stapler.StaplerRequest2;
5656
import org.kohsuke.stapler.verb.GET;
5757

5858
import java.io.IOException;
@@ -204,7 +204,7 @@ public PermissionScope getPermissionScope() {
204204
}
205205

206206
@Override
207-
public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
207+
public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
208208
return createNewInstance(req, formData, true);
209209
}
210210

‎src/main/java/com/microsoft/jenkins/azuread/AuthorizationPropertyDescriptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.jenkinsci.plugins.matrixauth.inheritance.InheritanceStrategy;
3232
import org.kohsuke.accmod.Restricted;
3333
import org.kohsuke.accmod.restrictions.NoExternalUse;
34-
import org.kohsuke.stapler.StaplerRequest;
34+
import org.kohsuke.stapler.StaplerRequest2;
3535

3636
import java.util.Map;
3737
import java.util.logging.Level;
@@ -49,7 +49,7 @@ public interface AuthorizationPropertyDescriptor<T extends AuthorizationProperty
4949

5050
T create();
5151

52-
default T createNewInstance(StaplerRequest req, JSONObject formData, boolean hasOptionalWrap)
52+
default T createNewInstance(StaplerRequest2 req, JSONObject formData, boolean hasOptionalWrap)
5353
throws Descriptor.FormException {
5454
if (hasOptionalWrap) {
5555
formData = formData.getJSONObject("useProjectSecurity");

‎src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixFolderProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.kohsuke.stapler.AncestorInPath;
2020
import org.kohsuke.stapler.DataBoundConstructor;
2121
import org.kohsuke.stapler.QueryParameter;
22-
import org.kohsuke.stapler.StaplerRequest;
22+
import org.kohsuke.stapler.StaplerRequest2;
2323
import org.kohsuke.stapler.verb.GET;
2424

2525
import java.util.List;
@@ -77,7 +77,7 @@ public PermissionScope getPermissionScope() {
7777
}
7878

7979
@Override
80-
public AuthorizationMatrixProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
80+
public AuthorizationMatrixProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
8181
return createNewInstance(req, formData, true);
8282
}
8383

‎src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixNodeProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.kohsuke.accmod.restrictions.NoExternalUse;
2121
import org.kohsuke.stapler.AncestorInPath;
2222
import org.kohsuke.stapler.QueryParameter;
23-
import org.kohsuke.stapler.StaplerRequest;
23+
import org.kohsuke.stapler.StaplerRequest2;
2424

2525
import java.io.IOException;
2626
import java.util.Collections;
@@ -99,7 +99,7 @@ public PermissionScope getPermissionScope() {
9999

100100
@Override
101101
public AzureAdAuthorizationMatrixNodeProperty newInstance(
102-
StaplerRequest req,
102+
StaplerRequest2 req,
103103
@NonNull JSONObject formData
104104
) throws FormException {
105105
return createNewInstance(req, formData, false);

‎src/main/java/com/microsoft/jenkins/azuread/AzureAdAuthorizationMatrixProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.kohsuke.stapler.AncestorInPath;
2121
import org.kohsuke.stapler.DataBoundConstructor;
2222
import org.kohsuke.stapler.QueryParameter;
23-
import org.kohsuke.stapler.StaplerRequest;
23+
import org.kohsuke.stapler.StaplerRequest2;
2424
import org.kohsuke.stapler.verb.GET;
2525

2626
import java.util.Collections;
@@ -98,7 +98,7 @@ public PermissionScope getPermissionScope() {
9898
}
9999

100100
@Override
101-
public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
101+
public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
102102
return createNewInstance(req, formData, true);
103103
}
104104

‎src/main/java/com/microsoft/jenkins/azuread/AzureSecurityRealm.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import java.io.File;
5454
import java.nio.file.Files;
5555
import java.nio.file.StandardCopyOption;
56-
import javax.servlet.http.HttpSession;
56+
import jakarta.servlet.http.HttpSession;
5757

5858
import jenkins.model.Jenkins;
5959
import jenkins.security.SecurityListener;
@@ -71,17 +71,17 @@
7171
import org.kohsuke.stapler.HttpResponse;
7272
import org.kohsuke.stapler.HttpResponses;
7373
import org.kohsuke.stapler.QueryParameter;
74-
import org.kohsuke.stapler.StaplerRequest;
74+
import org.kohsuke.stapler.StaplerRequest2;
7575
import org.springframework.security.authentication.AuthenticationManager;
7676
import org.springframework.security.authentication.BadCredentialsException;
7777
import org.springframework.security.core.Authentication;
7878
import org.springframework.security.core.context.SecurityContextHolder;
7979
import org.springframework.security.core.userdetails.UsernameNotFoundException;
8080

81-
import javax.servlet.FilterChain;
82-
import javax.servlet.ServletException;
83-
import javax.servlet.http.HttpServletRequest;
84-
import javax.servlet.http.HttpServletResponse;
81+
import jakarta.servlet.FilterChain;
82+
import jakarta.servlet.ServletException;
83+
import jakarta.servlet.http.HttpServletRequest;
84+
import jakarta.servlet.http.HttpServletResponse;
8585
import java.io.ByteArrayInputStream;
8686
import java.io.IOException;
8787
import java.io.InputStream;
@@ -375,7 +375,7 @@ public AzureSecurityRealm() {
375375
}
376376

377377
@SuppressWarnings("unused") // used by stapler
378-
public HttpResponse doCommenceLogin(StaplerRequest request, @Header("Referer") final String referer) {
378+
public HttpResponse doCommenceLogin(StaplerRequest2 request, @Header("Referer") final String referer) {
379379
String trimmedReferrer = getReferer(referer);
380380

381381
recreateSession(request);
@@ -414,7 +414,7 @@ private static String getReferer(String referer) {
414414
* Check if a request contains a session, if so, invalidate the session and create a new one to avoid session
415415
* fixation.
416416
*/
417-
private void recreateSession(StaplerRequest request) {
417+
private void recreateSession(StaplerRequest2 request) {
418418
HttpSession session = request.getSession(false);
419419
if (session != null) {
420420
session.invalidate();
@@ -423,7 +423,7 @@ private void recreateSession(StaplerRequest request) {
423423
}
424424

425425

426-
public HttpResponse doFinishLogin(StaplerRequest request)
426+
public HttpResponse doFinishLogin(StaplerRequest2 request)
427427
throws InvalidJwtException, IOException {
428428
String referer = (String) request.getSession().getAttribute(REFERER_ATTRIBUTE);
429429
try {
@@ -554,7 +554,7 @@ JwtClaims validateIdToken(String expectedNonce, String idToken) throws InvalidJw
554554
}
555555

556556
@Override
557-
protected String getPostLogOutUrl2(StaplerRequest req, Authentication auth) {
557+
protected String getPostLogOutUrl2(StaplerRequest2 req, Authentication auth) {
558558
if (auth instanceof AzureAuthenticationToken) {
559559
AzureAuthenticationToken azureToken = (AzureAuthenticationToken) auth;
560560
String oid = azureToken.getAzureAdUser().getObjectID();

‎src/main/java/com/microsoft/jenkins/azuread/GlobalMatrixAuthorizationStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import org.kohsuke.accmod.restrictions.DoNotUse;
5757
import org.kohsuke.accmod.restrictions.NoExternalUse;
5858
import org.kohsuke.stapler.QueryParameter;
59-
import org.kohsuke.stapler.StaplerRequest;
59+
import org.kohsuke.stapler.StaplerRequest2;
6060

6161
/**
6262
* Role-based authorization via a matrix.
@@ -162,7 +162,7 @@ public String getDisplayName() {
162162
}
163163

164164
@Override
165-
public AuthorizationStrategy newInstance(StaplerRequest req, @NonNull JSONObject formData)
165+
public AuthorizationStrategy newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
166166
throws FormException {
167167
// TODO Is there a way to pull this up into AuthorizationContainerDescriptor and share code with
168168
// AuthorizationPropertyDescriptor?

‎src/main/java/com/microsoft/jenkins/azuread/GraphProxy.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.kohsuke.accmod.Restricted;
2525
import org.kohsuke.accmod.restrictions.NoExternalUse;
2626
import org.kohsuke.stapler.StaplerProxy;
27-
import org.kohsuke.stapler.StaplerRequest;
28-
import org.kohsuke.stapler.StaplerResponse;
27+
import org.kohsuke.stapler.StaplerRequest2;
28+
import org.kohsuke.stapler.StaplerResponse2;
2929
import org.springframework.security.core.Authentication;
3030
import org.springframework.security.core.context.SecurityContextHolder;
3131

@@ -124,11 +124,11 @@ public Collection<? extends Action> createFor(@NonNull Computer target) {
124124
return Collections.singletonList(new GraphProxy(target));
125125
}
126126
}
127-
public void doDynamic(StaplerRequest request, StaplerResponse response) throws IOException {
127+
public void doDynamic(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
128128
proxy(request, response);
129129
}
130130

131-
private void proxy(StaplerRequest request, StaplerResponse response) throws IOException {
131+
private void proxy(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
132132
OkHttpClient client = getClient();
133133
String baseUrl = getBaseUrl();
134134
String token = getToken();
@@ -199,7 +199,7 @@ private String getBaseUrl() {
199199
throw new IllegalStateException("GraphProxy only works when Authentication is set to Azure");
200200
}
201201

202-
private Request buildRequest(StaplerRequest request, String token, String url) throws IOException {
202+
private Request buildRequest(StaplerRequest2 request, String token, String url) throws IOException {
203203
Request.Builder okRequest = new Request.Builder()
204204
.url(url)
205205
.addHeader("Authorization", "Bearer " + token);
@@ -229,7 +229,7 @@ private Request buildRequest(StaplerRequest request, String token, String url) t
229229
return okRequest.build();
230230
}
231231

232-
private String buildUrl(StaplerRequest request, String baseUrl) {
232+
private String buildUrl(StaplerRequest2 request, String baseUrl) {
233233
String apiUrl = baseUrl;
234234

235235
if (request.getRestOfPath().startsWith("/beta")) {

‎src/main/java/com/microsoft/jenkins/azuread/folder/properties/AuthorizationMatrixProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import org.kohsuke.stapler.DataBoundConstructor;
5959
import org.kohsuke.stapler.DataBoundSetter;
6060
import org.kohsuke.stapler.QueryParameter;
61-
import org.kohsuke.stapler.StaplerRequest;
61+
import org.kohsuke.stapler.StaplerRequest2;
6262
import org.kohsuke.stapler.verb.GET;
6363

6464
import java.io.IOException;
@@ -168,7 +168,7 @@ public PermissionScope getPermissionScope() {
168168
}
169169

170170
@Override
171-
public AuthorizationMatrixProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
171+
public AuthorizationMatrixProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
172172
return createNewInstance(req, formData, true);
173173
}
174174

0 commit comments

Comments
 (0)