WIP SB 4.0.0

Author: bukajsytlos

build.gradle

@@ -145,6 +145,7 @@ dependencies {
   implementation("org.springframework.boot:spring-boot-starter-data-jpa")
   implementation("org.springframework.boot:spring-boot-starter-webmvc")
   implementation("org.springframework.boot:spring-boot-starter-jackson")
+  implementation("org.springframework.boot:spring-boot-jackson2")
   implementation("org.springframework.boot:spring-boot-starter-restclient")
   implementation("org.springframework.boot:spring-boot-starter-amqp")
   implementation("org.springframework.boot:spring-boot-starter-security")

src/inttest/java/com/faforever/api/AbstractIntegrationTest.java

@@ -11,6 +11,8 @@
 import com.faforever.commons.api.dto.ModerationReport;
 import com.faforever.commons.api.dto.Player;
 import com.faforever.commons.api.dto.Tutorial;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.jasminb.jsonapi.JSONAPIDocument;
 import com.github.jasminb.jsonapi.ResourceConverter;
 import com.github.jasminb.jsonapi.exceptions.DocumentSerializationException;
@@ -36,8 +38,6 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import tools.jackson.annotation.JsonInclude.Include;
-import tools.jackson.databind.ObjectMapper;
 
 import jakarta.transaction.Transactional;
 import java.time.format.DateTimeFormatter;

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

@@ -1,15 +1,15 @@
 package com.faforever.api.config.security;
 
 import com.faforever.api.security.method.CustomMethodSecurityExpressionHandler;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
 
 @Configuration
 @EnableMethodSecurity(securedEnabled = true)
-public class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
-  @Override
+public class MethodSecurityConfig {
+  @Bean
   protected MethodSecurityExpressionHandler createExpressionHandler() {
     return new CustomMethodSecurityExpressionHandler();
   }

src/main/java/com/faforever/api/error/ErrorJsonSerializer.java

@@ -22,8 +22,7 @@ public void serialize(Error error, JsonGenerator gen, SerializationContext ctxt)
     gen.writeStringProperty("requestId", MDC.get(RequestIdFilter.REQUEST_ID_KEY));
     gen.writeStringProperty("title", MessageFormat.format(errorCode.getTitle(), error.getArgs()));
     gen.writeStringProperty("detail", MessageFormat.format(errorCode.getDetail(), error.getArgs()));
-    gen.writeObjectPropertyStart("args", error.getArgs());
+    gen.writePOJOProperty("args", error.getArgs());
     gen.writeEndObject();
-
   }
 }

src/main/java/com/faforever/api/map/MapsController.java

@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
+import tools.jackson.core.JacksonException;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.ObjectMapper;
 
@@ -92,7 +93,7 @@ public void uploadMap(@RequestParam("file") MultipartFile file,
       try {
         JsonNode node = objectMapper.readTree(metadataJsonString);
         ranked = node.path("isRanked").asBoolean(false);
-      } catch (IOException e) {
+      } catch (JacksonException e) {
         log.debug("Could not parse metadata", e);
         throw ApiException.of(ErrorCode.INVALID_METADATA, e.getMessage());
       }

src/test/java/com/faforever/api/security/FafTokenServiceTest.java

@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Test;
 import tools.jackson.core.type.TypeReference;
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.datatype.jsr310.JavaTimeModule;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -77,7 +76,6 @@ public FafTokenServiceTest() throws Exception {
   @BeforeEach
   public void setUp() throws Exception {
     objectMapper = new ObjectMapper();
-    objectMapper.registerModule(new JavaTimeModule());
 
     FafApiProperties properties = new FafApiProperties();
     properties.getJwt().setSecretKeyPath(Paths.get("test-pki-private.key"));