try aot

Author: Sheikah45

Dockerfile

@@ -8,6 +8,7 @@ COPY test-account-activation.html /config/mail/account-activation.html
 COPY test-password-reset.html /config/mail/password-reset.html
 COPY test-welcome-to-faf.html /config/mail/welcome-to-faf.html
 ENV FAF_DOMAIN=faforever.com
+ENV CHALLONGE_KEY=test
 RUN java -Djarmode=tools -jar application.jar extract
 RUN java -Dspring.context.exit=onRefresh -Dspring.profiles.active=training -XX:ArchiveClassesAtExit=application.jsa -jar application/application.jar
 

build.gradle

@@ -12,6 +12,7 @@ buildscript {
 plugins {
   id "java"
   id "org.springframework.boot" version "3.3.1"
+  id "org.springframework.boot.aot" version "3.3.1"
   id "idea"
   id "com.adarshr.test-logger" version "4.0.0"
 }
@@ -31,7 +32,10 @@ repositories {
   maven { url "https://jitpack.io" }
 }
 
-compileJava.dependsOn(processResources)
+compileJava {
+  dependsOn(processResources)
+  options.compilerArgs.add("-parameters")
+}
 
 configurations {
   compile.exclude module: "assertj-core"
@@ -126,6 +130,11 @@ test {
   }
 }
 
+processAot {
+  environment("FAF_DOMAIN", "faforever.com")
+  environment("API_PROFILE", "")
+}
+
 ext {
 
 }

src/main/java/com/faforever/api/challonge/ChallongeController.java

@@ -2,12 +2,11 @@
 
 import com.faforever.api.config.FafApiProperties;
 import com.faforever.api.config.FafApiProperties.Challonge;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -22,7 +21,6 @@
 import org.springframework.web.util.DefaultUriBuilderFactory;
 import org.springframework.web.util.UriBuilder;
 
-import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -37,7 +35,6 @@
  * only loaded if a Challonge API key is specified.</p>
  */
 @RestController
-@Scope(proxyMode = ScopedProxyMode.TARGET_CLASS)
 @RequestMapping(path = ChallongeController.CHALLONGE_ROUTE)
 @ConditionalOnProperty("faf-api.challonge.key")
 public class ChallongeController {

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

@@ -1,24 +1,15 @@
 package com.faforever.api.config;
 
 import com.faforever.api.i18n.RepositoryMessageSource;
-import org.springframework.context.HierarchicalMessageSource;
-import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.MessageSourceAccessor;
 
-import jakarta.inject.Inject;
-
 @Configuration
 public class LocalizationConfig {
 
   @Bean
-  public MessageSourceAccessor messageSourceAccessor(MessageSource messageSource) {
+  public MessageSourceAccessor messageSourceAccessor(RepositoryMessageSource messageSource) {
     return new MessageSourceAccessor(messageSource);
   }
-
-  @Inject
-  public void configureMessageSource(HierarchicalMessageSource messageSource, RepositoryMessageSource repositoryMessageSource) {
-    messageSource.setParentMessageSource(repositoryMessageSource);
-  }
 }

src/main/java/com/faforever/api/config/elide/ElideConfig.java

@@ -18,6 +18,7 @@
 import com.yahoo.elide.jsonapi.JsonApiSettings;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,8 +36,8 @@ public class ElideConfig {
 
   @Bean
   MultiplexManager multiplexDataStore(
-    DataStore fafDataStore,
-    DataStore leagueDataStore
+    @Qualifier("fafDataStore") DataStore fafDataStore,
+    @Qualifier("leagueDataStore")DataStore leagueDataStore
   ) {
     return new MultiplexManager(fafDataStore, leagueDataStore);
   }

src/main/resources/config/application-local.yml

@@ -71,7 +71,7 @@ spring:
   rabbitmq:
     host: ${RABBIT_HOST:127.0.0.1}
     port: ${RABBIT_PORT:5672}
-    username: ${RABBIT_USERNAME:faf-java-api}
+    username: ${RABBIT_USERNAME:faf-api}
     password: ${RABBIT_PASSWORD:banana}
     virtual-host: ${RABBIT_VHOST:/faf-core}
   jpa:
@@ -80,8 +80,8 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: https://hydra.faforever.com/.well-known/jwks.json
-          issuer-uri: https://hydra.faforever.com/
+          jwk-set-uri: http://localhost:4444/.well-known/jwks.json
+          issuer-uri: http://ory-hydra:4444/
 logging:
   level:
-    com.faforever.api: debug
+    com.faforever.api: debug

src/main/resources/config/application.yml

@@ -148,6 +148,8 @@ spring:
       resourceserver:
         jwt:
           issuer-uri: ${JWT_FAF_HYDRA_ISSUER:https://hydra.${FAF_DOMAIN}/}
+  aot:
+    enabled: true
 
 server:
   # Mind that this is configured in the docker compose file as well (that is, in the gradle script that generates it)