SONAR-26738 Upgrade Spring Framework to version 7.0.2

Author: matteo-mara-sonarsource

build.gradle

@@ -516,14 +516,10 @@ subprojects {
       dependency 'org.spdx:java-spdx-library:2.0.2'
       dependency 'org.spdx:spdx-v3jsonld-store:1.0.1'
       dependency 'org.spdx:spdx-jackson-store:2.0.3'
-      dependencySet(group: 'org.springframework', version: '6.2.12') {
+      dependencySet(group: 'org.springframework', version: '7.0.2') {
         entry 'spring-test'
-        entry('spring-context') {
-          exclude 'commons-logging:commons-logging'
-        }
-        entry('spring-webmvc') {
-          exclude 'commons-logging:commons-logging'
-        }
+        entry 'spring-context'
+        entry 'spring-webmvc'
       }
       dependency "org.springframework.security:spring-security-saml2-service-provider:${springSecurityVersion}"
       dependency 'org.mybatis:mybatis:3.5.19'

server/sonar-spring/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+  id 'java-test-fixtures'
+}
+
 description = 'SonarQube Spring shared configuration and utilities'
 
 sonar {

server/sonar-spring/src/main/java/org/sonar/server/v2/config/CommonWebConfig.java

@@ -40,7 +40,7 @@ public class CommonWebConfig implements WebMvcConfigurer {
   public void configurePathMatch(PathMatchConfigurer configurer) {
     UrlPathHelper urlPathHelper = new UrlPathHelper();
     urlPathHelper.setUrlDecode(false);
-    configurer.setUrlPathHelper(urlPathHelper).setUseTrailingSlashMatch(true);
+    configurer.setUrlPathHelper(urlPathHelper);
   }
 
   @Override

server/sonar-spring/src/testFixtures/java/org/sonar/server/v2/api/ControllerTester.java

@@ -19,14 +19,22 @@
  */
 package org.sonar.server.v2.api;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Validation;
 import jakarta.validation.ValidatorFactory;
+import java.io.IOException;
 import java.util.List;
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
+import org.jspecify.annotations.NonNull;
 import org.sonar.server.v2.common.RestResponseEntityExceptionHandler;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.filter.UrlHandlerFilter;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
@@ -45,7 +53,7 @@ public static MockMvc getMockMvcWithHandlerInterceptors(List<HandlerInterceptor>
       .setValidator(new SpringValidatorAdapter(validatorFactory.getValidator()))
       .setCustomHandlerMapping(() -> resolveRequestMappingHandlerMapping(handlerInterceptors))
       .setControllerAdvice(new RestResponseEntityExceptionHandler())
-      .setUseTrailingSlashPatternMatch(true)
+      .addFilter(new TrailingSlashHandlerFilter())
       .build();
   }
 
@@ -54,6 +62,21 @@ private static RequestMappingHandlerMapping resolveRequestMappingHandlerMapping(
     handlerMapping.setInterceptors(handlerInterceptors != null ? handlerInterceptors.toArray() : new Object[0]);
     return handlerMapping;
   }
+
+  /**
+   * Replace deprecated {@link org.springframework.test.web.servlet.setup.StandaloneMockMvcBuilder#setUseTrailingShashPatternMatch()}
+   */
+  private static class TrailingSlashHandlerFilter extends OncePerRequestFilter {
+    @Override
+
+    protected void doFilterInternal(
+      @NonNull HttpServletRequest request,
+      @NonNull HttpServletResponse response,
+      @NonNull FilterChain filterChain) throws ServletException, IOException {
+      UrlHandlerFilter filter = UrlHandlerFilter.trailingSlashHandler("/**").wrapRequest().build();
+      filter.doFilter(request, response, filterChain);
+    }
+  }
 }
 
 

server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/group/controller/GroupController.java

@@ -64,7 +64,7 @@ public interface GroupController {
     """)
   GroupsSearchRestResponse search(
     @Valid @ParameterObject GroupsSearchRestRequest groupsSearchRestRequest,
-    @RequestParam(name = "userId!") @Nullable @Schema(description = "Find groups without this user. Only available for system administrators.",
+    @RequestParam(name = "userId!", required = false) @Nullable @Schema(description = "Find groups without this user. Only available for system administrators.",
       extensions = @Extension(properties = {@ExtensionProperty(name = "internal", value = "true")}), hidden = true) String excludedUserId,
     @Valid @ParameterObject RestPage restPage);
 

server/sonar-webserver/src/main/java/org/sonar/server/platform/PlatformImpl.java

@@ -43,7 +43,11 @@
 import org.sonar.server.platform.platformlevel.PlatformLevelStartup;
 import org.sonar.server.platform.web.ApiV2Servlet;
 
+import static jakarta.servlet.DispatcherType.ASYNC;
+import static jakarta.servlet.DispatcherType.ERROR;
+import static jakarta.servlet.DispatcherType.REQUEST;
 import static org.sonar.process.ProcessId.WEB_SERVER;
+import static org.springframework.web.filter.UrlHandlerFilter.trailingSlashHandler;
 
 /**
  * @since 2.2
@@ -136,6 +140,19 @@ private void registerSpringMvcServlet() {
     ServletRegistration.Dynamic app = this.servletContext.addServlet("app", servlet);
     app.addMapping("/api/v2/*");
     app.setLoadOnStartup(1);
+    registerTrailingSlashFilter();
+  }
+
+  private void registerTrailingSlashFilter() {
+    var filter = trailingSlashHandler("/api/v2/**")
+      .wrapRequest()
+      .build();
+    var filterRegistration = this.servletContext.addFilter("trailingSlashFilter", filter);
+    filterRegistration.addMappingForUrlPatterns(
+      java.util.EnumSet.of(REQUEST, ERROR, ASYNC),
+      false,
+      "/api/v2/*"
+    );
   }
 
   private AutoStarter createAutoStarter() {