File tree Expand file tree Collapse file tree 6 files changed +10
-63
lines changed
java/com/faforever/api/clan
java/com/faforever/api/config Expand file tree Collapse file tree 6 files changed +10
-63
lines changed Original file line number Diff line number Diff line change @@ -28,7 +28,6 @@ jar.enabled = false
2828
2929repositories {
3030 mavenCentral()
31- maven { url " https://jitpack.io" }
3231}
3332
3433compileJava. dependsOn(processResources)
@@ -171,14 +170,16 @@ dependencies {
171170 // Manually managed dependencies
172171 def elideVersion = " 7.1.15"
173172 def springdocVersion = " 2.8.13"
173+ def commonsVersion = " 20251112-0a26247"
174174 implementation(" com.yahoo.elide:elide-core:${ elideVersion} " )
175175 implementation(" com.yahoo.elide:elide-model-config:${ elideVersion} " )
176176 implementation(" com.yahoo.elide:elide-spring-boot-autoconfigure:${ elideVersion} " )
177177 implementation(" com.yahoo.elide:elide-swagger:${ elideVersion} " )
178178 implementation(" com.yahoo.elide:elide-datastore-jpa:${ elideVersion} " )
179179 implementation(" com.yahoo.elide:elide-datastore-multiplex:${ elideVersion} " )
180180 implementation(" org.springdoc:springdoc-openapi-starter-webmvc-ui:${ springdocVersion} " )
181- implementation(" com.github.FAForever:faf-java-commons:0e5d22ffff6e4dea81bac494d532627fcca8ebc4" )
181+ implementation(" com.faforever.commons:data:${ commonsVersion} " )
182+ implementation(" com.faforever.commons:api:${ commonsVersion} " )
182183 implementation(" org.kohsuke:github-api:1.330" )
183184 implementation(" org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r" )
184185 implementation(" org.jetbrains:annotations:26.0.2-1" )
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ public class ClanControllerTest extends AbstractIntegrationTest {
4545
4646 @ Test
4747 public void meDataWithoutClan () throws Exception {
48- Player player = playerRepository .getReferenceById (USERID_USER );
48+ Player player = playerRepository .findById (USERID_USER ). orElseThrow ( );
4949
5050 mockMvc .perform (get ("/clans/me" )
5151 .with (getOAuthTokenForUserId (USERID_USER )))
Original file line number Diff line number Diff line change @@ -103,8 +103,8 @@ faf-api:
103103 region : auto
104104 user-upload-bucket : user-uploads
105105
106- logging :
107- level :
108- org.hibernate.SQL : DEBUG
109- org.hibernate.engine.spi.EntityEntry : TRACE
110- org.springframework.security : DEBUG
106+ # logging:
107+ # level:
108+ # org.hibernate.SQL: DEBUG
109+ # org.hibernate.engine.spi.EntityEntry: TRACE
110+ # org.springframework.security: DEBUG
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 33import org .springframework .context .annotation .Configuration ;
44import org .springframework .core .Ordered ;
55import org .springframework .format .FormatterRegistry ;
6- import org .springframework .http .converter .HttpMessageConverters ;
76import org .springframework .web .servlet .config .annotation .CorsRegistry ;
87import org .springframework .web .servlet .config .annotation .EnableWebMvc ;
98import org .springframework .web .servlet .config .annotation .ResourceHandlerRegistry ;
@@ -33,11 +32,6 @@ public void addCorsMappings(CorsRegistry registry) {
3332 .allowedMethods ("*" );
3433 }
3534
36- @ Override
37- public void configureMessageConverters (HttpMessageConverters .ServerBuilder builder ) {
38- builder .addCustomConverter (new IgnoreOctetStreamToObjectHttpMessageConverter ());
39- }
40-
4135 @ Override
4236 public void addFormatters (FormatterRegistry registry ) {
4337 registry .addConverter (new NoopMultipartFileToStringConverter ());
Original file line number Diff line number Diff line change @@ -90,4 +90,4 @@ spring:
9090 issuer-uri : https://hydra.faforever.com/
9191logging :
9292 level :
93- com.faforever.api : info
93+ com.faforever.api : debug
You can’t perform that action at this time.
0 commit comments