Skip to content

Commit 8bd1a41

Browse files
Automatically update Java SDK
1 parent ab4bb82 commit 8bd1a41

29 files changed

+898
-777
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- General project information -->
99
<groupId>so.trophy</groupId>
1010
<artifactId>trophy-java</artifactId>
11-
<version>1.0.38</version>
11+
<version>1.0.40-beta.5</version>
1212
<packaging>jar</packaging>
1313
<name>Trophy</name>
1414
<description>Java client library for the Trophy API</description>

src/main/java/so/trophy/core/ClientOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private ClientOptions(Environment environment, Map<String, String> headers,
3030
this.environment = environment;
3131
this.headers = new HashMap<>();
3232
this.headers.putAll(headers);
33-
this.headers.putAll(new HashMap<String,String>() {{put("X-Fern-Language", "JAVA");put("X-Fern-SDK-Name", "com.trophy.fern:api-sdk");put("X-Fern-SDK-Version", "0.0.2504");}});
33+
this.headers.putAll(new HashMap<String,String>() {{put("X-Fern-Language", "JAVA");put("X-Fern-SDK-Name", "com.trophy.fern:api-sdk");put("X-Fern-SDK-Version", "0.0.2590");}});
3434
this.headerSuppliers = headerSuppliers;
3535
this.httpClient = httpClient;
3636
this.timeout = timeout;

src/main/java/so/trophy/resources/admin/streaks/requests/RestoreStreaksRequest.java

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,29 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.Objects;
24+
import so.trophy.resources.admin.streaks.types.RestoreStreaksRequestUsersItem;
2425

2526
@JsonInclude(JsonInclude.Include.NON_ABSENT)
2627
@JsonDeserialize(
2728
builder = RestoreStreaksRequest.Builder.class
2829
)
2930
public final class RestoreStreaksRequest {
30-
private final List<String> userIds;
31+
private final List<RestoreStreaksRequestUsersItem> users;
3132

3233
private final Map<String, Object> additionalProperties;
3334

34-
private RestoreStreaksRequest(List<String> userIds, Map<String, Object> additionalProperties) {
35-
this.userIds = userIds;
35+
private RestoreStreaksRequest(List<RestoreStreaksRequestUsersItem> users,
36+
Map<String, Object> additionalProperties) {
37+
this.users = users;
3638
this.additionalProperties = additionalProperties;
3739
}
3840

3941
/**
40-
* @return Array of user IDs to restore streaks for. Maximum 100 users per request.
42+
* @return Array of users to restore streaks for. Maximum 100 users per request.
4143
*/
42-
@JsonProperty("userIds")
43-
public List<String> getUserIds() {
44-
return userIds;
44+
@JsonProperty("users")
45+
public List<RestoreStreaksRequestUsersItem> getUsers() {
46+
return users;
4547
}
4648

4749
@java.lang.Override
@@ -56,12 +58,12 @@ public Map<String, Object> getAdditionalProperties() {
5658
}
5759

5860
private boolean equalTo(RestoreStreaksRequest other) {
59-
return userIds.equals(other.userIds);
61+
return users.equals(other.users);
6062
}
6163

6264
@java.lang.Override
6365
public int hashCode() {
64-
return Objects.hash(this.userIds);
66+
return Objects.hash(this.users);
6567
}
6668

6769
@java.lang.Override
@@ -77,7 +79,7 @@ public static Builder builder() {
7779
ignoreUnknown = true
7880
)
7981
public static final class Builder {
80-
private List<String> userIds = new ArrayList<>();
82+
private List<RestoreStreaksRequestUsersItem> users = new ArrayList<>();
8183

8284
@JsonAnySetter
8385
private Map<String, Object> additionalProperties = new HashMap<>();
@@ -86,37 +88,37 @@ private Builder() {
8688
}
8789

8890
public Builder from(RestoreStreaksRequest other) {
89-
userIds(other.getUserIds());
91+
users(other.getUsers());
9092
return this;
9193
}
9294

9395
/**
94-
* <p>Array of user IDs to restore streaks for. Maximum 100 users per request.</p>
96+
* <p>Array of users to restore streaks for. Maximum 100 users per request.</p>
9597
*/
9698
@JsonSetter(
97-
value = "userIds",
99+
value = "users",
98100
nulls = Nulls.SKIP
99101
)
100-
public Builder userIds(List<String> userIds) {
101-
this.userIds.clear();
102-
this.userIds.addAll(userIds);
102+
public Builder users(List<RestoreStreaksRequestUsersItem> users) {
103+
this.users.clear();
104+
this.users.addAll(users);
103105
return this;
104106
}
105107

106-
public Builder addUserIds(String userIds) {
107-
this.userIds.add(userIds);
108+
public Builder addUsers(RestoreStreaksRequestUsersItem users) {
109+
this.users.add(users);
108110
return this;
109111
}
110112

111-
public Builder addAllUserIds(List<String> userIds) {
112-
if (userIds != null) {
113-
this.userIds.addAll(userIds);
113+
public Builder addAllUsers(List<RestoreStreaksRequestUsersItem> users) {
114+
if (users != null) {
115+
this.users.addAll(users);
114116
}
115117
return this;
116118
}
117119

118120
public RestoreStreaksRequest build() {
119-
return new RestoreStreaksRequest(userIds, additionalProperties);
121+
return new RestoreStreaksRequest(users, additionalProperties);
120122
}
121123
}
122124
}
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
package so.trophy.resources.admin.streaks.types;
2+
3+
/**
4+
* This file was auto-generated by Fern from our API Definition.
5+
*/
6+
7+
8+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
9+
import com.fasterxml.jackson.annotation.JsonAnySetter;
10+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
11+
import com.fasterxml.jackson.annotation.JsonInclude;
12+
import com.fasterxml.jackson.annotation.JsonProperty;
13+
import com.fasterxml.jackson.annotation.JsonSetter;
14+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
15+
import so.trophy.core.ObjectMappers;
16+
import java.lang.Object;
17+
import java.lang.String;
18+
import java.util.HashMap;
19+
import java.util.Map;
20+
import java.util.Objects;
21+
import org.jetbrains.annotations.NotNull;
22+
23+
@JsonInclude(JsonInclude.Include.NON_ABSENT)
24+
@JsonDeserialize(
25+
builder = RestoreStreaksRequestUsersItem.Builder.class
26+
)
27+
public final class RestoreStreaksRequestUsersItem {
28+
private final String id;
29+
30+
private final Map<String, Object> additionalProperties;
31+
32+
private RestoreStreaksRequestUsersItem(String id, Map<String, Object> additionalProperties) {
33+
this.id = id;
34+
this.additionalProperties = additionalProperties;
35+
}
36+
37+
/**
38+
* @return The ID of the user to restore streaks for.
39+
*/
40+
@JsonProperty("id")
41+
public String getId() {
42+
return id;
43+
}
44+
45+
@java.lang.Override
46+
public boolean equals(Object other) {
47+
if (this == other) return true;
48+
return other instanceof RestoreStreaksRequestUsersItem && equalTo((RestoreStreaksRequestUsersItem) other);
49+
}
50+
51+
@JsonAnyGetter
52+
public Map<String, Object> getAdditionalProperties() {
53+
return this.additionalProperties;
54+
}
55+
56+
private boolean equalTo(RestoreStreaksRequestUsersItem other) {
57+
return id.equals(other.id);
58+
}
59+
60+
@java.lang.Override
61+
public int hashCode() {
62+
return Objects.hash(this.id);
63+
}
64+
65+
@java.lang.Override
66+
public String toString() {
67+
return ObjectMappers.stringify(this);
68+
}
69+
70+
public static IdStage builder() {
71+
return new Builder();
72+
}
73+
74+
public interface IdStage {
75+
/**
76+
* <p>The ID of the user to restore streaks for.</p>
77+
*/
78+
_FinalStage id(@NotNull String id);
79+
80+
Builder from(RestoreStreaksRequestUsersItem other);
81+
}
82+
83+
public interface _FinalStage {
84+
RestoreStreaksRequestUsersItem build();
85+
}
86+
87+
@JsonIgnoreProperties(
88+
ignoreUnknown = true
89+
)
90+
public static final class Builder implements IdStage, _FinalStage {
91+
private String id;
92+
93+
@JsonAnySetter
94+
private Map<String, Object> additionalProperties = new HashMap<>();
95+
96+
private Builder() {
97+
}
98+
99+
@java.lang.Override
100+
public Builder from(RestoreStreaksRequestUsersItem other) {
101+
id(other.getId());
102+
return this;
103+
}
104+
105+
/**
106+
* <p>The ID of the user to restore streaks for.</p>
107+
* <p>The ID of the user to restore streaks for.</p>
108+
* @return Reference to {@code this} so that method calls can be chained together.
109+
*/
110+
@java.lang.Override
111+
@JsonSetter("id")
112+
public _FinalStage id(@NotNull String id) {
113+
this.id = Objects.requireNonNull(id, "id must not be null");
114+
return this;
115+
}
116+
117+
@java.lang.Override
118+
public RestoreStreaksRequestUsersItem build() {
119+
return new RestoreStreaksRequestUsersItem(id, additionalProperties);
120+
}
121+
}
122+
}

src/main/java/so/trophy/resources/users/AsyncRawUsersClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
import so.trophy.resources.users.requests.UsersWrappedRequest;
4545
import so.trophy.resources.users.types.UsersMetricEventSummaryResponseItem;
4646
import so.trophy.resources.users.types.UsersPointsEventSummaryResponseItem;
47-
import so.trophy.types.CompletedAchievementResponse;
4847
import so.trophy.types.ErrorBody;
4948
import so.trophy.types.GetUserPointsResponse;
5049
import so.trophy.types.MetricResponse;
5150
import so.trophy.types.StreakResponse;
5251
import so.trophy.types.UpdatedUser;
5352
import so.trophy.types.UpsertedUser;
5453
import so.trophy.types.User;
54+
import so.trophy.types.UserAchievementWithStatsResponse;
5555
import so.trophy.types.UserLeaderboardResponseWithHistory;
5656
import so.trophy.types.WrappedResponse;
5757

@@ -576,23 +576,23 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
576576
/**
577577
* Get a user's achievements.
578578
*/
579-
public CompletableFuture<TrophyApiHttpResponse<List<CompletedAchievementResponse>>> achievements(
579+
public CompletableFuture<TrophyApiHttpResponse<List<UserAchievementWithStatsResponse>>> achievements(
580580
String id) {
581581
return achievements(id,UsersAchievementsRequest.builder().build());
582582
}
583583

584584
/**
585585
* Get a user's achievements.
586586
*/
587-
public CompletableFuture<TrophyApiHttpResponse<List<CompletedAchievementResponse>>> achievements(
587+
public CompletableFuture<TrophyApiHttpResponse<List<UserAchievementWithStatsResponse>>> achievements(
588588
String id, UsersAchievementsRequest request) {
589589
return achievements(id,request,null);
590590
}
591591

592592
/**
593593
* Get a user's achievements.
594594
*/
595-
public CompletableFuture<TrophyApiHttpResponse<List<CompletedAchievementResponse>>> achievements(
595+
public CompletableFuture<TrophyApiHttpResponse<List<UserAchievementWithStatsResponse>>> achievements(
596596
String id, UsersAchievementsRequest request, RequestOptions requestOptions) {
597597
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getApiURL()).newBuilder()
598598

@@ -611,13 +611,13 @@ public CompletableFuture<TrophyApiHttpResponse<List<CompletedAchievementResponse
611611
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
612612
client = clientOptions.httpClientWithTimeout(requestOptions);
613613
}
614-
CompletableFuture<TrophyApiHttpResponse<List<CompletedAchievementResponse>>> future = new CompletableFuture<>();
614+
CompletableFuture<TrophyApiHttpResponse<List<UserAchievementWithStatsResponse>>> future = new CompletableFuture<>();
615615
client.newCall(okhttpRequest).enqueue(new Callback() {
616616
@Override
617617
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
618618
try (ResponseBody responseBody = response.body()) {
619619
if (response.isSuccessful()) {
620-
future.complete(new TrophyApiHttpResponse<>(ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), new TypeReference<List<CompletedAchievementResponse>>() {}), response));
620+
future.complete(new TrophyApiHttpResponse<>(ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), new TypeReference<List<UserAchievementWithStatsResponse>>() {}), response));
621621
return;
622622
}
623623
String responseBodyString = responseBody != null ? responseBody.string() : "{}";

src/main/java/so/trophy/resources/users/AsyncUsersClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import so.trophy.resources.users.requests.UsersWrappedRequest;
2020
import so.trophy.resources.users.types.UsersMetricEventSummaryResponseItem;
2121
import so.trophy.resources.users.types.UsersPointsEventSummaryResponseItem;
22-
import so.trophy.types.CompletedAchievementResponse;
2322
import so.trophy.types.GetUserPointsResponse;
2423
import so.trophy.types.MetricResponse;
2524
import so.trophy.types.StreakResponse;
2625
import so.trophy.types.UpdatedUser;
2726
import so.trophy.types.UpsertedUser;
2827
import so.trophy.types.User;
28+
import so.trophy.types.UserAchievementWithStatsResponse;
2929
import so.trophy.types.UserLeaderboardResponseWithHistory;
3030
import so.trophy.types.WrappedResponse;
3131

@@ -167,22 +167,22 @@ public CompletableFuture<List<UsersMetricEventSummaryResponseItem>> metricEventS
167167
/**
168168
* Get a user's achievements.
169169
*/
170-
public CompletableFuture<List<CompletedAchievementResponse>> achievements(String id) {
170+
public CompletableFuture<List<UserAchievementWithStatsResponse>> achievements(String id) {
171171
return this.rawClient.achievements(id).thenApply(response -> response.body());
172172
}
173173

174174
/**
175175
* Get a user's achievements.
176176
*/
177-
public CompletableFuture<List<CompletedAchievementResponse>> achievements(String id,
177+
public CompletableFuture<List<UserAchievementWithStatsResponse>> achievements(String id,
178178
UsersAchievementsRequest request) {
179179
return this.rawClient.achievements(id, request).thenApply(response -> response.body());
180180
}
181181

182182
/**
183183
* Get a user's achievements.
184184
*/
185-
public CompletableFuture<List<CompletedAchievementResponse>> achievements(String id,
185+
public CompletableFuture<List<UserAchievementWithStatsResponse>> achievements(String id,
186186
UsersAchievementsRequest request, RequestOptions requestOptions) {
187187
return this.rawClient.achievements(id, request, requestOptions).thenApply(response -> response.body());
188188
}

0 commit comments

Comments
 (0)