diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java index 76a47d37e37..70332b02336 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java @@ -28,7 +28,7 @@ import org.cloudfoundry.identity.uaa.util.JsonUtils; import org.springframework.util.StringUtils; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.util.Date; diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProvider.java b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProvider.java index a9170b23d4f..7e461278b5e 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProvider.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProvider.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.Date; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.util.JsonUtils; import org.springframework.util.StringUtils; diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZone.java b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZone.java index 307d9f45574..db706ae1b5a 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZone.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZone.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.cloudfoundry.identity.uaa.constants.OriginKeys; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Calendar; import java.util.Date; diff --git a/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ApiController.java b/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ApiController.java index 97c0815adbc..2e6dd33aae8 100644 --- a/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ApiController.java +++ b/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ApiController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.View; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStreamReader; import java.security.Principal; @@ -52,7 +52,7 @@ public void setInfo(Resource info) { } } - @RequestMapping("/info") + @RequestMapping({"/info", "/info/"}) public View info(Map model, Principal principal) { model.put("loginUrl", loginUrl); model.put("uaaUrl", uaaUrl); diff --git a/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ContentTypeFilter.java b/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ContentTypeFilter.java index 5e16f8a8ec3..4e8f1559f9c 100644 --- a/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ContentTypeFilter.java +++ b/samples/api/src/main/java/org/cloudfoundry/identity/api/web/ContentTypeFilter.java @@ -16,13 +16,13 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * A servlet filter that adds a content type header to any path that matches one diff --git a/samples/api/src/main/webapp/WEB-INF/web.xml b/samples/api/src/main/webapp/WEB-INF/web.xml index 88db3f28ef9..1f83deacf2a 100755 --- a/samples/api/src/main/webapp/WEB-INF/web.xml +++ b/samples/api/src/main/webapp/WEB-INF/web.xml @@ -3,8 +3,8 @@ you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. This product includes a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. --> - + springSecurityFilterChain diff --git a/samples/api/src/test/java/org/cloudfoundry/identity/api/web/OAuth2ContextSetup.java b/samples/api/src/test/java/org/cloudfoundry/identity/api/web/OAuth2ContextSetup.java index f6d02b34ce6..127f46892db 100644 --- a/samples/api/src/test/java/org/cloudfoundry/identity/api/web/OAuth2ContextSetup.java +++ b/samples/api/src/test/java/org/cloudfoundry/identity/api/web/OAuth2ContextSetup.java @@ -2,11 +2,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.config.RequestConfig.Builder; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.protocol.HttpContext; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.config.RequestConfig.Builder; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; +import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.core5.http.protocol.HttpContext; import org.cloudfoundry.identity.uaa.oauth.client.DefaultOAuth2ClientContext; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2ClientContext; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2RestTemplate; @@ -335,7 +335,7 @@ protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) { protected RequestConfig getRequestConfig() { Builder builder = RequestConfig.custom() - .setCookieSpec(CookieSpecs.IGNORE_COOKIES) + .setCookieSpec(StandardCookieSpec.IGNORE) .setAuthenticationEnabled(false).setRedirectsEnabled(false); return builder.build(); } diff --git a/samples/app/src/main/java/org/cloudfoundry/identity/app/web/HomeController.java b/samples/app/src/main/java/org/cloudfoundry/identity/app/web/HomeController.java index 6dfe484bd57..9e453f78f34 100644 --- a/samples/app/src/main/java/org/cloudfoundry/identity/app/web/HomeController.java +++ b/samples/app/src/main/java/org/cloudfoundry/identity/app/web/HomeController.java @@ -16,7 +16,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; @Controller @@ -67,7 +67,7 @@ public void setClientId(String clientId) { this.clientId = clientId; } - @RequestMapping("/browse") + @RequestMapping({"/browse", "/browse/"}) public String browse(Model model) { model.addAttribute("userAuthorizationUri", userAuthorizationUri); model.addAttribute("clientId", clientId); @@ -75,7 +75,7 @@ public String browse(Model model) { return "browse"; } - @RequestMapping("/home") + @RequestMapping({"/home", "/home/"}) public String home(Model model, Principal principal) { model.addAttribute("principal", principal); model.addAttribute("approvalsUri", approvalsUri); @@ -84,13 +84,13 @@ public String home(Model model, Principal principal) { // Home page with just the user id - useful for testing simplest possible // use case - @RequestMapping("/id") + @RequestMapping({"/id", "/id/"}) public String id(Model model, Principal principal) { model.addAttribute("principal", principal); return "home"; } - @RequestMapping("/logout") + @RequestMapping({"/logout", "/logout/"}) public String logout(Model model, HttpServletRequest request) { String redirect = request.getRequestURL().toString(); model.addAttribute("cflogout", logoutUrl + "?client_id=app&redirect=" + redirect); diff --git a/samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java b/samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java index 90655b3ef07..c1af045c092 100755 --- a/samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java +++ b/samples/app/src/main/java/org/cloudfoundry/identity/app/web/TreeController.java @@ -39,7 +39,7 @@ public void setTreeUrlPattern(String treeUrlPattern) { this.treeUrlPattern = treeUrlPattern; } - @RequestMapping("/apps") + @RequestMapping({"/apps", "/apps/"}) public String apps(Model model, Principal principal) throws Exception { loadItems(model, "apps"); addUserInfo(model, principal); diff --git a/samples/app/src/main/webapp/WEB-INF/web.xml b/samples/app/src/main/webapp/WEB-INF/web.xml index 1878d987acb..1514742b295 100644 --- a/samples/app/src/main/webapp/WEB-INF/web.xml +++ b/samples/app/src/main/webapp/WEB-INF/web.xml @@ -3,8 +3,8 @@ you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. This product includes a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. --> - + org.springframework.web.context.request.RequestContextListener diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java index 7ac473a5e91..ad81ebf8400 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.HttpClientErrorException; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.validation.Valid; -import javax.validation.constraints.Email; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; import java.util.List; import java.util.stream.Collectors; @@ -41,7 +41,7 @@ public AccountsController( this.identityProviderProvisioning = identityProviderProvisioning; } - @RequestMapping(value = "/create_account", method = GET) + @RequestMapping(value = {"/create_account", "/create_account/"}, method = GET) public String activationEmail(Model model, @RequestParam(value = "client_id", required = false) String clientId, @RequestParam(value = "redirect_uri", required = false) String redirectUri, @@ -56,7 +56,7 @@ public String activationEmail(Model model, return "accounts/new_activation_email"; } - @RequestMapping(value = "/create_account.do", method = POST) + @RequestMapping(value = {"/create_account.do", "/create_account.do/"}, method = POST) public String sendActivationEmail(Model model, HttpServletResponse response, @RequestParam(value = "client_id", required = false) String clientId, @RequestParam(value = "redirect_uri", required = false) String redirectUri, @@ -96,18 +96,18 @@ public String sendActivationEmail(Model model, HttpServletResponse response, return "redirect:accounts/email_sent"; } - @RequestMapping(value = "/accounts/email_sent", method = RequestMethod.GET) + @RequestMapping(value = {"/accounts/email_sent", "/accounts/email_sent/"}, method = RequestMethod.GET) public String emailSent() { return "accounts/email_sent"; } - @RequestMapping(value = "/verify_user", method = RequestMethod.HEAD) + @RequestMapping(value = {"/verify_user", "/verify_user/"}, method = RequestMethod.HEAD) public String verifyUser() { // Some mail providers initially send a HEAD request to check the validity of the link before redirecting users. return "redirect:/login"; } - @RequestMapping(value = "/verify_user", method = GET) + @RequestMapping(value = {"/verify_user", "/verify_user/"}, method = GET) public String verifyUser(Model model, @RequestParam("code") String code, HttpServletResponse response, HttpSession session) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java index 6ec599a85c5..6f9359daf91 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java @@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import javax.validation.constraints.Email; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; import java.util.Map; @Controller @@ -40,7 +40,7 @@ public ChangeEmailController( this.uaaUserDatabase = uaaUserDatabase; } - @RequestMapping(value = "/change_email", method = RequestMethod.GET) + @RequestMapping(value = {"/change_email", "/change_email/"}, method = RequestMethod.GET) public String changeEmailPage(Model model, @RequestParam(value = "client_id", required = false) String clientId, @RequestParam(value = "redirect_uri", required = false) String redirectUri) { SecurityContext securityContext = SecurityContextHolder.getContext(); @@ -50,7 +50,7 @@ public String changeEmailPage(Model model, @RequestParam(value = "client_id", re return "change_email"; } - @RequestMapping(value = "/change_email.do", method = RequestMethod.POST) + @RequestMapping(value = {"/change_email.do", "/change_email.do/"}, method = RequestMethod.POST) public String changeEmail(Model model, @Valid @ModelAttribute("newEmail") ValidEmail newEmail, BindingResult result, @RequestParam(required = false, value = "client_id") String clientId, @RequestParam(required = false, value = "redirect_uri") String redirectUri, @@ -86,7 +86,7 @@ public String changeEmail(Model model, @Valid @ModelAttribute("newEmail") ValidE return "redirect:email_sent?code=email_change"; } - @RequestMapping(value = "/verify_email", method = RequestMethod.GET) + @RequestMapping(value = {"/verify_email", "/verify_email/"}, method = RequestMethod.GET) public String verifyEmail(Model model, @RequestParam("code") String code, RedirectAttributes redirectAttributes, HttpServletResponse httpServletResponse, HttpServletRequest request) { Map response; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java index 071449101dc..aaa07438341 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.POST; @@ -28,12 +28,12 @@ public ChangePasswordController(final ChangePasswordService changePasswordServic this.changePasswordService = changePasswordService; } - @RequestMapping(value = "/change_password", method = GET) + @RequestMapping(value = {"/change_password", "/change_password/"}, method = GET) public String changePasswordPage() { return "change_password"; } - @RequestMapping(value = "/change_password.do", method = POST) + @RequestMapping(value = {"/change_password.do", "/change_password.do/"}, method = POST) public String changePassword( Model model, @RequestParam("current_password") String currentPassword, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java index 4674957e4c8..d6c2310d6f9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java @@ -25,7 +25,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.client.HttpClientErrorException; import org.thymeleaf.context.Context; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import java.util.*; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/OpenIdConnectEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/OpenIdConnectEndpoints.java index cdaaf732a1d..0e83b6045b6 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/OpenIdConnectEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/OpenIdConnectEndpoints.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.URISyntaxException; import static org.springframework.http.HttpStatus.OK; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordChangeEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordChangeEndpoint.java index a9c785c1f54..f81703b77ee 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordChangeEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordChangeEndpoint.java @@ -49,7 +49,7 @@ public PasswordChangeEndpoint(final IdentityZoneManager identityZoneManager, this.securityContextAccessor = securityContextAccessor; } - @RequestMapping(value = "/Users/{userId}/password", method = RequestMethod.PUT) + @RequestMapping(value = {"/Users/{userId}/password", "/Users/{userId}/password/"}, method = RequestMethod.PUT) @ResponseBody public ActionResult changePassword(@PathVariable String userId, @RequestBody PasswordChangeRequest change) { String zoneId = identityZoneManager.getCurrentIdentityZoneId(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java index cc188a4ed42..900ada8359c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java @@ -64,7 +64,7 @@ public PasswordResetEndpoint( this.identityZoneManager = identityZoneManager; } - @RequestMapping(value = "/password_resets", method = RequestMethod.POST) + @RequestMapping(value = {"/password_resets", "/password_resets/"}, method = RequestMethod.POST) public ResponseEntity resetPassword(@RequestBody String email, @RequestParam(required = false, value = "client_id") String clientId, @RequestParam(required = false, value = "redirect_uri") String redirectUri) { @@ -97,7 +97,7 @@ private ExpiringCode getExpiringCode(String code) { return expiringCode; } - @RequestMapping(value = "/password_change", method = RequestMethod.POST) + @RequestMapping(value = {"/password_change", "/password_change/"}, method = RequestMethod.POST) public ResponseEntity changePassword(@RequestBody LostPasswordChangeRequest passwordChangeRequest) { ResponseEntity responseEntity; if (passwordChangeRequest.getChangeCode() != null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java index 687fecc1b8a..83e03f8ff11 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java @@ -57,7 +57,7 @@ public ProfileController(final ApprovalStore approvalsService, /** * Display the current user's approvals */ - @RequestMapping(value = "/profile", method = RequestMethod.GET) + @RequestMapping(value = {"/profile", "/profile/"}, method = RequestMethod.GET) public String get(Authentication authentication, Model model) { Map> approvals = getCurrentApprovalsForUser(getCurrentUserId()); Map clientNames = getClientNames(approvals); @@ -70,7 +70,7 @@ public String get(Authentication authentication, Model model) { /** * Handle form post for revoking chosen approvals */ - @RequestMapping(value = "/profile", method = RequestMethod.POST) + @RequestMapping(value = {"/profile", "/profile/"}, method = RequestMethod.POST) public String post(@RequestParam(required = false) Collection checkedScopes, @RequestParam(required = false) String update, @RequestParam(required = false) String delete, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPoint.java index 4dbf62a7f86..93c06111183 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPoint.java @@ -21,10 +21,10 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilter.java index 38ca2e02955..f06f7ff7a93 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilter.java @@ -26,10 +26,10 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.sql.Timestamp; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java index 42108794573..3a0a37d1ae1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java @@ -29,9 +29,9 @@ import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.sql.Timestamp; import java.util.Map; @@ -65,7 +65,7 @@ public ResetPasswordController( this.externalLoginUrl = externalLoginUrl; } - @RequestMapping(value = "/forgot_password", method = RequestMethod.GET) + @RequestMapping(value = {"/forgot_password", "/forgot_password/"}, method = RequestMethod.GET) public String forgotPasswordPage(Model model, @RequestParam(required = false, value = "client_id") String clientId, @RequestParam(required = false, value = "redirect_uri") String redirectUri, @@ -78,7 +78,7 @@ public String forgotPasswordPage(Model model, return "forgot_password"; } - @RequestMapping(value = "/forgot_password.do", method = RequestMethod.POST) + @RequestMapping(value = {"/forgot_password.do", "/forgot_password.do/"}, method = RequestMethod.POST) public String forgotPassword(Model model, @RequestParam("username") String username, @RequestParam(value = "client_id", defaultValue = "") String clientId, @RequestParam(value = "redirect_uri", defaultValue = "") String redirectUri, HttpServletResponse response) { if (!IdentityZoneHolder.get().getConfig().getLinks().getSelfService().isSelfServiceLinksEnabled()) { @@ -154,19 +154,19 @@ private String getServiceName() { } } - @RequestMapping(value = "/email_sent", method = RequestMethod.GET) + @RequestMapping(value = {"/email_sent", "/email_sent/"}, method = RequestMethod.GET) public String emailSentPage(@ModelAttribute("code") String code, HttpServletResponse response) { response.addHeader("Content-Security-Policy", "frame-ancestors 'none'"); return "email_sent"; } - @RequestMapping(value = "/reset_password", method = RequestMethod.HEAD) + @RequestMapping(value = {"/reset_password", "/reset_password/"}, method = RequestMethod.HEAD) public void resetPassword() { // Some mail providers initially send a HEAD request to check the validity of the link before redirecting users. } - @RequestMapping(value = "/reset_password", method = RequestMethod.GET, params = {"code"}) + @RequestMapping(value = {"/reset_password", "/reset_password/"}, method = RequestMethod.GET, params = {"code"}) public String resetPasswordPage(Model model, HttpServletResponse response, @RequestParam("code") String code) { @@ -211,7 +211,7 @@ private ExpiringCode checkIfUserExists(ExpiringCode code) { return code; } - @RequestMapping(value = "/reset_password.do", method = RequestMethod.POST) + @RequestMapping(value = {"/reset_password.do", "/reset_password.do/"}, method = RequestMethod.POST) public void resetPassword(Model model, @RequestParam("code") String code, @RequestParam("email") String email, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UserInfoEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UserInfoEndpoint.java index a7065a4d130..da8de03bde3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UserInfoEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UserInfoEndpoint.java @@ -34,7 +34,7 @@ public void afterPropertiesSet() { Assert.state(userDatabase != null, "A user database must be provided"); } - @RequestMapping(value = "/userinfo") + @RequestMapping(value = {"/userinfo", "/userinfo/"}) @ResponseBody public UserInfoResponse loginInfo(Principal principal) { OAuth2Authentication authentication = (OAuth2Authentication) principal; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java index d46efad965e..532613063c7 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java @@ -71,7 +71,7 @@ public ApprovalsAdminEndpoints( }; } - @RequestMapping(value = "/approvals", method = RequestMethod.GET) + @RequestMapping(value = {"/approvals", "/approvals/"}, method = RequestMethod.GET) @ResponseBody public List getApprovals(@RequestParam(required = false, defaultValue = "user_id pr") String ignored, @RequestParam(required = false, defaultValue = "1") int startIndex, @@ -124,7 +124,7 @@ private String getCurrentUserId() { return securityContextAccessor.getUserId(); } - @RequestMapping(value = "/approvals", method = RequestMethod.PUT) + @RequestMapping(value = {"/approvals", "/approvals/"}, method = RequestMethod.PUT) @ResponseBody public List updateApprovals(@RequestBody Approval[] approvals) { String currentUserId = getCurrentUserId(); @@ -147,7 +147,7 @@ public List updateApprovals(@RequestBody Approval[] approvals) { return result; } - @RequestMapping(value = "/approvals/{clientId}", method = RequestMethod.PUT) + @RequestMapping(value = {"/approvals/{clientId}", "/approvals/{clientId}/"}, method = RequestMethod.PUT) @ResponseBody public List updateClientApprovals(@PathVariable String clientId, @RequestBody Approval[] approvals) { clientDetailsService.loadClientByClientId(clientId, IdentityZoneHolder.get().getId()); @@ -180,7 +180,7 @@ private boolean isValidUser(String userId) { } } - @RequestMapping(value = "/approvals", method = RequestMethod.DELETE) + @RequestMapping(value = {"/approvals", "/approvals/"}, method = RequestMethod.DELETE) @ResponseBody public ActionResult revokeApprovals(@RequestParam() String clientId) { clientDetailsService.loadClientByClientId(clientId, IdentityZoneHolder.get().getId()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AbstractClientParametersAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AbstractClientParametersAuthenticationFilter.java index dd6659e76ab..0a5dffc72fd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AbstractClientParametersAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AbstractClientParametersAuthenticationFilter.java @@ -31,14 +31,14 @@ import org.cloudfoundry.identity.uaa.oauth.provider.error.OAuth2AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collection; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java index bc23e9da7cd..1d90871adb7 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java @@ -17,15 +17,15 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.util.Assert; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; import java.util.Enumeration; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilter.java index 6733d0504fc..fd0b96502d3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilter.java @@ -40,14 +40,14 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java index 9c6cfcdbe16..598b28dd6f0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java @@ -15,10 +15,10 @@ import org.springframework.util.Assert; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilter.java index f5683fc65b3..7401f941355 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilter.java @@ -17,8 +17,8 @@ import org.flywaydb.core.internal.util.StringUtils; import org.springframework.http.MediaType; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilter.java index 239ff2f6bad..66d293ab95d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilter.java @@ -12,11 +12,11 @@ import org.springframework.security.core.Authentication; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import static org.springframework.http.HttpHeaders.SET_COOKIE; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginClientParametersAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginClientParametersAuthenticationFilter.java index cab65877d3b..35534f036dd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginClientParametersAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginClientParametersAuthenticationFilter.java @@ -17,8 +17,8 @@ import org.cloudfoundry.identity.uaa.util.UaaStringUtils; import org.springframework.security.authentication.BadCredentialsException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginServerTokenEndpointFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginServerTokenEndpointFilter.java index 131af059ec2..cb8105fbc86 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginServerTokenEndpointFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/LoginServerTokenEndpointFilter.java @@ -23,8 +23,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java index 33b814e0570..039d6a1020f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java @@ -36,13 +36,13 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.util.StringUtils; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.IOException; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilter.java index e6baa621471..d384d3e49a1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilter.java @@ -19,11 +19,11 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import static org.springframework.security.core.context.SecurityContextHolder.getContext; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilter.java index 90858ee80b7..ff161e6d1a5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilter.java @@ -9,10 +9,10 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class PasswordChangeUiRequiredFilter extends OncePerRequestFilter { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java index a93e0a70011..2ea7e80e9cc 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java @@ -4,10 +4,10 @@ import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RedirectSavingSamlContextProvider.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RedirectSavingSamlContextProvider.java index 6bb782f1664..44abda9e90a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RedirectSavingSamlContextProvider.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RedirectSavingSamlContextProvider.java @@ -6,8 +6,8 @@ import org.springframework.security.saml.context.SAMLContextProvider; import org.springframework.security.saml.context.SAMLMessageContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java index 52483a24b98..34f55c68577 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlRedirectLogoutHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlRedirectLogoutHandler.java index 019f100ff43..a5f12bfcef0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlRedirectLogoutHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlRedirectLogoutHandler.java @@ -6,10 +6,10 @@ import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.util.StringUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBinding.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBinding.java index f9d5afa7f48..f3ad446a916 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBinding.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBinding.java @@ -12,7 +12,7 @@ import org.springframework.security.saml.processor.SAMLBinding; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java index c64a761cf41..dac884dd6e5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java @@ -26,11 +26,11 @@ import org.springframework.security.web.RedirectStrategy; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.Date; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilter.java index 8581c61bde1..fac158537d3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilter.java @@ -16,15 +16,15 @@ import org.springframework.http.MediaType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetails.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetails.java index 5359ac14abe..f468a3eacb9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetails.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetails.java @@ -19,7 +19,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.security.web.authentication.WebAuthenticationDetails; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsSource.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsSource.java index 93267cd7d74..923e40d33d0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsSource.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsSource.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.authentication; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.authentication.AuthenticationDetailsSource; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaSamlLogoutFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaSamlLogoutFilter.java index 75eea3fb59f..5e6eef35460 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaSamlLogoutFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaSamlLogoutFilter.java @@ -12,8 +12,8 @@ import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; public class UaaSamlLogoutFilter extends SAMLLogoutFilter { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutHandler.java index e859a855998..e7d33828715 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutHandler.java @@ -16,8 +16,8 @@ import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.HashSet; import java.util.List; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandler.java index 66a2ef4e2a7..e0b91c4339b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandler.java @@ -26,9 +26,9 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class ZoneAwareWhitelistLogoutHandler implements LogoutSuccessHandler { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java index ef340c7c44c..db6492de30c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java @@ -33,7 +33,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.password.PasswordEncoder; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.Calendar; import java.util.Collections; import java.util.Date; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/RestAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/RestAuthenticationManager.java index f8ed649d971..cbf63f51099 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/RestAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/RestAuthenticationManager.java @@ -23,6 +23,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; @@ -93,7 +94,7 @@ public RestAuthenticationManager() { restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory()); restTemplate.setErrorHandler(new DefaultResponseErrorHandler() { @Override - protected boolean hasError(HttpStatus statusCode) { + protected boolean hasError(HttpStatusCode statusCode) { return statusCode.series() == HttpStatus.Series.SERVER_ERROR; } }); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ScopeAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ScopeAuthenticationFilter.java index 518274c5a43..e2fe445a289 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ScopeAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ScopeAuthenticationFilter.java @@ -23,14 +23,14 @@ import org.cloudfoundry.identity.uaa.oauth.common.exceptions.OAuth2Exception; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class ScopeAuthenticationFilter implements Filter { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java index ab0ec7d4547..01467ddc5e6 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java @@ -75,7 +75,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -189,7 +189,7 @@ public Map getErrorCounts() { return errorCounts; } - @RequestMapping(value = "/oauth/clients/{client}", method = RequestMethod.GET) + @RequestMapping(value = {"/oauth/clients/{client}", "/oauth/clients/{client}/"}, method = RequestMethod.GET) @ResponseBody public ClientDetails getClientDetails(@PathVariable String client) { try { @@ -203,7 +203,7 @@ public ClientDetails getClientDetails(@PathVariable String client) { } } - @RequestMapping(value = "/oauth/clients", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients", "/oauth/clients/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.CREATED) @ResponseBody @Transactional @@ -223,7 +223,7 @@ private ClientDetails createClientDetailsInternal(UaaClientDetails client) { return removeSecret(clientDetailsService.create(details, IdentityZoneHolder.get().getId())); } - @RequestMapping(value = "/oauth/clients/restricted", method = RequestMethod.GET) + @RequestMapping(value = {"/oauth/clients/restricted", "/oauth/clients/restricted/"}, method = RequestMethod.GET) @ResponseStatus(HttpStatus.OK) @ResponseBody public List getRestrictedClientScopes() { @@ -231,7 +231,7 @@ public List getRestrictedClientScopes() { } - @RequestMapping(value = "/oauth/clients/restricted", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients/restricted", "/oauth/clients/restricted/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.CREATED) @ResponseBody public ClientDetails createRestrictedClientDetails(@RequestBody UaaClientDetails client) { @@ -239,7 +239,7 @@ public ClientDetails createRestrictedClientDetails(@RequestBody UaaClientDetails return createClientDetailsInternal(client); } - @RequestMapping(value = "/oauth/clients/tx", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients/tx", "/oauth/clients/tx/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.CREATED) @ResponseBody @Transactional @@ -262,7 +262,7 @@ protected ClientDetails[] doInsertClientDetails(ClientDetails[] details) { return details; } - @RequestMapping(value = "/oauth/clients/tx", method = RequestMethod.PUT) + @RequestMapping(value = {"/oauth/clients/tx", "/oauth/clients/tx/"}, method = RequestMethod.PUT) @ResponseStatus(HttpStatus.OK) @Transactional @ResponseBody @@ -295,7 +295,7 @@ protected ClientDetails[] doProcessUpdates(ClientDetails[] details) { } - @RequestMapping(value = "/oauth/clients/restricted/{client}", method = RequestMethod.PUT) + @RequestMapping(value = {"/oauth/clients/restricted/{client}", "/oauth/clients/restricted/{client}/"}, method = RequestMethod.PUT) @ResponseStatus(HttpStatus.OK) @ResponseBody public ClientDetails updateRestrictedClientDetails(@RequestBody UaaClientDetails client, @@ -304,7 +304,7 @@ public ClientDetails updateRestrictedClientDetails(@RequestBody UaaClientDetails return updateClientDetails(client, clientId); } - @RequestMapping(value = "/oauth/clients/{client}", method = RequestMethod.PUT) + @RequestMapping(value = {"/oauth/clients/{client}", "/oauth/clients/{client}/"}, method = RequestMethod.PUT) @ResponseStatus(HttpStatus.OK) @ResponseBody public ClientDetails updateClientDetails(@RequestBody UaaClientDetails client, @@ -328,7 +328,7 @@ public ClientDetails updateClientDetails(@RequestBody UaaClientDetails client, return removeSecret(clientDetailsService.retrieve(clientId, IdentityZoneHolder.get().getId())); } - @RequestMapping(value = "/oauth/clients/{client}", method = RequestMethod.DELETE) + @RequestMapping(value = {"/oauth/clients/{client}", "/oauth/clients/{client}/"}, method = RequestMethod.DELETE) @ResponseStatus(HttpStatus.OK) @ResponseBody public ClientDetails removeClientDetails(@PathVariable String client) { @@ -337,7 +337,7 @@ public ClientDetails removeClientDetails(@PathVariable String client) { return removeSecret(details); } - @RequestMapping(value = "/oauth/clients/tx/delete", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients/tx/delete", "/oauth/clients/tx/delete/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.OK) @Transactional @ResponseBody @@ -349,7 +349,7 @@ public ClientDetails[] removeClientDetailsTx(@RequestBody UaaClientDetails[] det return doProcessDeletes(result); } - @RequestMapping(value = "/oauth/clients/tx/modify", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients/tx/modify", "/oauth/clients/tx/modify/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.OK) @Transactional @ResponseBody @@ -403,7 +403,7 @@ private boolean updateClientSecret(ClientDetailsModification detail) { } - @RequestMapping(value = "/oauth/clients/tx/secret", method = RequestMethod.POST) + @RequestMapping(value = {"/oauth/clients/tx/secret", "/oauth/clients/tx/secret/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.OK) @Transactional @ResponseBody @@ -446,7 +446,7 @@ protected void deleteApprovals(String clientId) { approvalStore.revokeApprovalsForClient(clientId, IdentityZoneHolder.get().getId()); } - @RequestMapping(value = "/oauth/clients", method = RequestMethod.GET) + @RequestMapping(value = {"/oauth/clients", "/oauth/clients/"}, method = RequestMethod.GET) @ResponseBody public SearchResults listClientDetails( @RequestParam(value = "attributes", required = false) String attributesCommaSeparated, @@ -496,7 +496,7 @@ public SearchResults listClientDetails( } } - @RequestMapping(value = "/oauth/clients/{client_id}/secret", method = RequestMethod.PUT) + @RequestMapping(value = {"/oauth/clients/{client_id}/secret", "/oauth/clients/{client_id}/secret/"}, method = RequestMethod.PUT) @ResponseBody public ActionResult changeSecret(@PathVariable String client_id, @RequestBody SecretChangeRequest change) { @@ -543,7 +543,7 @@ public ActionResult changeSecret(@PathVariable String client_id, @RequestBody Se return result; } - @PutMapping(value = "/oauth/clients/{client_id}/clientjwt") + @PutMapping(value = {"/oauth/clients/{client_id}/clientjwt", "/oauth/clients/{client_id}/clientjwt/"}) @ResponseBody public ActionResult changeClientJwt(@PathVariable String client_id, @RequestBody ClientJwtChangeRequest change) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java index d9dd66c79cf..46eca940e7f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java @@ -23,9 +23,9 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.Principal; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientInfoEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientInfoEndpoint.java index 066308a4f4b..79334a79750 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientInfoEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientInfoEndpoint.java @@ -41,7 +41,7 @@ public ClientInfoEndpoint( this.identityZoneManager = identityZoneManager; } - @RequestMapping(value = "/clientinfo") + @RequestMapping(value = {"/clientinfo", "/clientinfo/"}) @ResponseBody public ClientDetails clientinfo(Principal principal) { String clientId = principal.getName(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java index 17079b6a7ee..058f1029610 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.servlet.View; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; @Controller @@ -38,7 +38,7 @@ public ClientMetadataAdminEndpoints(final @Qualifier("jdbcClientMetadataProvisio }; } - @RequestMapping(value = "/oauth/clients/{client}/meta", method = RequestMethod.GET) + @RequestMapping(value = {"/oauth/clients/{client}/meta", "/oauth/clients/{client}/meta/"}, method = RequestMethod.GET) @ResponseStatus(HttpStatus.OK) @ResponseBody public ClientMetadata retrieveClientMetadata(@PathVariable("client") String clientId) { @@ -49,14 +49,14 @@ public ClientMetadata retrieveClientMetadata(@PathVariable("client") String clie } } - @RequestMapping(value = "/oauth/clients/meta", method = RequestMethod.GET) + @RequestMapping(value = {"/oauth/clients/meta", "/oauth/clients/meta/"}, method = RequestMethod.GET) @ResponseStatus(HttpStatus.OK) @ResponseBody public List retrieveAllClientMetadata() { return clientMetadataProvisioning.retrieveAll(IdentityZoneHolder.get().getId()); } - @RequestMapping(value = "/oauth/clients/{client}/meta", method = RequestMethod.PUT) + @RequestMapping(value = {"/oauth/clients/{client}/meta", "/oauth/clients/{client}/meta/"}, method = RequestMethod.PUT) @ResponseStatus(HttpStatus.OK) @ResponseBody public ClientMetadata updateClientMetadata(@RequestBody ClientMetadata clientMetadata, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java index 1fb16d6b987..11a8f7f30c9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.View; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; @Controller public class CodeStoreEndpoints { @@ -44,7 +44,7 @@ public ExpiringCode generateCode(@RequestBody ExpiringCode expiringCode) { } } - @RequestMapping(value = "/Codes/{code}", method = RequestMethod.GET) + @RequestMapping(value = {"/Codes/{code}", "/Codes/{code}/"}, method = RequestMethod.GET) @ResponseBody public ExpiringCode retrieveCode(@PathVariable String code) { ExpiringCode result; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java index 99bc032a018..04e2447e1c6 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.health; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.sql.DataSource; import java.sql.Connection; @@ -46,7 +46,7 @@ public HealthzEndpoint( this.dataSource = dataSource; } - @GetMapping("/healthz") + @GetMapping({"/healthz", "/healthz/"}) @ResponseBody public String getHealthz(HttpServletResponse response) { if (stopping) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/home/HomeController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/home/HomeController.java index cb78f6498d4..6fce0d0e446 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/home/HomeController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/home/HomeController.java @@ -4,9 +4,9 @@ import static org.cloudfoundry.identity.uaa.ratelimiting.RateLimitingFilter.RATE_LIMIT_ERROR_ATTRIBUTE; import static org.springframework.util.StringUtils.hasText; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -123,7 +123,7 @@ private boolean shouldShowClient(ClientMetadata clientMetadata) { return clientMetadata.isShowOnHomePage() && clientMetadata.getAppLaunchUrl() != null; } - @RequestMapping("/error500") + @RequestMapping({"/error500", "/error500/"}) public String error500(Model model, HttpServletRequest request, HttpServletResponse response) { Throwable genericException = (Throwable) request.getAttribute("javax.servlet.error.exception"); logger.error("Internal error", genericException); @@ -164,7 +164,7 @@ public String errorGeneric(Model model) { return ERROR; } - @RequestMapping("/saml_error") + @RequestMapping({"/saml_error", "/saml_error/"}) public String error401(Model model, HttpServletRequest request) { AuthenticationException exception = SessionUtils.getAuthenticationException(request.getSession()); if (nonNull(exception)) { @@ -173,7 +173,7 @@ public String error401(Model model, HttpServletRequest request) { return EXTERNAL_AUTH_ERROR; } - @RequestMapping("/oauth_error") + @RequestMapping({"/oauth_error", "/oauth_error/"}) public String error_oauth(Model model, HttpServletRequest request) { String OAUTH_ERROR = "oauth_error"; String exception = (String) request.getSession().getAttribute(OAUTH_ERROR); @@ -185,7 +185,7 @@ public String error_oauth(Model model, HttpServletRequest request) { return EXTERNAL_AUTH_ERROR; } - @RequestMapping("/rejected") + @RequestMapping({"/rejected", "/rejected/"}) @ResponseStatus(HttpStatus.BAD_REQUEST) public String handleRequestRejected(Model model, @RequestAttribute(RequestDispatcher.ERROR_EXCEPTION) RequestRejectedException ex, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java index d9dab93fd72..ba435fed1bb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java @@ -24,13 +24,13 @@ import org.yaml.snakeyaml.constructor.Construct; import org.yaml.snakeyaml.nodes.Node; -import javax.validation.ConstraintViolation; -import javax.validation.Valid; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.io.BufferedReader; import java.io.FileReader; import java.io.InputStreamReader; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlConfigurationValidator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlConfigurationValidator.java index 64d2b6f7610..6cde3d1ee84 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlConfigurationValidator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlConfigurationValidator.java @@ -24,10 +24,10 @@ import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import java.util.Arrays; import java.util.Set; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java index d7d00deeab0..a532c19977d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java @@ -22,7 +22,7 @@ import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.FileNotFoundException; import java.net.URISyntaxException; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java index 8df3b94b410..3e1ce7ea82e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java @@ -48,9 +48,9 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.sql.Timestamp; import java.util.Arrays; @@ -72,7 +72,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @Controller -@RequestMapping("/invitations") +@RequestMapping({"/invitations", "/invitations/"}) public class InvitationsController { private static Logger logger = LoggerFactory.getLogger(InvitationsController.class); @@ -113,7 +113,7 @@ public void return404(HttpServletResponse response) { response.setStatus(404); } - @RequestMapping(value = "/accept", method = GET, params = {"code"}) + @RequestMapping(value = {"/accept", "/accept/"}, method = GET, params = {"code"}) public String acceptInvitePage(@RequestParam String code, Model model, HttpServletRequest request, HttpServletResponse response) { ExpiringCode expiringCode = expiringCodeStore.peekCode(code, IdentityZoneHolder.get().getId()); @@ -237,7 +237,7 @@ public String getQueryString() { }; } - @RequestMapping(value = "/accept.do", method = POST) + @RequestMapping(value = {"/accept.do", "/accept.do/"}, method = POST) public String acceptInvitation(@RequestParam("password") String password, @RequestParam("password_confirmation") String passwordConfirmation, @RequestParam("code") String code, @@ -306,7 +306,7 @@ private String processErrorReload(String code, Model model, String email, HttpSe } } - @RequestMapping(value = "/accept_enterprise.do", method = POST) + @RequestMapping(value = {"/accept_enterprise.do", "/accept_enterprise.do/"}, method = POST) public String acceptLdapInvitation(@RequestParam("enterprise_username") String username, @RequestParam("enterprise_password") String password, @RequestParam("enterprise_email") String email, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java index 3fdf2539f14..adcb0e34469 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java @@ -27,9 +27,9 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.servlet.http.HttpServletRequest; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.servlet.http.HttpServletRequest; import java.net.MalformedURLException; import java.net.URL; import java.sql.Timestamp; @@ -68,7 +68,7 @@ public InvitationsEndpoint(final ScimUserProvisioning scimUserProvisioning, this.expiringCodeStore = expiringCodeStore; } - @RequestMapping(value = "/invite_users", method = RequestMethod.POST, consumes = "application/json") + @RequestMapping(value = {"/invite_users", "/invite_users/"}, method = RequestMethod.POST, consumes = "application/json") public ResponseEntity inviteUsers(@RequestBody InvitationsRequest invitations, @RequestParam(value = "client_id", required = false) String clientId, @RequestParam(value = "redirect_uri") String redirectUri) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandler.java index dd46b62e354..49e8b1410db 100755 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandler.java @@ -23,10 +23,10 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactory.java index 5ce2d12d8b0..91b7a9e87b8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactory.java @@ -3,7 +3,7 @@ import org.cloudfoundry.identity.uaa.authentication.UaaPrincipal; import org.cloudfoundry.identity.uaa.util.JsonUtils; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java index 0e79127c9b9..df7bb97bb01 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.POST; @@ -40,14 +40,14 @@ public ForcePasswordChangeController( this.resetPasswordService = resetPasswordService; } - @RequestMapping(value = "/force_password_change", method = GET) + @RequestMapping(value = {"/force_password_change", "/force_password_change/"}, method = GET) public String forcePasswordChangePage(Model model) { String email = ((UaaAuthentication) SecurityContextHolder.getContext().getAuthentication()).getPrincipal().getEmail(); model.addAttribute("email", email); return "force_password_change"; } - @RequestMapping(value = "/force_password_change", method = POST) + @RequestMapping(value = {"/force_password_change", "/force_password_change/"}, method = POST) public String handleForcePasswordChange(Model model, @RequestParam("password") String password, @RequestParam("password_confirmation") String passwordConfirmation, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java index b0c617589ad..36e9407b922 100755 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java @@ -22,10 +22,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.cloudfoundry.identity.uaa.provider.NoSuchClientException; import org.springframework.beans.factory.annotation.Qualifier; @@ -762,7 +762,7 @@ private String extractUrlFromString(String s) { return null; } - @RequestMapping(value = "/origin-chooser", method = RequestMethod.POST) + @RequestMapping(value = {"/origin-chooser", "/origin-chooser/"}, method = RequestMethod.POST) public String loginUsingOrigin(@RequestParam(required = false, name = "login_hint") String loginHint, Model model, HttpSession session, HttpServletRequest request) { if (!StringUtils.hasText(loginHint)) { return "redirect:/login?discoveryPerformed=true"; @@ -772,7 +772,7 @@ public String loginUsingOrigin(@RequestParam(required = false, name = "login_hin } - @RequestMapping(value = "/login/idp_discovery", method = RequestMethod.POST) + @RequestMapping(value = {"/login/idp_discovery", "/login/idp_discovery/"}, method = RequestMethod.POST) public String discoverIdentityProvider(@RequestParam String email, @RequestParam(required = false) String skipDiscovery, @RequestParam(required = false, name = "login_hint") String loginHint, @RequestParam(required = false, name = "username") String username,Model model, HttpSession session, HttpServletRequest request) { ClientDetails clientDetails = null; if (hasSavedOauthAuthorizeRequest(session)) { @@ -820,7 +820,7 @@ private String goToPasswordPage(String email, Model model) { return "idp_discovery/password"; } - @RequestMapping(value = "/autologin", method = RequestMethod.POST) + @RequestMapping(value = {"/autologin", "/autologin/"}, method = RequestMethod.POST) @ResponseBody public AutologinResponse generateAutologinCode(@RequestBody AutologinRequest request, @RequestHeader(value = "Authorization", required = false) String auth) throws Exception { @@ -865,7 +865,7 @@ public AutologinResponse generateAutologinCode(@RequestBody AutologinRequest req return new AutologinResponse(expiringCode.getCode()); } - @RequestMapping(value = "/autologin", method = GET) + @RequestMapping(value = {"/autologin", "/autologin/"}, method = GET) public String performAutologin(HttpSession session) { String redirectLocation = "home"; SavedRequest savedRequest = SessionUtils.getSavedRequestSession(session); @@ -876,12 +876,12 @@ public String performAutologin(HttpSession session) { return "redirect:" + redirectLocation; } - @RequestMapping(value = "/login_implicit", method = GET) + @RequestMapping(value = {"/login_implicit", "/login_implicit/"}, method = GET) public String captureImplicitValuesUsingJavascript() { return "login_implicit"; } - @RequestMapping(value = "/login/callback/{origin}") + @RequestMapping(value = {"/login/callback/{origin}", "/login/callback/{origin}/"}) public String handleExternalOAuthCallback(final HttpSession session) { String redirectLocation = "/home"; SavedRequest savedRequest = SessionUtils.getSavedRequestSession(session); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/SessionController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/SessionController.java index f635cde8558..a4d3efd4ccd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/SessionController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/SessionController.java @@ -20,7 +20,7 @@ @Controller public class SessionController { - @RequestMapping("/session") + @RequestMapping({"/session", "/session/"}) public String session(Model model, @RequestParam String clientId, @RequestParam String messageOrigin) { // We need to maintain this version of the session page to continue compatibility with the // original version of uaa-singular. @@ -29,7 +29,7 @@ public String session(Model model, @RequestParam String clientId, @RequestParam return "session"; } - @RequestMapping("/session_management") + @RequestMapping({"/session_management", "/session_management/"}) public String sessionManagement(Model model, @RequestParam String clientId, @RequestParam String messageOrigin) { model.addAttribute("clientId", clientId); model.addAttribute("messageOrigin", messageOrigin); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ThymeleafConfig.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ThymeleafConfig.java index aae283f36f0..023baf55f83 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ThymeleafConfig.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ThymeleafConfig.java @@ -25,9 +25,9 @@ import org.springframework.web.servlet.view.json.MappingJackson2JsonView; import org.thymeleaf.dialect.IDialect; import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandler.java index 59ea3e8a351..78e696ee668 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandler.java @@ -20,10 +20,10 @@ import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler; import org.springframework.security.web.authentication.logout.LogoutHandler; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class UaaAuthenticationFailureHandler implements AuthenticationFailureHandler, LogoutHandler { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/message/EmailService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/message/EmailService.java index d89f66e9188..a0aafcd35f3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/message/EmailService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/message/EmailService.java @@ -8,11 +8,11 @@ import org.springframework.util.StringUtils; import org.springframework.web.util.UriComponentsBuilder; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import java.io.UnsupportedEncodingException; public class EmailService implements MessageService { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/message/LocalUaaRestTemplate.java b/server/src/main/java/org/cloudfoundry/identity/uaa/message/LocalUaaRestTemplate.java index 8776765f579..3d686c3e03c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/message/LocalUaaRestTemplate.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/message/LocalUaaRestTemplate.java @@ -1,10 +1,10 @@ package org.cloudfoundry.identity.uaa.message; import com.google.common.collect.Sets; -import org.apache.http.conn.ssl.SSLContextBuilder; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; +import org.apache.hc.client5.http.ssl.TrustSelfSignedStrategy; +import org.apache.hc.core5.ssl.SSLContextBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.cloudfoundry.identity.uaa.constants.OriginKeys; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2ClientContext; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2RestTemplate; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java b/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java index 4356bb0279b..bf4b00c8fe3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java @@ -18,11 +18,11 @@ import org.springframework.mail.javamail.MimeMessagePreparator; import org.springframework.util.StreamUtils; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilter.java index d9e9235f38b..8a20d80aadf 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilter.java @@ -17,10 +17,10 @@ import org.yaml.snakeyaml.Yaml; import javax.management.Notification; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessController.java index f3c0e0d172c..6b423bdea98 100755 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/AccessController.java @@ -26,7 +26,7 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.WebRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.ArrayList; import java.util.HashMap; @@ -71,7 +71,7 @@ public AccessController( this.groupProvisioning = groupProvisioning; } - @RequestMapping("/oauth/confirm_access") + @RequestMapping({"/oauth/confirm_access", "/oauth/confirm_access/"}) public String confirm(Map model, final HttpServletRequest request, Principal principal, SessionStatus sessionStatus) { @@ -244,7 +244,7 @@ private String getRedirectUri(ClientDetails client, AuthorizationRequest clientA return result; } - @RequestMapping("/oauth/error") + @RequestMapping({"/oauth/error", "/oauth/error/"}) public String handleError(WebRequest request, Map model) { // There is already an error entry in the model Object object = request.getAttribute("error", RequestAttributes.SCOPE_REQUEST); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpoint.java index 1a7649730a9..f688e8466ed 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/CheckTokenEndpoint.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -80,7 +80,7 @@ public void afterPropertiesSet() { Assert.notNull(resourceServerTokenServices, "tokenServices must be set"); } - @RequestMapping(value = "/check_token", method = POST) + @RequestMapping(value = {"/check_token", "/check_token/"}, method = POST) @ResponseBody @Deprecated public Claims checkToken(@RequestParam(name = "token", required = false, defaultValue = "") String value, @@ -137,7 +137,7 @@ private boolean hadParsedAllArgs(HttpServletRequest request) { return request.getAttribute(PARAMETER_PARSE_FAILED_ATTR) == null; } - @RequestMapping(value = "/check_token") + @RequestMapping(value = {"/check_token", "/check_token/"}) @ResponseBody @Deprecated public Claims checkToken(HttpServletRequest request) throws HttpRequestMethodNotSupportedException { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilter.java index c885aa23113..74b29e0acf0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilter.java @@ -21,11 +21,11 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java index f61259f9042..7d1c8341791 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.springframework.web.bind.annotation.RequestMethod.POST; @@ -29,7 +29,7 @@ public IntrospectEndpoint( this.resourceServerTokenServices = resourceServerTokenServices; } - @RequestMapping(value = "/introspect", method = POST) + @RequestMapping(value = {"/introspect", "/introspect/"}, method = POST) @ResponseBody public IntrospectionClaims introspect(@RequestParam("token") String token) { IntrospectionClaims introspectionClaims = new IntrospectionClaims(); @@ -51,7 +51,7 @@ public IntrospectionClaims introspect(@RequestParam("token") String token) { return introspectionClaims; } - @RequestMapping(value = "/introspect") + @RequestMapping(value = {"/introspect", "/introspect/"}) @ResponseBody public IntrospectionClaims methodNotSupported(HttpServletRequest request) throws HttpRequestMethodNotSupportedException { throw new HttpRequestMethodNotSupportedException(request.getMethod()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/RemoteTokenServices.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/RemoteTokenServices.java index 8b624bc26de..6f85c4c00d9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/RemoteTokenServices.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/RemoteTokenServices.java @@ -79,7 +79,7 @@ public RemoteTokenServices() { @Override // Ignore 400 public void handleError(ClientHttpResponse response) throws IOException { - if (response.getRawStatusCode() != 400) { + if (response.getStatusCode().value() != 400) { super.handleError(response); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenKeyEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenKeyEndpoint.java index a4b1138c523..33ff3cc0ce8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenKeyEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenKeyEndpoint.java @@ -42,7 +42,7 @@ public TokenKeyEndpoint( this.keyInfoService = keyInfoService; } - @RequestMapping(value = "/token_key", method = RequestMethod.GET) + @RequestMapping(value = {"/token_key", "/token_key/"}, method = RequestMethod.GET) @ResponseBody public ResponseEntity getKey(Principal principal, @RequestHeader(value = "If-None-Match", required = false, defaultValue = "NaN") String eTag) { @@ -57,7 +57,7 @@ public ResponseEntity getKey(Principal principal, } - @RequestMapping(value = "/token_keys", method = RequestMethod.GET) + @RequestMapping(value = {"/token_keys", "/token_keys/"}, method = RequestMethod.GET) @ResponseBody public ResponseEntity getKeys(Principal principal, @RequestHeader(value = "If-None-Match", required = false, defaultValue = "NaN") String eTag) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenRevocationEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenRevocationEndpoint.java index 25dcf59fd23..531ca1122c8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenRevocationEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenRevocationEndpoint.java @@ -64,7 +64,7 @@ public TokenRevocationEndpoint( this.generator = new RandomValueStringGenerator(8); } - @RequestMapping("/oauth/token/revoke/user/{userId}") + @RequestMapping({"/oauth/token/revoke/user/{userId}", "/oauth/token/revoke/user/{userId}/"}) public ResponseEntity revokeTokensForUser(@PathVariable String userId) { logger.debug("Revoking tokens for user: " + userId); String zoneId = IdentityZoneHolder.get().getId(); @@ -76,7 +76,7 @@ public ResponseEntity revokeTokensForUser(@PathVariable String userId) { return new ResponseEntity<>(OK); } - @RequestMapping("/oauth/token/revoke/user/{userId}/client/{clientId}") + @RequestMapping({"/oauth/token/revoke/user/{userId}/client/{clientId}", "/oauth/token/revoke/user/{userId}/client/{clientId}/"}) public ResponseEntity revokeTokensForUserAndClient(@PathVariable String userId, @PathVariable String clientId) { String zoneId = IdentityZoneHolder.get().getId(); logger.debug("Revoking tokens for user " + userId + " and client " + clientId); @@ -89,7 +89,7 @@ public ResponseEntity revokeTokensForUserAndClient(@PathVariable String us return new ResponseEntity<>(OK); } - @RequestMapping("/oauth/token/revoke/client/{clientId}") + @RequestMapping({"/oauth/token/revoke/client/{clientId}", "/oauth/token/revoke/client/{clientId}/"}) public ResponseEntity revokeTokensForClient(@PathVariable String clientId) { logger.debug("Revoking tokens for client: " + clientId); String zoneId = IdentityZoneHolder.get().getId(); @@ -102,7 +102,7 @@ public ResponseEntity revokeTokensForClient(@PathVariable String clientId) return new ResponseEntity<>(OK); } - @DeleteMapping(value = "/oauth/token/revoke/{tokenId}") + @DeleteMapping(value = {"/oauth/token/revoke/{tokenId}", "/oauth/token/revoke/{tokenId}/"}) public ResponseEntity revokeTokenById(@PathVariable String tokenId) { logger.debug("Revoking token with ID:" + tokenId); String zoneId = IdentityZoneHolder.get().getId(); @@ -112,7 +112,7 @@ public ResponseEntity revokeTokenById(@PathVariable String tokenId) { return new ResponseEntity<>(OK); } - @GetMapping(value = "/oauth/token/list") + @GetMapping(value = {"/oauth/token/list", "/oauth/token/list/"}) public ResponseEntity> listUserTokens(OAuth2Authentication authentication) { UaaPrincipal principal = (UaaPrincipal) authentication.getUserAuthentication().getPrincipal(); String userId = principal.getId(); @@ -127,7 +127,7 @@ protected void removeTokenValues(List result) { result.forEach(t -> t.setValue(null)); } - @GetMapping(value = "/oauth/token/list/user/{userId}") + @GetMapping(value = {"/oauth/token/list/user/{userId}", "/oauth/token/list/user/{userId}/"}) public ResponseEntity> listUserTokens(@PathVariable String userId, OAuth2Authentication authentication) { if (OAuth2ExpressionUtils.hasAnyScope(authentication, new String[]{"tokens.list", "uaa.admin"})) { logger.debug("Listing revocable tokens for user:" + userId); @@ -139,7 +139,7 @@ public ResponseEntity> listUserTokens(@PathVariable String } } - @GetMapping(value = "/oauth/token/list/client/{clientId}") + @GetMapping(value = {"/oauth/token/list/client/{clientId}", "/oauth/token/list/client/{clientId}/"}) public ResponseEntity> listClientTokens(@PathVariable String clientId, OAuth2Authentication authentication) { if (OAuth2ExpressionUtils.hasAnyScope(authentication, new String[]{"tokens.list", "uaa.admin"})) { logger.debug("Listing revocable tokens for client:" + clientId); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java index 07a859e7aca..0e199ba3564 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java @@ -1,7 +1,6 @@ package org.cloudfoundry.identity.uaa.oauth; - -import org.apache.http.HttpHost; -import org.apache.http.client.utils.URIUtils; +import org.apache.hc.client5.http.utils.URIUtils; +import org.apache.hc.core5.http.HttpHost; import org.cloudfoundry.identity.uaa.authentication.UaaPrincipal; import org.cloudfoundry.identity.uaa.provider.ClientRegistrationException; import org.cloudfoundry.identity.uaa.provider.NoSuchClientException; @@ -67,8 +66,8 @@ import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; import java.security.Principal; @@ -153,7 +152,7 @@ public class UaaAuthorizationEndpoint extends AbstractEndpoint implements Authen this.implicitLock = new Object(); } - @RequestMapping(value = "/oauth/authorize") + @RequestMapping(value = {"/oauth/authorize", "/oauth/authorize/"}) public ModelAndView authorize(Map model, @RequestParam Map parameters, SessionStatus sessionStatus, @@ -397,7 +396,7 @@ Map unmodifiableMap(AuthorizationRequest authorizationRequest) { return authorizationRequestMap; } - @RequestMapping(value = "/oauth/authorize", method = RequestMethod.POST, params = OAuth2Utils.USER_OAUTH_APPROVAL) + @RequestMapping(value = {"/oauth/authorize", "/oauth/authorize/"}, method = RequestMethod.POST, params = OAuth2Utils.USER_OAUTH_APPROVAL) public View approveOrDeny(@RequestParam Map approvalParameters, Map model, SessionStatus sessionStatus, Principal principal) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java index e62f77f136a..bd0df141410 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java @@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.dao.DeadlockLoserDataAccessException; import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.dao.PessimisticLockingFailureException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.support.SqlLobValue; @@ -240,7 +240,7 @@ private void actuallyPerformExpirationClean(Instant now) { logger.debug("[oauth_code] Removed "+expired+" expired entries."); expired = template.update(SQL_CLEAN_STATEMENT, Timestamp.from(now.minus(LEGACY_CODE_EXPIRATION_TIME))); logger.debug("[oauth_code] Removed "+expired+" old entries."); - } catch (DeadlockLoserDataAccessException e) { + } catch (PessimisticLockingFailureException e) { logger.debug("[oauth code] Deadlock trying to expire entries, ignored."); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/BearerTokenExtractor.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/BearerTokenExtractor.java index 3aa4b0b4c3c..336e880d88d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/BearerTokenExtractor.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/BearerTokenExtractor.java @@ -6,7 +6,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Enumeration; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetails.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetails.java index dad232ebc3e..c0cf919b3fb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetails.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetails.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.oauth.provider.authentication; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.Serializable; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsSource.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsSource.java index ca18998e09e..fe4e84ed9ad 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsSource.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsSource.java @@ -3,7 +3,7 @@ import org.springframework.security.authentication.AuthenticationDetailsSource; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Moved class implementation of from spring-security-oauth2 into UAA diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilter.java index fc4ad57e730..819db1940ad 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilter.java @@ -19,13 +19,13 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.util.Assert; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/TokenExtractor.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/TokenExtractor.java index 208513cd20a..d4553065344 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/TokenExtractor.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/TokenExtractor.java @@ -2,7 +2,7 @@ import org.springframework.security.core.Authentication; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Moved class implementation of from spring-security-oauth2 into UAA diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java index 1fed3ae0046..0370d2fa1a8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java @@ -12,13 +12,13 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; import java.util.Optional; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpoint.java index f5ecb8899dd..b2b81921b37 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpoint.java @@ -50,7 +50,7 @@ public class TokenEndpoint extends AbstractEndpoint { private Set allowedRequestMethods = new HashSet<>(Arrays.asList(HttpMethod.POST)); - @GetMapping(value = "/oauth/token") + @GetMapping(value = {"/oauth/token", "/oauth/token/"}) public ResponseEntity getAccessToken( Principal principal, @RequestParam Map parameters) throws HttpRequestMethodNotSupportedException { @@ -61,7 +61,7 @@ public ResponseEntity getAccessToken( return postAccessToken(principal, parameters); } - @PostMapping(value = "/oauth/token") + @PostMapping(value = {"/oauth/token", "/oauth/token/"}) public ResponseEntity postAccessToken( Principal principal, @RequestParam Map parameters) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilter.java index 7366e2d3429..5a481da722f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -18,13 +18,13 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/WhitelabelApprovalEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/WhitelabelApprovalEndpoint.java index e4d0211f588..e658c5ca61d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/WhitelabelApprovalEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/WhitelabelApprovalEndpoint.java @@ -9,8 +9,8 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.HtmlUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Iterator; import java.util.Map; @@ -29,7 +29,7 @@ public class WhitelabelApprovalEndpoint { private static final String CSRF = "_csrf"; private static final String SCOPES = "scopes"; - @GetMapping(value = "/oauth/confirm_access") + @GetMapping(value = {"/oauth/confirm_access", "/oauth/confirm_access/"}) public ModelAndView getAccessConfirmation(Map model, HttpServletRequest request) { final String approvalContent = createTemplate(model, request); if (request.getAttribute(CSRF) != null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/AbstractOAuth2SecurityExceptionHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/AbstractOAuth2SecurityExceptionHandler.java index 7bc0df27fc7..d44190f51f5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/AbstractOAuth2SecurityExceptionHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/AbstractOAuth2SecurityExceptionHandler.java @@ -7,9 +7,9 @@ import org.springframework.web.servlet.HandlerExceptionResolver; import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultOAuth2ExceptionRenderer.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultOAuth2ExceptionRenderer.java index d93e41fbd2b..34a7491fd45 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultOAuth2ExceptionRenderer.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultOAuth2ExceptionRenderer.java @@ -17,8 +17,8 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultThrowableAnalyzer.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultThrowableAnalyzer.java index d0725c53a80..d2bbd681ad0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultThrowableAnalyzer.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/DefaultThrowableAnalyzer.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.oauth.provider.error; import org.springframework.security.web.util.ThrowableAnalyzer; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; /** * Base exception for OAuth 2 exceptions. diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandler.java index 35052899e5d..afb11bfbb63 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandler.java @@ -3,9 +3,9 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPoint.java index 087f7d3019d..db13c364f36 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPoint.java @@ -7,9 +7,9 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.util.StringUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpoint.java index c4e82a4a12f..60b2d17dc1c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpoint.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Arrays; import java.util.Collections; @@ -31,7 +31,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @Controller -@RequestMapping(value = "/oauth/token") //used simply because TokenEndpoint wont match /oauth/token/alias/saml-entity-id +@RequestMapping(value = {"/oauth/token", "/oauth/token/"}) //used simply because TokenEndpoint wont match /oauth/token/alias/saml-entity-id public class UaaTokenEndpoint extends TokenEndpoint { private final boolean allowQueryString; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java index 31ff0869d90..f62665c2c9b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java @@ -77,7 +77,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@RequestMapping("/identity-providers") +@RequestMapping({"/identity-providers", "/identity-providers/"}) @RestController public class IdentityProviderEndpoints implements ApplicationEventPublisherAware { @@ -150,7 +150,7 @@ public ResponseEntity createIdentityProvider(@RequestBody Iden return persistIdentityProviderChange(body, rawConfig, zoneId, null, CREATED); } - @DeleteMapping(value = "{id}") + @DeleteMapping(value = {"{id}", "{id}/"}) @Transactional public ResponseEntity deleteIdentityProvider(@PathVariable String id, @RequestParam(required = false, defaultValue = "false") boolean rawConfig) { String identityZoneId = identityZoneManager.getCurrentIdentityZoneId(); @@ -195,7 +195,7 @@ public ResponseEntity deleteIdentityProvider(@PathVariable Str return new ResponseEntity<>(existing, OK); } - @PutMapping(value = "{id}") + @PutMapping(value = {"{id}", "{id}/"}) public ResponseEntity updateIdentityProvider(@PathVariable String id, @RequestBody IdentityProvider body, @RequestParam(required = false, defaultValue = "false") boolean rawConfig) throws MetadataProviderException { body.setSerializeConfigRaw(rawConfig); String zoneId = identityZoneManager.getCurrentIdentityZoneId(); @@ -265,7 +265,7 @@ private ResponseEntity persistIdentityProviderChange(IdentityP return new ResponseEntity<>(updatedIdp, status); } - @PatchMapping(value = "{id}/status") + @PatchMapping(value = {"{id}/status", "{id}/status/"}) public ResponseEntity updateIdentityProviderStatus(@PathVariable String id, @RequestBody IdentityProviderStatus body) { String zoneId = identityZoneManager.getCurrentIdentityZoneId(); IdentityProvider existing = identityProviderProvisioning.retrieve(id, zoneId); @@ -314,7 +314,7 @@ public ResponseEntity> retrieveIdentityProviders( return new ResponseEntity<>(identityProviderList, OK); } - @GetMapping(value = "{id}") + @GetMapping(value = {"{id}", "{id}/"}) public ResponseEntity retrieveIdentityProvider(@PathVariable String id, @RequestParam(required = false, defaultValue = "false") boolean rawConfig) { IdentityProvider identityProvider = identityProviderProvisioning.retrieve(id, identityZoneManager.getCurrentIdentityZoneId()); identityProvider.setSerializeConfigRaw(rawConfig); @@ -323,7 +323,7 @@ public ResponseEntity retrieveIdentityProvider(@PathVariable S return new ResponseEntity<>(identityProvider, OK); } - @RequestMapping(value = "test", method = POST) + @RequestMapping(value = {"test", "test/"}, method = POST) public ResponseEntity testIdentityProvider(@RequestBody IdentityProviderValidationRequest body) { String exception = "ok"; HttpStatus status = OK; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ProcessLdapProperties.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ProcessLdapProperties.java index e00961b7e22..79214d887ce 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ProcessLdapProperties.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ProcessLdapProperties.java @@ -14,7 +14,7 @@ package org.cloudfoundry.identity.uaa.provider.ldap; -import org.apache.http.conn.ssl.AllowAllHostnameVerifier; +import org.apache.hc.core5.ssl.AllowAllHostnameVerifier; import org.cloudfoundry.identity.uaa.provider.ldap.extension.DefaultTlsDirContextAuthenticationStrategy; import org.cloudfoundry.identity.uaa.provider.ldap.extension.ExternalTlsDirContextAuthenticationStrategy; import org.cloudfoundry.identity.uaa.security.LdapSocketFactory; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilter.java index 80af3dca9a9..08e824114e9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilter.java @@ -13,15 +13,15 @@ import org.springframework.security.web.csrf.CsrfException; import org.springframework.web.HttpSessionRequiredException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import static java.util.Optional.ofNullable; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthLogoutHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthLogoutHandler.java index 417e2f40aa4..0edeedc6473 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthLogoutHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthLogoutHandler.java @@ -16,8 +16,8 @@ import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Set; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java index 31ef18f1594..ae63545f512 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfigurator.java @@ -21,7 +21,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandler.java index 0334fac8833..69614398ece 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandler.java @@ -1,6 +1,5 @@ package org.cloudfoundry.identity.uaa.provider.saml; - -import org.apache.http.client.utils.URIBuilder; +import org.apache.hc.core5.net.URIBuilder; import org.cloudfoundry.identity.uaa.util.SessionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,10 +8,10 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; import org.springframework.security.web.savedrequest.DefaultSavedRequest; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.net.URI; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscovery.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscovery.java index fbd35275528..ffd8182232d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscovery.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscovery.java @@ -12,12 +12,12 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.provider.saml; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlEntryPoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlEntryPoint.java index 837392f19a8..af7714fd7c2 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlEntryPoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlEntryPoint.java @@ -25,9 +25,9 @@ import org.springframework.security.saml.websso.WebSSOProfileOptions; import org.springframework.security.web.WebAttributes; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class LoginSamlEntryPoint extends SAMLEntryPoint { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java index 556113ab95b..c7043f68373 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.provider.saml; -import org.apache.http.client.utils.URIBuilder; +import org.apache.hc.core5.net.URIBuilder; import org.cloudfoundry.identity.uaa.constants.OriginKeys; import org.cloudfoundry.identity.uaa.provider.IdentityProvider; import org.cloudfoundry.identity.uaa.provider.IdentityProviderProvisioning; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactory.java index faac61fefad..a70c8505c28 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactory.java @@ -20,7 +20,7 @@ import org.springframework.security.saml.storage.SAMLMessageStorage; import org.springframework.security.saml.storage.SAMLMessageStorageFactory; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class SamlSessionStorageFactory implements SAMLMessageStorageFactory { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/ZoneAwareMetadataDisplayFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/ZoneAwareMetadataDisplayFilter.java index 81cdc225236..69f0d1dec84 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/ZoneAwareMetadataDisplayFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/ZoneAwareMetadataDisplayFilter.java @@ -20,9 +20,9 @@ import org.springframework.security.saml.metadata.MetadataDisplayFilter; import org.springframework.security.saml.metadata.MetadataGenerator; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimiterImpl.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimiterImpl.java index f015f1868b3..0dc132ee86b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimiterImpl.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimiterImpl.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.ratelimiting; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.cloudfoundry.identity.uaa.ratelimiting.core.Limiter; import org.cloudfoundry.identity.uaa.ratelimiting.core.LimiterManager; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilter.java index 41e819c3596..39bc8fa88d6 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilter.java @@ -4,13 +4,13 @@ import java.time.Instant; import java.util.Collections; import java.util.Enumeration; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.cloudfoundry.identity.uaa.ratelimiting.core.Limiter; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/config/RateLimitingConfigInitializer.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/config/RateLimitingConfigInitializer.java index 8be98c408eb..91778e47a54 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/config/RateLimitingConfigInitializer.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/config/RateLimitingConfigInitializer.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.ratelimiting.config; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.cloudfoundry.identity.uaa.ratelimiting.core.config.exception.RateLimitingConfigException; import org.cloudfoundry.identity.uaa.ratelimiting.core.http.CredentialIdType; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/RateLimiter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/RateLimiter.java index b9572e02ef2..5f659154956 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/RateLimiter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/RateLimiter.java @@ -1,8 +1,8 @@ package org.cloudfoundry.identity.uaa.ratelimiting.core; -import javax.servlet.http.HttpServletRequest; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.ratelimiting.config.InitialConfig; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImpl.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImpl.java index 37eb3612e1b..8d4ed426f2e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImpl.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImpl.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.ratelimiting.core.http; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiter.java index 4de5e56ec70..ce4fee655e4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiter.java @@ -3,7 +3,7 @@ import java.time.Instant; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java index 8ea601eaae8..bca2d24be9b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java @@ -2,7 +2,7 @@ import java.util.LinkedHashMap; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; import org.cloudfoundry.identity.uaa.ratelimiting.core.LoggingOption; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactory.java index 0a51470b25d..e6e5cfc94f3 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactory.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.ratelimiting.internal.common; import java.time.Instant; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/LimiterImpl.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/LimiterImpl.java index 0370cbd65b1..7ea756e5ce5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/LimiterImpl.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/LimiterImpl.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; import java.util.function.Consumer; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import lombok.NonNull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoriesSupplierImpl.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoriesSupplierImpl.java index d86fcb60ec8..643702a9f95 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoriesSupplierImpl.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoriesSupplierImpl.java @@ -5,7 +5,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; import org.cloudfoundry.identity.uaa.ratelimiting.core.LoggingOption; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoryImpl.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoryImpl.java index bb9cecbb9b5..6f9cef192df 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoryImpl.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/InternalLimiterFactoryImpl.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.ratelimiting.internal.limitertracking; import java.time.Instant; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import lombok.Builder; import lombok.Getter; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableInternalUserManagementFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableInternalUserManagementFilter.java index b233104f6e4..0a2bf72f62b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableInternalUserManagementFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableInternalUserManagementFilter.java @@ -8,10 +8,10 @@ import org.cloudfoundry.identity.uaa.zone.beans.IdentityZoneManager; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.regex.Pattern; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableUserManagementSecurityFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableUserManagementSecurityFilter.java index 10395c6dbc5..30f2bf85da5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableUserManagementSecurityFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/DisableUserManagementSecurityFilter.java @@ -13,10 +13,10 @@ import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.NestedServletException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java index be729181f35..8c8f295f0e4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java @@ -28,7 +28,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.util.StringUtils; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ChangeEmailEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ChangeEmailEndpoints.java index 617bd4471da..c6fb81567fa 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ChangeEmailEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ChangeEmailEndpoints.java @@ -55,7 +55,7 @@ public ChangeEmailEndpoints( this.identityZoneManager = identityZoneManager; } - @RequestMapping(value = "/email_verifications", method = RequestMethod.POST) + @RequestMapping(value = {"/email_verifications", "/email_verifications/"}, method = RequestMethod.POST) public ResponseEntity generateEmailVerificationCode(@RequestBody EmailChange emailChange) { final String userId = emailChange.getUserId(); final String email = emailChange.getEmail(); @@ -76,7 +76,7 @@ public ResponseEntity generateEmailVerificationCode(@RequestBody EmailCh } } - @RequestMapping(value = "/email_changes", method = RequestMethod.POST) + @RequestMapping(value = {"/email_changes", "/email_changes/"}, method = RequestMethod.POST) public ResponseEntity changeEmail(@RequestBody String code) { ExpiringCode expiringCode = expiringCodeStore.retrieveCode(code, identityZoneManager.getCurrentIdentityZoneId()); if ((null != expiringCode) && ((null == expiringCode.getIntent()) || EMAIL.name().equals(expiringCode.getIntent()))) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java index 6d57fedf263..4d969c3b0e5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java @@ -45,8 +45,8 @@ import org.springframework.web.servlet.View; import org.springframework.web.util.HtmlUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -535,7 +535,7 @@ public ScimGroup deleteZoneScope(@PathVariable String userId, return updateGroup(group, group.getId(), String.valueOf(group.getVersion()), httpServletResponse); } - @RequestMapping("/Groups/{groupId}/members/{memberId}") + @RequestMapping({"/Groups/{groupId}/members/{memberId}", "/Groups/{groupId}/members/{memberId}/"}) public ResponseEntity getGroupMembership(@PathVariable String groupId, @PathVariable String memberId) { ScimGroupMember membership = membershipManager.getMemberById(groupId, memberId, @@ -543,7 +543,7 @@ public ResponseEntity getGroupMembership(@PathVariable String g return new ResponseEntity<>(membership, HttpStatus.OK); } - @RequestMapping(value = "/Groups/{groupId}/members", method = RequestMethod.GET) + @RequestMapping(value = {"/Groups/{groupId}/members", "/Groups/{groupId}/members/"}, method = RequestMethod.GET) public ResponseEntity> listGroupMemberships(@PathVariable String groupId, @RequestParam(required = false, defaultValue = "false") boolean returnEntities, @RequestParam(required = false, defaultValue = "", name = "filter") String deprecatedFilter) { @@ -554,7 +554,7 @@ public ResponseEntity> listGroupMemberships(@PathVariable return new ResponseEntity<>(members, HttpStatus.OK); } - @RequestMapping(value = "/Groups/{groupId}/members", method = RequestMethod.POST) + @RequestMapping(value = {"/Groups/{groupId}/members", "/Groups/{groupId}/members/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.CREATED) @ResponseBody public ScimGroupMember addMemberToGroup(@PathVariable String groupId, @RequestBody ScimGroupMember member) { @@ -562,7 +562,7 @@ public ScimGroupMember addMemberToGroup(@PathVariable String groupId, @RequestBo return membershipManager.addMember(groupId, member, identityZoneManager.getCurrentIdentityZoneId()); } - @RequestMapping(value = "/Groups/{groupId}/members/{memberId}", method = RequestMethod.DELETE) + @RequestMapping(value = {"/Groups/{groupId}/members/{memberId}", "/Groups/{groupId}/members/{memberId}/"}, method = RequestMethod.DELETE) @ResponseBody @ResponseStatus(HttpStatus.OK) public ScimGroupMember deleteGroupMembership(@PathVariable String groupId, @PathVariable String memberId) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java index df825948b06..53dd90b7723 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java @@ -82,8 +82,8 @@ import org.springframework.web.servlet.View; import org.springframework.web.util.HtmlUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -219,7 +219,7 @@ public Map getErrorCounts() { return errorCounts; } - @RequestMapping(value = "/Users/{userId}", method = RequestMethod.GET) + @RequestMapping(value = {"/Users/{userId}", "/Users/{userId}/"}, method = RequestMethod.GET) @ResponseBody public ScimUser getUser(@PathVariable String userId, HttpServletResponse response) { ScimUser scimUser = syncApprovals(syncGroups(scimUserProvisioning.retrieve(userId, identityZoneManager.getCurrentIdentityZoneId()))); @@ -227,7 +227,7 @@ public ScimUser getUser(@PathVariable String userId, HttpServletResponse respons return scimUser; } - @RequestMapping(value = "/Users", method = RequestMethod.POST) + @RequestMapping(value = {"/Users", "/Users/"}, method = RequestMethod.POST) @ResponseStatus(HttpStatus.CREATED) @ResponseBody public ScimUser createUser(@RequestBody ScimUser user, HttpServletRequest request, HttpServletResponse response) { @@ -305,7 +305,7 @@ private boolean isUaaUser(@RequestBody ScimUser user) { return OriginKeys.UAA.equals(user.getOrigin()); } - @RequestMapping(value = "/Users/{userId}", method = RequestMethod.PUT) + @RequestMapping(value = {"/Users/{userId}", "/Users/{userId}/"}, method = RequestMethod.PUT) @ResponseBody public ScimUser updateUser(@RequestBody ScimUser user, @PathVariable String userId, @RequestHeader(value = "If-Match", required = false, defaultValue = "NaN") String etag, @@ -341,7 +341,7 @@ public ScimUser updateUser(@RequestBody ScimUser user, @PathVariable String user return scimUserWithApprovalsAndGroups; } - @RequestMapping(value = "/Users/{userId}", method = RequestMethod.PATCH) + @RequestMapping(value = {"/Users/{userId}", "/Users/{userId}/"}, method = RequestMethod.PATCH) @ResponseBody public ScimUser patchUser(@RequestBody ScimUser patch, @PathVariable String userId, @RequestHeader(value = "If-Match", required = false, defaultValue = "NaN") String etag, @@ -369,7 +369,7 @@ public ScimUser patchUser(@RequestBody ScimUser patch, @PathVariable String user } } - @RequestMapping(value = "/Users/{userId}", method = RequestMethod.DELETE) + @RequestMapping(value = {"/Users/{userId}", "/Users/{userId}/"}, method = RequestMethod.DELETE) @ResponseBody @Transactional public ScimUser deleteUser(@PathVariable String userId, @@ -430,7 +430,7 @@ public ScimUser deleteUser(@PathVariable String userId, return user; } - @RequestMapping(value = "/Users/{userId}/verify-link", method = RequestMethod.GET) + @RequestMapping(value = {"/Users/{userId}/verify-link", "/Users/{userId}/verify-link/"}, method = RequestMethod.GET) @ResponseBody public ResponseEntity getUserVerificationLink(@PathVariable String userId, @RequestParam(value = "client_id", required = false) String clientId, @@ -458,7 +458,7 @@ public ResponseEntity getUserVerificationLink(@PathVariabl return new ResponseEntity<>(responseBody, HttpStatus.OK); } - @RequestMapping(value = "/Users/{userId}/verify", method = RequestMethod.GET) + @RequestMapping(value = {"/Users/{userId}/verify", "/Users/{userId}/verify/"}, method = RequestMethod.GET) @ResponseBody public ScimUser verifyUser(@PathVariable String userId, @RequestHeader(value = "If-Match", required = false) String etag, @@ -489,7 +489,7 @@ private int getVersion(String userId, String etag) { } } - @RequestMapping(value = "/Users", method = RequestMethod.GET) + @RequestMapping(value = {"/Users", "/Users/"}, method = RequestMethod.GET) @ResponseBody public SearchResults findUsers( @RequestParam(value = "attributes", required = false) String attributesCommaSeparated, @@ -554,7 +554,7 @@ public SearchResults findUsers( } } - @RequestMapping(value = "/Users/{userId}/status", method = RequestMethod.PATCH) + @RequestMapping(value = {"/Users/{userId}/status", "/Users/{userId}/status/"}, method = RequestMethod.PATCH) public UserAccountStatus updateAccountStatus(@RequestBody UserAccountStatus status, @PathVariable String userId) { ScimUser user = scimUserProvisioning.retrieve(userId, identityZoneManager.getCurrentIdentityZoneId()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/UserIdConversionEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/UserIdConversionEndpoints.java index 1097f7e69ae..4531999f7df 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/UserIdConversionEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/UserIdConversionEndpoints.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.scim.endpoints; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; @@ -63,7 +63,7 @@ public UserIdConversionEndpoints( this.enabled = enabled; } - @RequestMapping(value = "/ids/Users") + @RequestMapping(value = {"/ids/Users", "/ids/Users/"}) @ResponseBody public ResponseEntity findUsers( @RequestParam(defaultValue = "") String filter, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandler.java index fceff846625..8186af1a298 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandler.java @@ -31,9 +31,9 @@ import org.springframework.security.web.csrf.MissingCsrfTokenException; import org.springframework.util.StringUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java index 3cfcf04747f..6567b8931bd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java @@ -27,7 +27,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.springframework.util.StringUtils.hasText; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilter.java index f78bc784f9a..930908aadae 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilter.java @@ -3,9 +3,9 @@ import org.cloudfoundry.identity.uaa.util.UaaUrlUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.HashSet; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CookieBasedCsrfTokenRepository.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CookieBasedCsrfTokenRepository.java index 3878d43ed54..ddb5713b18e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CookieBasedCsrfTokenRepository.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CookieBasedCsrfTokenRepository.java @@ -23,9 +23,9 @@ import org.springframework.security.web.csrf.CsrfTokenRepository; import org.springframework.security.web.csrf.DefaultCsrfToken; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static java.util.Optional.ofNullable; import static org.springframework.http.HttpHeaders.SET_COOKIE; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java index bced61d4255..dfc0544941a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java @@ -22,11 +22,11 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.annotation.PostConstruct; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/FixHttpsSchemeRequest.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/FixHttpsSchemeRequest.java index 1261c7d1266..bac6afcdfeb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/FixHttpsSchemeRequest.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/FixHttpsSchemeRequest.java @@ -13,8 +13,8 @@ package org.cloudfoundry.identity.uaa.security.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/HttpsHeaderFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/HttpsHeaderFilter.java index 0ca69181509..a81779909ab 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/HttpsHeaderFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/HttpsHeaderFilter.java @@ -15,13 +15,13 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java index 6a227f819f6..25182d6cb30 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java @@ -25,14 +25,14 @@ import org.springframework.security.web.util.RedirectUrlBuilder; import org.springframework.util.Assert; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; import java.util.Enumeration; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcher.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcher.java index e3a928f34c4..42c5c21e47d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcher.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/UaaRequestMatcher.java @@ -8,7 +8,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java b/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java index 735762ae02c..6f05aa75c48 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java @@ -20,7 +20,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java index dc1bdc94b3a..c1f90ad4ecf 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java @@ -23,7 +23,7 @@ import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.nimbusds.jwt.JWTClaimsSet; import org.cloudfoundry.identity.uaa.provider.NoSuchClientException; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/SessionUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/SessionUtils.java index 86e93be742e..827193bdfe1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/SessionUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/SessionUtils.java @@ -6,7 +6,7 @@ import org.springframework.security.web.WebAttributes; import org.springframework.security.web.savedrequest.SavedRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; public final class SessionUtils { public static final String PASSWORD_CHANGE_REQUIRED = "PASSWORD_CHANGE_REQUIRED"; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java index c5d28ab3f45..8d2141e8d98 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java @@ -12,29 +12,29 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.util; -import org.apache.http.HeaderElement; -import org.apache.http.HeaderElementIterator; -import org.apache.http.HttpResponse; -import org.apache.http.config.Registry; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.ConnectionKeepAliveStrategy; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.message.BasicHeaderElementIterator; -import org.apache.http.protocol.HTTP; -import org.apache.http.protocol.HttpContext; -import org.apache.http.util.TextUtils; +import org.apache.hc.core5.http.HeaderElement; +import org.apache.hc.core5.http.HeaderElementIterator; +import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.TrustSelfSignedStrategy; +import org.apache.hc.core5.http.config.Registry; +import org.apache.hc.core5.http.config.RegistryBuilder; +import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; +import org.apache.hc.client5.http.socket.ConnectionSocketFactory; +import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; +import org.apache.hc.core5.http.impl.io.conn.PoolingHttpClientConnectionManager; +import org.apache.hc.core5.http.message.BasicHeaderElementIterator; +import org.apache.hc.core5.http.protocol.HTTP; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLContextBuilder; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.impl.NoConnectionReuseStrategy; -import org.apache.http.impl.client.DefaultRedirectStrategy; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; +import org.apache.hc.core5.ssl.SSLContextBuilder; +import org.apache.hc.core5.http.impl.io.NoConnectionReuseStrategy; +import org.apache.hc.client5.http.impl.DefaultRedirectStrategy; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.context.request.RequestAttributes; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java index d42790b45d1..dd0d6871d36 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java @@ -11,7 +11,7 @@ import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/BackwardsCompatibleScopeParsingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/BackwardsCompatibleScopeParsingFilter.java index f06e19bb044..0a490d2f7dd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/BackwardsCompatibleScopeParsingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/BackwardsCompatibleScopeParsingFilter.java @@ -14,14 +14,14 @@ */ package org.cloudfoundry.identity.uaa.web; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/ConvertingExceptionView.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/ConvertingExceptionView.java index fa48551a1b9..8b1c78841d2 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/ConvertingExceptionView.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/ConvertingExceptionView.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/ForwardAwareInternalResourceViewResolver.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/ForwardAwareInternalResourceViewResolver.java index 2fd2ff91016..71f7b4ddfb6 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/ForwardAwareInternalResourceViewResolver.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/ForwardAwareInternalResourceViewResolver.java @@ -23,7 +23,7 @@ import org.springframework.web.servlet.view.AbstractView; import org.springframework.web.servlet.view.InternalResourceViewResolver; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.Locale; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/HeaderFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/HeaderFilter.java index d35a4220f14..e505a24bcd4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/HeaderFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/HeaderFilter.java @@ -16,13 +16,13 @@ package org.cloudfoundry.identity.uaa.web; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/HttpHeadersFilterRequestWrapper.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/HttpHeadersFilterRequestWrapper.java index d1ee13073fa..49837945214 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/HttpHeadersFilterRequestWrapper.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/HttpHeadersFilterRequestWrapper.java @@ -17,8 +17,8 @@ import org.cloudfoundry.identity.uaa.util.EmptyEnumerationOfString; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.util.Collections; import java.util.Enumeration; import java.util.List; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilter.java index ba810f11152..9d5dd5c76f4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilter.java @@ -11,10 +11,10 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.HashMap; @@ -28,7 +28,7 @@ import static java.util.Collections.emptySet; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; public class LimitedModeUaaFilter extends OncePerRequestFilter { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/NoOpFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/NoOpFilter.java index c1aa6e4b80b..ed27212e356 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/NoOpFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/NoOpFilter.java @@ -14,10 +14,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.springframework.web.filter.GenericFilterBean; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandler.java index 17e87a7f092..1f78beaf131 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandler.java @@ -20,8 +20,8 @@ import org.cloudfoundry.identity.uaa.util.UaaUrlUtils; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class UaaSavedRequestAwareAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { public static final String URI_OVERRIDE_ATTRIBUTE = "override.redirect_uri"; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCache.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCache.java index f66ec1b6d9f..c18df421f88 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCache.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCache.java @@ -27,16 +27,16 @@ import org.springframework.security.web.util.UrlUtils; import org.springframework.util.StringUtils; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java index 212380547d9..ee87f27c83e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java @@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; @@ -60,7 +60,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT; @RestController("identityZoneEndpoints") -@RequestMapping("/identity-zones") +@RequestMapping({"/identity-zones", "/identity-zones/"}) public class IdentityZoneEndpoints implements ApplicationEventPublisherAware { private static final SanitizedLogFactory.SanitizedLog logger = SanitizedLogFactory.getLog(IdentityZoneEndpoints.class); @@ -96,7 +96,7 @@ public void setApplicationEventPublisher(ApplicationEventPublisher applicationEv } - @RequestMapping(value = "{id}", method = GET) + @RequestMapping(value = {"{id}", "{id}/"}, method = GET) public IdentityZone getIdentityZone(@PathVariable String id) { List result = filterForCurrentZone(Collections.singletonList(zoneDao.retrieveIgnoreActiveFlag(id))); if (result.size() == 0) { @@ -244,7 +244,7 @@ private String getErrorMessages(Errors errors) { return String.join("\r\n", messages); } - @RequestMapping(value = "{id}", method = PUT) + @RequestMapping(value = {"{id}", "{id}/"}, method = PUT) public ResponseEntity updateIdentityZone( @RequestBody @Valid IdentityZone body, @PathVariable String id) { IdentityZone previous = IdentityZoneHolder.get(); @@ -319,7 +319,7 @@ protected void restoreSecretProperties(IdentityZone existingZone, IdentityZone n } } - @RequestMapping(value = "{id}", method = DELETE) + @RequestMapping(value = {"{id}", "{id}/"}, method = DELETE) @Transactional public ResponseEntity deleteIdentityZone(@PathVariable String id) { if (id == null) { @@ -355,7 +355,7 @@ public ResponseEntity deleteIdentityZone(@PathVariable String id) } } - @RequestMapping(method = POST, value = "{identityZoneId}/clients") + @RequestMapping(method = POST, value = {"{identityZoneId}/clients", "{identityZoneId}/clients/"}) public ResponseEntity createClient( @PathVariable String identityZoneId, @RequestBody UaaClientDetails clientDetails) { if (identityZoneId == null) { @@ -383,7 +383,7 @@ private ClientDetails removeSecret(ClientDetails createdClient) { return response; } - @RequestMapping(method = DELETE, value = "{identityZoneId}/clients/{clientId}") + @RequestMapping(method = DELETE, value = {"{identityZoneId}/clients/{clientId}", "{identityZoneId}/clients/{clientId}/"}) public ResponseEntity deleteClient( @PathVariable String identityZoneId, @PathVariable String clientId) { if (identityZoneId == null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java index 69e2302ed0e..adba270368b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java @@ -19,10 +19,10 @@ import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.HashSet; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java index 02d6ca7d093..2281dac8029 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java @@ -13,10 +13,10 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collection; import java.util.HashSet; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ServerRunning.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ServerRunning.java index 24eda341034..067114493be 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ServerRunning.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ServerRunning.java @@ -15,8 +15,8 @@ import org.cloudfoundry.identity.uaa.oauth.client.test.RestTemplateHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.cloudfoundry.identity.uaa.test.TestProfileEnvironment; import org.cloudfoundry.identity.uaa.test.UrlHelper; import org.junit.Assume; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java index d7c791a2f0b..10a8db956d3 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java @@ -31,7 +31,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import java.sql.Timestamp; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPointTests.java index e34e35319cc..651e580c349 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPointTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationEntryPointTests.java @@ -24,9 +24,9 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.InternalAuthenticationServiceException; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilterTest.java index cd57ad73df0..7005567e438 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/account/ResetPasswordAuthenticationFilterTest.java @@ -34,8 +34,8 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.util.StringUtils; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletResponse; import java.sql.Timestamp; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilterTest.java index 3f26efd228b..b932959e62f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilterTest.java @@ -39,7 +39,7 @@ import org.springframework.security.saml.SAMLProcessingFilter; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.FilterChain; +import jakarta.servlet.FilterChain; import java.util.Collections; import java.util.Map; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilterTests.java index 84cf4920154..a345471110b 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilterTests.java @@ -16,8 +16,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilterTest.java index eea56a82bc0..c00c5575cb8 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ClientParametersAuthenticationFilterTest.java @@ -22,7 +22,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.IOException; import static org.cloudfoundry.identity.uaa.oauth.token.TokenConstants.CLIENT_AUTH_NONE; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilterTest.java index 57e3c2fc29e..a02d14b110d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/CurrentUserCookieRequestFilterTest.java @@ -10,9 +10,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilterTests.java index e9251fb596f..3d1380810c6 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeRequiredFilterTests.java @@ -14,7 +14,7 @@ package org.cloudfoundry.identity.uaa.authentication; -import javax.servlet.FilterChain; +import jakarta.servlet.FilterChain; import java.util.HashSet; import org.cloudfoundry.identity.uaa.oauth.InteractionRequiredException; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilterTest.java index 5e98c6f7943..0075cbc8603 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/PasswordChangeUiRequiredFilterTest.java @@ -16,9 +16,9 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.savedrequest.SavedRequest; -import javax.servlet.FilterChain; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilterTests.java index fcc0b77dc2e..23d8be18a5f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilterTests.java @@ -21,8 +21,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletResponse; import static org.mockito.Mockito.*; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBindingTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBindingTest.java index 323f048ddc5..3d232d52d65 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBindingTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBindingTest.java @@ -11,8 +11,8 @@ import org.opensaml.ws.transport.http.HttpServletRequestAdapter; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilterTests.java index 5283eab30c5..9271998e2f0 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilterTests.java @@ -31,10 +31,10 @@ import org.springframework.security.web.DefaultRedirectStrategy; import org.springframework.util.ReflectionUtils; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilterTests.java index b93519ac0a6..dc8bb9429a3 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UTF8ConversionFilterTests.java @@ -18,8 +18,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsTest.java index ab331c72613..ed3ddb10094 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationDetailsTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationSerializationTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationSerializationTests.java index 2f6e0fcc5c8..87b5a64ea1a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationSerializationTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationSerializationTests.java @@ -23,8 +23,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationTestFactory.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationTestFactory.java index 82019d75874..c17c19e748d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationTestFactory.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaAuthenticationTestFactory.java @@ -16,9 +16,9 @@ import org.cloudfoundry.identity.uaa.user.UaaAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.validation.constraints.NotNull; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.validation.constraints.NotNull; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaClientAuthenticationProviderTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaClientAuthenticationProviderTest.java index 5a2fc7c62ea..1f124f46792 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaClientAuthenticationProviderTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/UaaClientAuthenticationProviderTest.java @@ -26,7 +26,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.cloudfoundry.identity.uaa.oauth.provider.ClientDetails; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandlerTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandlerTests.java index 6b3e16d87d5..ff7c7cc241a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandlerTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/ZoneAwareWhitelistLogoutHandlerTests.java @@ -28,7 +28,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.cloudfoundry.identity.uaa.provider.NoSuchClientException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/config/YamlBindingTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/config/YamlBindingTests.java index 4af95307750..80e7c7fb5c3 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/config/YamlBindingTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/config/YamlBindingTests.java @@ -25,11 +25,11 @@ import java.util.Locale; import java.util.Map; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; -import javax.validation.constraints.NotNull; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.config.YamlBindingTests.OAuthConfiguration.OAuthConfigurationValidator; import org.junit.Rule; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/db/DatabaseParametersTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/db/DatabaseParametersTests.java index c051c1df164..578b685bafc 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/db/DatabaseParametersTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/db/DatabaseParametersTests.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.db; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.hc.core5.net.URLEncodedUtils; +import org.apache.hc.core5.http.NameValuePair; import org.apache.tomcat.jdbc.pool.DataSource; import org.cloudfoundry.identity.uaa.annotations.WithDatabaseContext; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializerTest.java index 17562298057..2e60c21edf6 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializerTest.java @@ -27,7 +27,7 @@ import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.support.StandardServletEnvironment; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.io.PrintStream; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandlerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandlerTest.java index 6687f1a7ba3..16b1e55705f 100755 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandlerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/AccountSavingAuthenticationSuccessHandlerTest.java @@ -17,8 +17,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.net.URLEncoder; import java.util.Collection; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactoryTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactoryTest.java index 0d4565e3464..d0b8476017d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactoryTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/CurrentUserCookieFactoryTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailAccountCreationServiceTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailAccountCreationServiceTests.java index e4daed0dbd9..69e9d4b3b4c 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailAccountCreationServiceTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailAccountCreationServiceTests.java @@ -34,7 +34,7 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import java.sql.Timestamp; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailServiceTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailServiceTests.java index f488efaefd1..c1693abc774 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailServiceTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/EmailServiceTests.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import javax.mail.Message; -import javax.mail.internet.InternetAddress; +import jakarta.mail.Message; +import jakarta.mail.internet.InternetAddress; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java index 986cb508593..d6544c068e7 100755 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java @@ -47,8 +47,8 @@ import org.springframework.ui.Model; import org.springframework.web.HttpMediaTypeNotAcceptableException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpSession; import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.net.URL; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandlerTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandlerTests.java index 03179d9c9d2..5f7bf309c9f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandlerTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaAuthenticationFailureHandlerTests.java @@ -26,8 +26,8 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/util/FakeJavaMailSenderTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/util/FakeJavaMailSenderTest.java index 1ec3705da39..63fb5b67975 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/util/FakeJavaMailSenderTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/util/FakeJavaMailSenderTest.java @@ -17,7 +17,7 @@ import org.cloudfoundry.identity.uaa.message.util.FakeJavaMailSender; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java index ca7bb1b2f27..115cf20e0cb 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java @@ -15,8 +15,8 @@ import org.springframework.util.MultiValueMap; import javax.management.Notification; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilterTest.java index 0eba116b5b6..b31e3ea17b6 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/DisableIdTokenResponseTypeFilterTest.java @@ -20,8 +20,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java index 2c8e7dd64e5..5637053b0ab 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; -import org.springframework.dao.DeadlockLoserDataAccessException; +import org.springframework.dao.PessimisticLockingFailureException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -460,7 +460,7 @@ protected class ExpirationLoserPreparedStatement implements InvocationHandler { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (UPDATE_VAL.equals(method.getName())) { - throw new DeadlockLoserDataAccessException("Deadlock in update (emulated)", null); + throw new PessimisticLockingFailureException("Deadlock in update (emulated)", null); } return method.invoke(stmt, args); } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsTests.java index 44ab37b3c1f..809c2a27b45 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationDetailsTests.java @@ -23,8 +23,7 @@ public void testSerializationWithDetails() { request.setAttribute(OAuth2AuthenticationDetails.ACCESS_TOKEN_VALUE, "FOO"); request.setAttribute(OAuth2AuthenticationDetails.ACCESS_TOKEN_TYPE, "bearer"); OAuth2AuthenticationDetails holder = new OAuth2AuthenticationDetails(request); - OAuth2AuthenticationDetails other = (OAuth2AuthenticationDetails) SerializationUtils.deserialize(SerializationUtils - .serialize(holder)); + OAuth2AuthenticationDetails other = (OAuth2AuthenticationDetails) SerializationUtils.clone(holder); assertEquals(holder, other); assertEquals(holder.hashCode(), other.hashCode()); assertEquals(holder.toString(), other.toString()); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilterTests.java index 95e36c5c46b..6b6058fa2ab 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationProcessingFilterTests.java @@ -19,7 +19,7 @@ import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.FilterChain; +import jakarta.servlet.FilterChain; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java index 1b100e6f63a..0af1f4a4bb0 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java @@ -8,8 +8,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.web.RedirectStrategy; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/FrameworkEndpointHandlerMappingTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/FrameworkEndpointHandlerMappingTests.java index 0248dbc2abf..b4e36b5ab62 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/FrameworkEndpointHandlerMappingTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/FrameworkEndpointHandlerMappingTests.java @@ -4,7 +4,7 @@ import org.junit.Test; import org.springframework.web.bind.support.SessionStatus; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.security.Principal; import java.util.Collections; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandlerTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandlerTests.java index 419cd8a792d..ac33c09e282 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandlerTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AccessDeniedHandlerTests.java @@ -6,7 +6,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.access.AccessDeniedException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPointTests.java index 9508e56104e..f8270010cde 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPointTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/error/OAuth2AuthenticationEntryPointTests.java @@ -7,7 +7,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.authentication.BadCredentialsException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpointTests.java index 10b968a6eff..ce5b55ea608 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpointTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/UaaTokenEndpointTests.java @@ -8,7 +8,7 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.HttpRequestMethodNotSupportedException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Set; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilterTest.java index 955cc23c820..0d3dc4cb50a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationFilterTest.java @@ -12,12 +12,12 @@ import org.springframework.security.web.csrf.CsrfException; import org.springframework.web.HttpSessionRequiredException; -import javax.servlet.FilterChain; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.function.Consumer; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandlerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandlerTest.java index b35fb707bbb..20ab1fa9193 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandlerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSAMLAuthenticationFailureHandlerTest.java @@ -8,7 +8,7 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.savedrequest.DefaultSavedRequest; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlAuthenticationProviderTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlAuthenticationProviderTests.java index 2e0ae56e9eb..3269cf3d2f1 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlAuthenticationProviderTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlAuthenticationProviderTests.java @@ -93,7 +93,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletWebRequest; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import javax.xml.namespace.QName; import java.sql.SQLException; import java.util.ArrayList; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscoveryTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscoveryTest.java index 050033b89c9..c756f405872 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscoveryTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/LoginSamlDiscoveryTest.java @@ -2,11 +2,11 @@ import org.junit.jupiter.api.Test; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilterTest.java index 58d4b275f6a..c8590cfa97a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/RateLimitingFilterTest.java @@ -10,10 +10,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImplTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImplTest.java index f64ca528975..ea43651d647 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImplTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImplTest.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.ratelimiting.core.http; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.hamcrest.core.IsIterableContaining; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/RateLimiterStatusTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/RateLimiterStatusTest.java index 81271737be6..384fc76d13a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/RateLimiterStatusTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/RateLimiterStatusTest.java @@ -2,7 +2,7 @@ import java.time.Instant; import java.util.LinkedHashMap; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.cloudfoundry.identity.uaa.ratelimiting.core.CompoundKey; import org.cloudfoundry.identity.uaa.ratelimiting.core.LoggingOption; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserServiceTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserServiceTest.java index dbfe155533f..53ffd96e22f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserServiceTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserServiceTest.java @@ -17,8 +17,8 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.List; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandlerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandlerTest.java index 1e2a5710174..2f494224ab3 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandlerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/CsrfAwareEntryPointAndDeniedHandlerTest.java @@ -25,7 +25,7 @@ import org.springframework.security.web.WebAttributes; import org.springframework.security.web.csrf.MissingCsrfTokenException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import static org.junit.Assert.*; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilterTest.java index 80346a6f066..d9aee995808 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/ContentSecurityPolicyFilterTest.java @@ -6,8 +6,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java index 8c8face8473..0f31bf67012 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java @@ -25,8 +25,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java index 5227920565c..6f7d6484a6c 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessorTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessorTests.java index 7cd8c2cda70..028e740ae1c 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessorTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessorTests.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.security.web.SecurityFilterChain; -import javax.servlet.*; +import jakarta.servlet.*; import java.io.IOException; import java.util.HashMap; import java.util.LinkedList; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java index 8149b3f6ffb..b79d878e9a7 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java @@ -2,13 +2,13 @@ import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpsServer; -import org.apache.http.HttpException; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.conn.routing.HttpRoute; -import org.apache.http.conn.routing.HttpRoutePlanner; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.protocol.HttpContext; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.routing.HttpRoutePlanner; +import org.apache.hc.core5.http.protocol.HttpContext; import org.cloudfoundry.identity.uaa.test.network.NetworkTestUtils; import org.junit.*; import org.springframework.http.HttpHeaders; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java index 26312e0b908..92a392edb8b 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java @@ -15,7 +15,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/web/CookieBasedCsrfTokenRepositoryTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/web/CookieBasedCsrfTokenRepositoryTests.java index ceba7648a5f..d4cd9fecdad 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/web/CookieBasedCsrfTokenRepositoryTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/web/CookieBasedCsrfTokenRepositoryTests.java @@ -25,8 +25,8 @@ import org.cloudfoundry.identity.uaa.oauth.common.util.RandomValueStringGenerator; import org.springframework.security.web.csrf.CsrfToken; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import static org.cloudfoundry.identity.uaa.security.web.CookieBasedCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME; import static org.hamcrest.Matchers.nullValue; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/web/HeaderFilterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/web/HeaderFilterTest.java index ef127d16d5e..8abbfaf828d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/web/HeaderFilterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/web/HeaderFilterTest.java @@ -22,7 +22,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; +import jakarta.servlet.FilterChain; import static java.util.Collections.emptyList; import static org.junit.Assert.assertNotNull; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilterTests.java index 929864fa75e..3fde2ef8fbf 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/web/LimitedModeUaaFilterTests.java @@ -1,5 +1,5 @@ package org.cloudfoundry.identity.uaa.web; - +import jakarta.servlet.http.HttpServletResponse; import org.cloudfoundry.identity.uaa.util.JsonUtils; import org.cloudfoundry.identity.uaa.util.TimeService; import org.junit.jupiter.api.AfterEach; @@ -8,14 +8,14 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; +import jakarta.servlet.FilterChain; import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.concurrent.atomic.AtomicLong; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; import static org.cloudfoundry.identity.uaa.web.LimitedModeUaaFilter.STATUS_INTERVAL_MS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCacheTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCacheTests.java index 4b62d70a2c5..5c9e3702b1c 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCacheTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/web/UaaSavedRequestCacheTests.java @@ -28,11 +28,11 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.savedrequest.SavedRequest; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/web/beans/UaaSessionConfigTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/web/beans/UaaSessionConfigTest.java index 39f1313f052..c5e44fd3b4a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/web/beans/UaaSessionConfigTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/web/beans/UaaSessionConfigTest.java @@ -12,7 +12,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.session.web.http.CookieSerializer; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.List; import java.util.UUID; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java index 79cc0240062..fcdf60d591f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java @@ -10,11 +10,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/Log4jContextInitializer.java b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/Log4jContextInitializer.java index 99154ade9b9..d1c9733dee1 100644 --- a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/Log4jContextInitializer.java +++ b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/Log4jContextInitializer.java @@ -15,8 +15,8 @@ import org.slf4j.MDC; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; /** diff --git a/statsd/src/main/webapp/WEB-INF/web.xml b/statsd/src/main/webapp/WEB-INF/web.xml index d87be129b31..e63467c6a9d 100755 --- a/statsd/src/main/webapp/WEB-INF/web.xml +++ b/statsd/src/main/webapp/WEB-INF/web.xml @@ -3,8 +3,8 @@ you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. This product includes a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. --> - + org.cloudfoundry.identity.statsd.Log4jContextInitializer diff --git a/uaa/src/main/java/org/cloudfoundry/identity/uaa/TracingAutoConfiguration.java b/uaa/src/main/java/org/cloudfoundry/identity/uaa/TracingAutoConfiguration.java index dde28060079..b4bd9e1a755 100644 --- a/uaa/src/main/java/org/cloudfoundry/identity/uaa/TracingAutoConfiguration.java +++ b/uaa/src/main/java/org/cloudfoundry/identity/uaa/TracingAutoConfiguration.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/uaa/src/main/java/org/cloudfoundry/identity/uaa/UaaBootApplication.java b/uaa/src/main/java/org/cloudfoundry/identity/uaa/UaaBootApplication.java index 246ad3776d9..982b8a43f73 100644 --- a/uaa/src/main/java/org/cloudfoundry/identity/uaa/UaaBootApplication.java +++ b/uaa/src/main/java/org/cloudfoundry/identity/uaa/UaaBootApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +@Configuration @SpringBootApplication @EnableWebSecurity public class UaaBootApplication { diff --git a/uaa/src/main/webapp/WEB-INF/web.xml b/uaa/src/main/webapp/WEB-INF/web.xml index 8f0724dc22b..ef498d4d2e2 100755 --- a/uaa/src/main/webapp/WEB-INF/web.xml +++ b/uaa/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ - Oauth 2 / Open ID / Identity Server diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/UaaConfigurationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/UaaConfigurationTests.java index f8b2568f426..c1c7df5e34d 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/UaaConfigurationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/UaaConfigurationTests.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.cloudfoundry.identity.uaa.impl.config.UaaConfiguration; import org.cloudfoundry.identity.uaa.impl.config.YamlConfigurationValidator; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpointDocs.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpointDocs.java index ad37cc21cd9..3fdefc4e27e 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpointDocs.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpointDocs.java @@ -18,7 +18,7 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.net.URL; import java.util.Map; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java index 1c06b47c265..ef624222086 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.integration; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.oauth.client.resource.AuthorizationCodeResourceDetails; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java index 1da18e7e62c..bf8f4d4a4ff 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java @@ -11,21 +11,20 @@ * subcomponent's license, as noted in the LICENSE file. *******************************************************************************/ package org.cloudfoundry.identity.uaa.integration; - -import org.apache.http.Header; -import org.apache.http.HttpHeaders; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.cookie.Cookie; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicHeader; -import org.apache.http.util.EntityUtils; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpUriRequest; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.cookie.Cookie; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.io.entity.EntityUtils; +import org.apache.hc.core5.http.io.support.ClassicRequestBuilder; +import org.apache.hc.core5.http.message.BasicHeader; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.test.TestAccountSetup; @@ -65,7 +64,7 @@ public class FormLoginIntegrationTests { @Before public void createHttpClient() { httpclient = HttpClients.custom() - .setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build()) + .setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(StandardCookieSpec.RELAXED).build()) .setDefaultHeaders(headers) .setDefaultCookieStore(cookieStore) .build(); @@ -85,7 +84,7 @@ public void testUnauthenticatedRedirect() throws Exception { RequestConfig.custom().setRedirectsEnabled(false).build() ); CloseableHttpResponse response = httpclient.execute(httpget); - assertEquals(FOUND.value(), response.getStatusLine().getStatusCode()); + assertEquals(FOUND.value(), response.getCode()); location = response.getFirstHeader("Location").getValue(); response.close(); httpget.completed(); @@ -99,7 +98,7 @@ public void testSuccessfulAuthenticationFlow() throws Exception { HttpGet httpget = new HttpGet(location); CloseableHttpResponse response = httpclient.execute(httpget); - assertEquals(OK.value(), response.getStatusLine().getStatusCode()); + assertEquals(OK.value(), response.getCode()); String body = EntityUtils.toString(response.getEntity()); EntityUtils.consume(response.getEntity()); @@ -112,7 +111,7 @@ public void testSuccessfulAuthenticationFlow() throws Exception { String csrf = IntegrationTestUtils.extractCookieCsrf(body); - HttpUriRequest loginPost = RequestBuilder.post() + HttpUriRequest loginPost = ClassicRequestBuilder.post() .setUri(serverRunning.getBaseUrl() + "/login.do") .addParameter("username",testAccounts.getUserName()) .addParameter("password",testAccounts.getPassword()) @@ -120,7 +119,7 @@ public void testSuccessfulAuthenticationFlow() throws Exception { .build(); response = httpclient.execute(loginPost); - assertEquals(FOUND.value(), response.getStatusLine().getStatusCode()); + assertEquals(FOUND.value(), response.getCode()); location = response.getFirstHeader("Location").getValue(); response.close(); @@ -132,13 +131,13 @@ public void testSuccessfulAuthenticationFlow() throws Exception { .filter(cookie -> "JSESSIONID".equals(cookie.getName())) .findAny().orElse(null); assertNotNull(jsessionidCookie); - HttpUriRequest getRequestAfterLogin = RequestBuilder.get() + HttpUriRequest getRequestAfterLogin = ClassicRequestBuilder.get() .setUri(location) .addHeader("Cookie", "JSESSIONID=" + jsessionidCookie.getValue()) .build(); response = httpclient.execute(getRequestAfterLogin); - assertEquals(OK.value(), response.getStatusLine().getStatusCode()); + assertEquals(OK.value(), response.getCode()); body = EntityUtils.toString(response.getEntity()); response.close(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java index 8f5ab60203a..933abbca776 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.integration; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.security.web.CookieBasedCsrfTokenRepository; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java index 132fccb98fd..fdd3102f83c 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java @@ -1,7 +1,7 @@ package org.cloudfoundry.identity.uaa.integration; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.client.UaaClientDetails; import org.cloudfoundry.identity.uaa.integration.feature.DefaultIntegrationTestConfig; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java index 6d3a42ce373..19871762ca4 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java @@ -33,6 +33,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; @@ -425,7 +426,7 @@ public void testLoginServerCfInvalidClientPasswordToken() { } @SuppressWarnings("rawtypes") ResponseEntity response = serverRunning.postForMap(serverRunning.getAccessTokenUri(), params, headers); - HttpStatus statusCode = response.getStatusCode(); + HttpStatusCode statusCode = response.getStatusCode(); assertTrue("Status code should be 401 or 403.", statusCode==HttpStatus.FORBIDDEN || statusCode==HttpStatus.UNAUTHORIZED); } @@ -447,7 +448,7 @@ public void testLoginServerCfInvalidClientToken() { } @SuppressWarnings("rawtypes") ResponseEntity response = serverRunning.postForMap(serverRunning.getAccessTokenUri(), params, headers); - HttpStatus statusCode = response.getStatusCode(); + HttpStatusCode statusCode = response.getStatusCode(); assertTrue("Status code should be 401 or 403.", statusCode==HttpStatus.FORBIDDEN || statusCode==HttpStatus.UNAUTHORIZED); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java index 28cfc73893b..2a4c470a7d6 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.integration; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2RestTemplate; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java index bcc70030895..e5fa22ff996 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java @@ -142,7 +142,7 @@ protected static RestTemplate getRestTemplate() { template.setErrorHandler(new ResponseErrorHandler() { @Override public boolean hasError(ClientHttpResponse response) throws IOException { - return response.getRawStatusCode()>=500; + return response.getStatusCode().value()>=500; } @Override diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java index 0aadef06e29..d0521b1411b 100755 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.integration; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.oauth.client.resource.AuthorizationCodeResourceDetails; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java index 91d902d7118..0af52218740 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java @@ -25,6 +25,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; @@ -161,7 +162,7 @@ ResponseEntity authenticate(String username, String password, Map= 500; + return response.getStatusCode().value() >= 500; } @Override diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java index 8ed987c16b3..5e4d36391d0 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java @@ -13,8 +13,8 @@ package org.cloudfoundry.identity.uaa.integration.feature; import org.apache.commons.codec.binary.Base64; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.integration.util.IntegrationTestUtils; import org.cloudfoundry.identity.uaa.oauth.client.resource.ClientCredentialsResourceDetails; import org.cloudfoundry.identity.uaa.oauth.client.test.OAuth2ContextConfiguration; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java index e3a158aa6a3..31cee6053bf 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java @@ -4,11 +4,11 @@ import com.dumbster.smtp.SmtpMessage; import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.io.FileUtils; -import org.apache.http.client.CookieStore; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.cookie.CookieStore; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.cloudfoundry.identity.uaa.ServerRunning; import org.cloudfoundry.identity.uaa.account.UserAccountStatus; import org.cloudfoundry.identity.uaa.account.UserInfoResponse; @@ -55,6 +55,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; @@ -268,7 +269,7 @@ public static RegexMatcher matchesRegex(final String regex) { private static final DefaultResponseErrorHandler fiveHundredErrorHandler = new DefaultResponseErrorHandler() { @Override - protected boolean hasError(HttpStatus statusCode) { + protected boolean hasError(HttpStatusCode statusCode) { return statusCode.is5xxServerError(); } }; @@ -823,7 +824,7 @@ public static UaaClientDetails createOrUpdateClient(String adminToken, RestTemplate template = new RestTemplate(); template.setErrorHandler(new DefaultResponseErrorHandler() { @Override - protected boolean hasError(HttpStatus statusCode) { + protected boolean hasError(HttpStatusCode statusCode) { return statusCode.is5xxServerError(); } }); @@ -1239,7 +1240,7 @@ public static HttpHeaders getHeaders(CookieStore cookies) { headers.setAccept(Arrays.asList(MediaType.TEXT_HTML, MediaType.ALL)); - for (org.apache.http.cookie.Cookie cookie : cookies.getCookies()) { + for (org.apache.hc.client5.http.cookie.Cookie cookie : cookies.getCookies()) { headers.add("Cookie", cookie.getName() + "=" + cookie.getValue()); } return headers; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/BootstrapTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/BootstrapTests.java index d2468ae228b..279f89155fb 100755 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/BootstrapTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/BootstrapTests.java @@ -39,7 +39,7 @@ import org.springframework.web.context.support.AbstractRefreshableWebApplicationContext; import org.springframework.web.servlet.ViewResolver; -import javax.servlet.RequestDispatcher; +import jakarta.servlet.RequestDispatcher; import java.io.File; import java.util.Arrays; import java.util.EventListener; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeControllerMockMvcTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeControllerMockMvcTest.java index 3ab74906ed8..22e2b265d74 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeControllerMockMvcTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeControllerMockMvcTest.java @@ -30,8 +30,8 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.web.context.WebApplicationContext; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpSession; import java.util.Date; import java.util.stream.Stream; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java index a3243e18736..28a96ced716 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java @@ -74,8 +74,8 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpSession; import java.io.File; import java.net.URL; import java.net.URLDecoder; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/PasscodeMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/PasscodeMockMvcTests.java index 119d73c8997..1fcb53eb561 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/PasscodeMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/PasscodeMockMvcTests.java @@ -37,10 +37,10 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.filter.GenericFilterBean; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java index e12eb874cd8..bb441625a55 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java @@ -36,7 +36,7 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.web.context.WebApplicationContext; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.sql.Timestamp; import java.util.Collection; import java.util.List; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/clients/ClientAdminEndpointsMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/clients/ClientAdminEndpointsMockMvcTests.java index 24147fadc06..84fe15c1344 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/clients/ClientAdminEndpointsMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/clients/ClientAdminEndpointsMockMvcTests.java @@ -67,7 +67,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java index 32b75b31029..1b36bc74c2f 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java @@ -61,7 +61,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.File; import java.net.URL; import java.net.URLEncoder; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/RefreshTokenMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/RefreshTokenMockMvcTests.java index b9f3c13a103..dcc9fcaecc2 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/RefreshTokenMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/RefreshTokenMockMvcTests.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Lists; import org.apache.directory.api.util.Base64; -import org.apache.http.HttpStatus; +import org.apache.hc.core5.http.HttpStatus; import org.cloudfoundry.identity.uaa.constants.OriginKeys; import org.cloudfoundry.identity.uaa.oauth.TokenValidityResolver; import org.cloudfoundry.identity.uaa.oauth.openid.IdTokenCreator; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java index 518f69e2e56..80e0acbb6bb 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.cloudfoundry.identity.uaa.client.UaaClientDetails; import org.cloudfoundry.identity.uaa.oauth.common.OAuth2RefreshToken; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/DecodePathInfoPostProcessor.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/DecodePathInfoPostProcessor.java index f1956794031..74305dbc6b4 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/DecodePathInfoPostProcessor.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/DecodePathInfoPostProcessor.java @@ -1,6 +1,6 @@ package org.cloudfoundry.identity.uaa.mock.util; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ private String decodeRequestString(HttpServletRequest request, String source) { * falling back to {@code WebUtils.DEFAULT_CHARACTER_ENCODING} * @param request current HTTP request * @return the encoding for the request (never {@code null}) - * @see javax.servlet.ServletRequest#getCharacterEncoding() + * @see jakarta.servlet.ServletRequest#getCharacterEncoding() */ private String determineEncoding(HttpServletRequest request) { String enc = request.getCharacterEncoding(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java index 782d85bba3e..a8eea6efb24 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java @@ -98,9 +98,9 @@ import org.springframework.web.context.support.GenericWebApplicationContext; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.File; import java.net.URL; import java.util.Arrays; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/test/OAuth2ContextSetup.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/test/OAuth2ContextSetup.java index 146ce8778e0..9f5946e5958 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/test/OAuth2ContextSetup.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/test/OAuth2ContextSetup.java @@ -2,11 +2,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.config.RequestConfig.Builder; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.protocol.HttpContext; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.config.RequestConfig.Builder; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; +import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.core5.http.protocol.HttpContext; import org.cloudfoundry.identity.uaa.oauth.client.DefaultOAuth2ClientContext; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2ClientContext; import org.cloudfoundry.identity.uaa.oauth.client.OAuth2RestTemplate; @@ -344,7 +344,7 @@ protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) { protected RequestConfig getRequestConfig() { Builder builder = RequestConfig.custom() - .setCookieSpec(CookieSpecs.IGNORE_COOKIES) + .setCookieSpec(StandardCookieSpec.IGNORE) .setAuthenticationEnabled(false).setRedirectsEnabled(false); return builder.build(); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasMockMvcTests.java index 429a5d6426c..75614cb2570 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasMockMvcTests.java @@ -1289,11 +1289,11 @@ private MvcResult updateUserAndReturnResult( assertThat(userId).isNotBlank(); MockHttpServletRequestBuilder updateRequestBuilder; - switch (method) { - case PUT: + switch (method.name()) { + case "PUT": updateRequestBuilder = put("/Users/" + userId); break; - case PATCH: + case "PATCH": updateRequestBuilder = patch("/Users/" + userId); break; default: diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsMockMvcTests.java index eb5037a2006..4cf7427c9ef 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsMockMvcTests.java @@ -41,8 +41,8 @@ import java.util.UUID; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.hc.core5.net.URLEncodedUtils; +import org.apache.hc.core5.http.NameValuePair; import org.assertj.core.api.Assertions; import org.cloudfoundry.identity.uaa.DefaultTestContext; import org.cloudfoundry.identity.uaa.account.UserAccountStatus;