Migrate to Spring Boot 2.2.0

Author: Brutus5000

gradle.properties

@@ -1,5 +1,5 @@
 profile=dev
-springBootVersion=2.0.9.RELEASE
+springBootVersion=2.2.0.RELEASE
 javaxInjectVersion=1
 elideVersion=4.5.4
 mysqlConnectorVersion=6.0.6
@@ -8,11 +8,11 @@ swaggerVersion=2.9.2
 swaggerCoreVersion=1.5.21
 coverallsGradlePluginVersion=2.4.0
 springSecurityJwtVersion=1.0.10.RELEASE
-springSecurityOauth2AutoConfigureVersion=2.0.9.RELEASE
+springSecurityOauth2AutoConfigureVersion=2.2.0.RELEASE
 springSecurityOauth2Version=2.3.6.RELEASE
 guavaVersion=28.0-jre
 jetbrainsAnnotationsVersion=13.0
-springBootAdminClientVersion=2.0.6
+springBootAdminClientVersion=2.1.6
 luajVersion=3.0.1
 nocatchVersion=1.1
 junitAddonsVersion=1.4

src/main/java/com/faforever/api/config/MvcConfig.java

@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -36,4 +37,10 @@ public void configureContentNegotiation(final ContentNegotiationConfigurer confi
     // Turn off suffix-based content negotiation
     configurer.favorPathExtension(false);
   }
+
+  @Override
+  public void addCorsMappings(CorsRegistry registry) {
+    registry.addMapping("/**")
+      .allowedMethods("*");
+  }
 }

src/main/java/com/faforever/api/config/security/WebSecurityConfig.java

@@ -22,8 +22,6 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -92,17 +90,6 @@ public boolean matches(HttpServletRequest request) {
     // @formatter:on
   }
 
