Update commons version to handle unranked by host

FAForever · Jan 17, 2022 · 43abd60 · 43abd60
1 parent 8f34cac
commit 43abd60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -48,8 +48,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
     implementation 'com.github.jasminb:jsonapi-converter:0.11'
-    implementation 'com.github.FAForever.faf-java-commons:faf-commons-data:71ca15c33ce0f028887af6cc1659a87038f7daa9'
-    implementation 'com.github.FAForever.faf-java-commons:faf-commons-api:71ca15c33ce0f028887af6cc1659a87038f7daa9'
+    implementation 'com.github.FAForever.faf-java-commons:faf-commons-data:b57165999d0d5eebb389768ed193c8515403837d'
+    implementation 'com.github.FAForever.faf-java-commons:faf-commons-api:b57165999d0d5eebb389768ed193c8515403837d'
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
     implementation 'com.github.rutledgepaulv:q-builders:1.6'
     implementation 'com.google.guava:guava:30.1-jre'

diff --git a/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java b/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java
@@ -1,6 +1,7 @@
 package com.faforever.moderatorclient.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.jasminb.jsonapi.ResourceConverter;
 import com.github.jasminb.jsonapi.annotations.Type;
@@ -21,13 +22,15 @@ public class JsonApiConfig {
 
     @Bean(name = "defaultResourceConverter")
     public ResourceConverter defaultResourceConverter(ObjectMapper objectMapper) {
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
         return new ResourceConverter(objectMapper, findJsonApiTypes("com.faforever.moderatorclient.api.dto.get", "com.faforever.commons.api.dto", "com.faforever.moderatorclient.common"));
     }
 
     @Bean(name = "updateResourceConverter")
     public ResourceConverter updateResourceConverter(ObjectMapper objectMapper) {
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
         return new ResourceConverter(objectMapper, findJsonApiTypes("com.faforever.moderatorclient.api.dto.update"));
     }