Skip to content

Commit 53176ec

Browse files
committed
fix xbox not found handling, spotless
1 parent 36b17bf commit 53176ec

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

common/src/main/java/tools/simrail/backend/common/cache/DataCacheMetricProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final class DataCacheMetricProcessor implements ApplicationListener<ApplicationR
4141
private final MeterRegistry meterRegistry;
4242

4343
@Autowired
44-
public DataCacheMetricProcessor(@NonNull MeterRegistry meterRegistry) {
44+
DataCacheMetricProcessor(@NonNull MeterRegistry meterRegistry) {
4545
this.meterRegistry = meterRegistry;
4646
}
4747

external-api-client/src/test/java/tools/simrail/backend/external/playerdb/PlayerDBApiClientTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ void testInvalidSteamId() {
8383
void testInvalidXBoxId() {
8484
var client = PlayerDbApiClient.create(TEST_USER_AGENT);
8585
var response = Assertions.assertDoesNotThrow(() -> client.getXboxPlayer("2535467890123456"));
86-
Assertions.assertEquals(PlayerDbResponseWrapper.RESPONSE_CODE_XBOX_BAD_RESPONSE_CODE, response.getCode());
86+
Assertions.assertEquals(PlayerDbResponseWrapper.RESPONSE_CODE_XBOX_NOT_FOUND, response.getCode());
8787
Assertions.assertNotNull(response.getData());
8888
Assertions.assertNull(response.getData().player());
89-
Assertions.assertEquals(400, response.getData().status());
9089
}
9190
}

rest-api/src/main/java/tools/simrail/backend/api/user/loader/XBoxUserCacheLoader.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
package tools.simrail.backend.api.user.loader;
2626

27-
import java.util.Objects;
2827
import java.util.Optional;
2928
import java.util.regex.Pattern;
3029
import org.jspecify.annotations.NonNull;
3130
import org.springframework.beans.factory.annotation.Autowired;
32-
import org.springframework.http.HttpStatus;
3331
import org.springframework.stereotype.Component;
3432
import org.springframework.util.StringUtils;
3533
import tools.simrail.backend.api.shared.UserPlatform;
@@ -78,8 +76,7 @@ final class XBoxUserCacheLoader implements UserCacheLoader {
7876
var responseCode = response.getCode();
7977
if (!responseCode.equals(PlayerDbResponseWrapper.RESPONSE_CODE_SUCCESS)) {
8078
// we already validated the id, so the only reason to get an "invalid id" response is that the user does not exist
81-
var doesNotExist = responseCode.equals(PlayerDbResponseWrapper.RESPONSE_CODE_XBOX_BAD_RESPONSE_CODE)
82-
&& Objects.equals(response.getData().status(), HttpStatus.BAD_REQUEST.value());
79+
var doesNotExist = responseCode.equals(PlayerDbResponseWrapper.RESPONSE_CODE_XBOX_NOT_FOUND);
8380
if (doesNotExist) {
8481
return Optional.empty();
8582
}

0 commit comments

Comments
 (0)