-  @Bean
-  public WebMvcConfigurer corsConfigurer() {
-    return new WebMvcConfigurer() {
-      @Override
-      public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-          .allowedMethods("*");
-      }
-    };
-  }
-
   @Bean
   public AuthenticationFailureHandler authenticationFailureHandler() {
     ImmutableMap<Object, String> exceptionMappings = ImmutableMap.<Object, String>builder()

src/main/java/com/faforever/api/leaderboard/LeaderboardService.java

@@ -45,7 +45,7 @@ public Ladder1v1LeaderboardEntry getLadder1v1Entry(int playerId) {
 
   @NotNull
   private Pageable getPageable(@Nullable Integer page, @Nullable Integer pageSize) {
-    return new PageRequest(
+    return PageRequest.of(
       Optional.ofNullable(page).map(p -> p - 1).orElse(0),
       Optional.ofNullable(pageSize).orElse(MAX_RESULTS)
     );

src/main/java/com/faforever/api/mautic/MauticService.java

@@ -54,7 +54,7 @@ public MauticService(MappingJackson2HttpMessageConverter mauticApiMessageConvert
 //    restOperations = restTemplateBuilder.configure(new OAuth2RestTemplate(details));
 
     // TODO for now, client ID needs to be a username and client secret the user's password.
-    RestTemplateBuilder builder = restTemplateBuilder.basicAuthorization(mauticProperties.getClientId(), mauticProperties.getClientSecret());
+    RestTemplateBuilder builder = restTemplateBuilder.basicAuthentication(mauticProperties.getClientId(), mauticProperties.getClientSecret());
 
     restOperations = builder.build();
   }

src/test/java/com/faforever/api/config/TestWebSecurityConfig.java

@@ -1,8 +1,10 @@
 package com.faforever.api.config;
 
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
+@Order(1)
 public class TestWebSecurityConfig extends WebSecurityConfigurerAdapter {
 
   @Override

src/test/java/com/faforever/api/deployment/ExeUploaderControllerTest.java

@@ -10,6 +10,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -28,6 +29,8 @@ public class ExeUploaderControllerTest {
   public static final String API_KEY = "banana";
   private MockMvc mvc;
   @MockBean
+  private UserDetailsService userDetailsService;
+  @MockBean
   private ExeUploaderService exeUploaderService;
   @MockBean
   private FafApiProperties fafApiProperties;

src/test/java/com/faforever/api/leaderboard/LeaderboardServiceTest.java

@@ -35,22 +35,22 @@ public void setUp() throws Exception {
   @Test
   public void getLadder1v1Leaderboard() throws Exception {
     Page<Ladder1v1LeaderboardEntry> leaderboard = new PageImpl<>(Collections.emptyList());
-    when(ladder1v1LeaderboardRepository.getLeaderboardByPage(new PageRequest(0, 100))).thenReturn(leaderboard);
+    when(ladder1v1LeaderboardRepository.getLeaderboardByPage(PageRequest.of(0, 100))).thenReturn(leaderboard);
 
     List<Ladder1v1LeaderboardEntry> result = instance.getLadder1v1Leaderboard(1, 100).getContent();
 
     assertThat(result, is(leaderboard.getContent()));
-    verify(ladder1v1LeaderboardRepository).getLeaderboardByPage(new PageRequest(0,100));
+    verify(ladder1v1LeaderboardRepository).getLeaderboardByPage(PageRequest.of(0, 100));
   }
 
   @Test
   public void getGlobalLeaderboard() throws Exception {
     Page<GlobalLeaderboardEntry> leaderboard = new PageImpl<>(Collections.emptyList());
-    when(globalLeaderboardRepository.getLeaderboardByPage(new PageRequest(0, 100))).thenReturn(leaderboard);
+    when(globalLeaderboardRepository.getLeaderboardByPage(PageRequest.of(0, 100))).thenReturn(leaderboard);
 
     List<GlobalLeaderboardEntry> result = instance.getGlobalLeaderboard(1, 100).getContent();
 
     assertThat(result, is(leaderboard.getContent()));
-    verify(globalLeaderboardRepository).getLeaderboardByPage(new PageRequest(0,100));
+    verify(globalLeaderboardRepository).getLeaderboardByPage(PageRequest.of(0, 100));
   }
 }

src/test/java/com/faforever/api/map/MapsControllerTest.java

@@ -11,8 +11,8 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -34,6 +34,8 @@ public class MapsControllerTest {
 
   private MockMvc mvc;
   @MockBean
+  private UserDetailsService userDetailsService;
+  @MockBean
   private MapService mapService;
   @MockBean
   private FafApiProperties fafApiProperties;
@@ -52,7 +54,6 @@ void fileMissing() throws Exception {
     this.mvc.perform(multipart("/maps/upload"))
       .andExpect(status().isBadRequest())
       .andExpect(jsonPath("$.errors", hasSize(1)))
-      .andExpect(jsonPath("$.errors[0].status", is(HttpStatus.BAD_REQUEST.toString())))
       .andExpect(jsonPath("$.errors[0].title", is("org.springframework.web.multipart.support.MissingServletRequestPartException")))
       .andExpect(jsonPath("$.errors[0].detail", is("Required request part 'file' is not present")));
   }
@@ -65,7 +66,6 @@ void jsonMetaDataMissing() throws Exception {
       .file(file))
       .andExpect(status().isBadRequest())
       .andExpect(jsonPath("$.errors", hasSize(1)))
-      .andExpect(jsonPath("$.errors[0].status", is(HttpStatus.BAD_REQUEST.toString())))
       .andExpect(jsonPath("$.errors[0].title", is("org.springframework.web.bind.MissingServletRequestParameterException")))
       .andExpect(jsonPath("$.errors[0].detail", is("Required String parameter 'metadata' is not present")));
   }

src/test/java/com/faforever/api/mautic/MauticServiceTest.java

@@ -41,7 +41,7 @@ public void setUp() {
     when(restTemplateBuilder.additionalMessageConverters(messageConverter)).thenReturn(restTemplateBuilder);
     when(restTemplateBuilder.errorHandler(mauticApiErrorHandler)).thenReturn(restTemplateBuilder);
     when(restTemplateBuilder.rootUri(any())).thenReturn(restTemplateBuilder);
-    when(restTemplateBuilder.basicAuthorization(any(), any())).thenReturn(restTemplateBuilder);
+    when(restTemplateBuilder.basicAuthentication(any(), any())).thenReturn(restTemplateBuilder);
 
     instance = new MauticService(messageConverter, mauticApiErrorHandler, new FafApiProperties(), restTemplateBuilder);
   }