From 9c104add5faca8054f01ff636e85840cba911801 Mon Sep 17 00:00:00 2001 From: Brutus5000 Date: Mon, 16 Nov 2026 22:11:53 +0100 Subject: [PATCH 1/2] Adapt ElideConfig to Elide 7.2.0 Elide 7.2.0 switched JsonApiMapper to Jackson 3 and takes an ElideMapper instead of an ObjectMapper, which broke compilation. Inject the JsonApiMapper bean provided by the Elide autoconfiguration instead of building one. Co-Authored-By: Claude Sonnet 5.5 --- .../java/com/faforever/api/config/elide/ElideConfig.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/faforever/api/config/elide/ElideConfig.java b/src/main/java/com/faforever/api/config/elide/ElideConfig.java index 9e09d4426..4b5835fcf 100644 --- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java +++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java @@ -1,7 +1,6 @@ package com.faforever.api.config.elide; import com.faforever.api.security.ExtendedAuditLogger; -import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.elide.Elide; import com.yahoo.elide.ElideSettings; import com.yahoo.elide.core.TransactionRegistry; @@ -43,7 +42,7 @@ MultiplexManager multiplexDataStore( } @Bean - public Elide elide(DataStore multiplexDataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger, + public Elide elide(DataStore multiplexDataStore, JsonApiMapper jsonApiMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger, ElideConfigProperties elideConfigProperties) { RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation(), true); @@ -52,7 +51,7 @@ public Elide elide(DataStore multiplexDataStore, ObjectMapper objectMapper, Enti final ElideSettings elideSettings = ElideSettings.builder() .dataStore(multiplexDataStore) .settings(JsonApiSettings.JsonApiSettingsBuilder.withDefaults(entityDictionary) - .jsonApiMapper(new JsonApiMapper(objectMapper)) + .jsonApiMapper(jsonApiMapper) .joinFilterDialect(rsqlFilterDialect) .subqueryFilterDialect(rsqlFilterDialect) ) From 15535f5389199c7158c3f283b12d34fc6edd0b87 Mon Sep 17 00:00:00 2001 From: Brutus5000 Date: Mon, 16 Nov 2026 22:18:12 +0100 Subject: [PATCH 2/2] Build ElideMapper from the Jackson 3 ObjectMapper ElideAutoConfiguration is excluded in FafApiApplication, so no ElideMapper or JsonApiMapper bean exists. Construct them from the Spring Boot Jackson 3 ObjectMapper instead. Co-Authored-By: Claude Sonnet 5.5 --- .../java/com/faforever/api/config/elide/ElideConfig.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/faforever/api/config/elide/ElideConfig.java b/src/main/java/com/faforever/api/config/elide/ElideConfig.java index 4b5835fcf..75ca1a3ef 100644 --- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java +++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java @@ -2,6 +2,7 @@ import com.faforever.api.security.ExtendedAuditLogger; import com.yahoo.elide.Elide; +import com.yahoo.elide.ElideMapper; import com.yahoo.elide.ElideSettings; import com.yahoo.elide.core.TransactionRegistry; import com.yahoo.elide.core.datastore.DataStore; @@ -21,6 +22,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import tools.jackson.databind.ObjectMapper; import java.time.Duration; import java.time.Instant; @@ -42,7 +44,7 @@ MultiplexManager multiplexDataStore( } @Bean - public Elide elide(DataStore multiplexDataStore, JsonApiMapper jsonApiMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger, + public Elide elide(DataStore multiplexDataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger, ElideConfigProperties elideConfigProperties) { RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation(), true); @@ -51,7 +53,7 @@ public Elide elide(DataStore multiplexDataStore, JsonApiMapper jsonApiMapper, En final ElideSettings elideSettings = ElideSettings.builder() .dataStore(multiplexDataStore) .settings(JsonApiSettings.JsonApiSettingsBuilder.withDefaults(entityDictionary) - .jsonApiMapper(jsonApiMapper) + .jsonApiMapper(new JsonApiMapper(new ElideMapper(objectMapper))) .joinFilterDialect(rsqlFilterDialect) .subqueryFilterDialect(rsqlFilterDialect) )