Skip to content

Commit d64d16b

Browse files
github-actions[bot]github-actions[bot]
committed
Automatically update Java SDK
1 parent 0b80f6d commit d64d16b

File tree

9 files changed

+57
-206
lines changed

9 files changed

+57
-206
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.4.0</version>
11+
<version>1.5.0</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.1879");}});
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.1909");}});
3434
this.headerSuppliers = headerSuppliers;
3535
this.httpClient = httpClient;
3636
this.timeout = timeout;

‎src/main/java/so/trophy/resources/admin/points/boosts/AsyncBoostsClient.java‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88
import so.trophy.core.ClientOptions;
99
import so.trophy.core.RequestOptions;
10-
import java.lang.String;
1110
import java.util.concurrent.CompletableFuture;
12-
import so.trophy.resources.admin.points.boosts.requests.BoostsBatchArchiveRequest;
11+
import so.trophy.resources.admin.points.boosts.requests.BoostsDeleteRequest;
1312
import so.trophy.resources.admin.points.boosts.requests.CreatePointsBoostsRequest;
1413
import so.trophy.types.CreatePointsBoostsResponse;
1514
import so.trophy.types.DeletePointsBoostsResponse;
@@ -47,40 +46,24 @@ public CompletableFuture<CreatePointsBoostsResponse> create(CreatePointsBoostsRe
4746
}
4847

4948
/**
50-
* Archive multiple points boosts by ID.
49+
* Delete multiple points boosts by ID.
5150
*/
52-
public CompletableFuture<DeletePointsBoostsResponse> batchArchive() {
53-
return this.rawClient.batchArchive().thenApply(response -> response.body());
51+
public CompletableFuture<DeletePointsBoostsResponse> delete() {
52+
return this.rawClient.delete().thenApply(response -> response.body());
5453
}
5554

5655
/**
57-
* Archive multiple points boosts by ID.
56+
* Delete multiple points boosts by ID.
5857
*/
59-
public CompletableFuture<DeletePointsBoostsResponse> batchArchive(
60-
BoostsBatchArchiveRequest request) {
61-
return this.rawClient.batchArchive(request).thenApply(response -> response.body());
58+
public CompletableFuture<DeletePointsBoostsResponse> delete(BoostsDeleteRequest request) {
59+
return this.rawClient.delete(request).thenApply(response -> response.body());
6260
}
6361

6462
/**
65-
* Archive multiple points boosts by ID.
63+
* Delete multiple points boosts by ID.
6664
*/
67-
public CompletableFuture<DeletePointsBoostsResponse> batchArchive(
68-
BoostsBatchArchiveRequest request, RequestOptions requestOptions) {
69-
return this.rawClient.batchArchive(request, requestOptions).thenApply(response -> response.body());
70-
}
71-
72-
/**
73-
* Archive a points boost by ID.
74-
*/
75-
public CompletableFuture<DeletePointsBoostsResponse> archive(String id) {
76-
return this.rawClient.archive(id).thenApply(response -> response.body());
77-
}
78-
79-
/**
80-
* Archive a points boost by ID.
81-
*/
82-
public CompletableFuture<DeletePointsBoostsResponse> archive(String id,
65+
public CompletableFuture<DeletePointsBoostsResponse> delete(BoostsDeleteRequest request,
8366
RequestOptions requestOptions) {
84-
return this.rawClient.archive(id, requestOptions).thenApply(response -> response.body());
67+
return this.rawClient.delete(request, requestOptions).thenApply(response -> response.body());
8568
}
8669
}

‎src/main/java/so/trophy/resources/admin/points/boosts/AsyncRawBoostsClient.java‎

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import okhttp3.Response;
3434
import okhttp3.ResponseBody;
3535
import org.jetbrains.annotations.NotNull;
36-
import so.trophy.resources.admin.points.boosts.requests.BoostsBatchArchiveRequest;
36+
import so.trophy.resources.admin.points.boosts.requests.BoostsDeleteRequest;
3737
import so.trophy.resources.admin.points.boosts.requests.CreatePointsBoostsRequest;
3838
import so.trophy.types.CreatePointsBoostsResponse;
3939
import so.trophy.types.DeletePointsBoostsResponse;
@@ -123,25 +123,25 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
123123
}
124124

125125
/**
126-
* Archive multiple points boosts by ID.
126+
* Delete multiple points boosts by ID.
127127
*/
128-
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> batchArchive() {
129-
return batchArchive(BoostsBatchArchiveRequest.builder().build());
128+
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> delete() {
129+
return delete(BoostsDeleteRequest.builder().build());
130130
}
131131

132132
/**
133-
* Archive multiple points boosts by ID.
133+
* Delete multiple points boosts by ID.
134134
*/
135-
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> batchArchive(
136-
BoostsBatchArchiveRequest request) {
137-
return batchArchive(request,null);
135+
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> delete(
136+
BoostsDeleteRequest request) {
137+
return delete(request,null);
138138
}
139139

140140
/**
141-
* Archive multiple points boosts by ID.
141+
* Delete multiple points boosts by ID.
142142
*/
143-
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> batchArchive(
144-
BoostsBatchArchiveRequest request, RequestOptions requestOptions) {
143+
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> delete(
144+
BoostsDeleteRequest request, RequestOptions requestOptions) {
145145
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAdminURL()).newBuilder()
146146

147147
.addPathSegments("points/boosts");if (request.getIds().isPresent()) {
@@ -193,70 +193,4 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
193193
});
194194
return future;
195195
}
196-
197-
/**
198-
* Archive a points boost by ID.
199-
*/
200-
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> archive(String id) {
201-
return archive(id,null);
202-
}
203-
204-
/**
205-
* Archive a points boost by ID.
206-
*/
207-
public CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> archive(String id,
208-
RequestOptions requestOptions) {
209-
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getAdminURL()).newBuilder()
210-
211-
.addPathSegments("points/boosts")
212-
.addPathSegment(id)
213-
.build();
214-
Request okhttpRequest = new Request.Builder()
215-
.url(httpUrl)
216-
.method("DELETE", null)
217-
.headers(Headers.of(clientOptions.headers(requestOptions)))
218-
.addHeader("Accept", "application/json")
219-
.build();
220-
OkHttpClient client = clientOptions.httpClient();
221-
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
222-
client = clientOptions.httpClientWithTimeout(requestOptions);
223-
}
224-
CompletableFuture<TrophyApiHttpResponse<DeletePointsBoostsResponse>> future = new CompletableFuture<>();
225-
client.newCall(okhttpRequest).enqueue(new Callback() {
226-
@Override
227-
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
228-
try (ResponseBody responseBody = response.body()) {
229-
if (response.isSuccessful()) {
230-
future.complete(new TrophyApiHttpResponse<>(ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeletePointsBoostsResponse.class), response));
231-
return;
232-
}
233-
String responseBodyString = responseBody != null ? responseBody.string() : "{}";
234-
try {
235-
switch (response.code()) {
236-
case 400:future.completeExceptionally(new BadRequestError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response));
237-
return;
238-
case 401:future.completeExceptionally(new UnauthorizedError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response));
239-
return;
240-
case 404:future.completeExceptionally(new NotFoundError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response));
241-
return;
242-
}
243-
}
244-
catch (JsonProcessingException ignored) {
245-
// unable to map error response, throwing generic error
246-
}
247-
future.completeExceptionally(new TrophyApiApiException("Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response));
248-
return;
249-
}
250-
catch (IOException e) {
251-
future.completeExceptionally(new TrophyApiException("Network error executing HTTP request", e));
252-
}
253-
}
254-
255-
@Override
256-
public void onFailure(@NotNull Call call, @NotNull IOException e) {
257-
future.completeExceptionally(new TrophyApiException("Network error executing HTTP request", e));
258-
}
259-
});
260-
return future;
261-
}
262196
}

‎src/main/java/so/trophy/resources/admin/points/boosts/BoostsClient.java‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
import so.trophy.core.ClientOptions;
99
import so.trophy.core.RequestOptions;
10-
import java.lang.String;
11-
import so.trophy.resources.admin.points.boosts.requests.BoostsBatchArchiveRequest;
10+
import so.trophy.resources.admin.points.boosts.requests.BoostsDeleteRequest;
1211
import so.trophy.resources.admin.points.boosts.requests.CreatePointsBoostsRequest;
1312
import so.trophy.types.CreatePointsBoostsResponse;
1413
import so.trophy.types.DeletePointsBoostsResponse;
@@ -46,38 +45,24 @@ public CreatePointsBoostsResponse create(CreatePointsBoostsRequest request,
4645
}
4746

4847
/**
49-
* Archive multiple points boosts by ID.
48+
* Delete multiple points boosts by ID.
5049
*/
51-
public DeletePointsBoostsResponse batchArchive() {
52-
return this.rawClient.batchArchive().body();
50+
public DeletePointsBoostsResponse delete() {
51+
return this.rawClient.delete().body();
5352
}
5453

5554
/**
56-
* Archive multiple points boosts by ID.
55+
* Delete multiple points boosts by ID.
5756
*/
58-
public DeletePointsBoostsResponse batchArchive(BoostsBatchArchiveRequest request) {
59-
return this.rawClient.batchArchive(request).body();
57+
public DeletePointsBoostsResponse delete(BoostsDeleteRequest request) {
58+
return this.rawClient.delete(request).body();
6059
}
6160

6261
/**
63-
* Archive multiple points boosts by ID.
62+
* Delete multiple points boosts by ID.
6463
*/
65-
public DeletePointsBoostsResponse batchArchive(BoostsBatchArchiveRequest request,
64+
public DeletePointsBoostsResponse delete(BoostsDeleteRequest request,
6665
RequestOptions requestOptions) {
67-
return this.rawClient.batchArchive(request, requestOptions).body();
68-
}
69-
70-
/**
71-
* Archive a points boost by ID.
72-
*/
73-
public DeletePointsBoostsResponse archive(String id) {
74-
return this.rawClient.archive(id).body();
75-
}
76-
77-
/**
78-
* Archive a points boost by ID.
79-
*/
80-
public DeletePointsBoostsResponse archive(String id, RequestOptions requestOptions) {
81-
return this.rawClient.archive(id, requestOptions).body();
66+
return this.rawClient.delete(request, requestOptions).body();
8267
}
8368
}

‎src/main/java/so/trophy/resources/admin/points/boosts/RawBoostsClient.java‎

Lines changed: 10 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import okhttp3.RequestBody;
2929
import okhttp3.Response;
3030
import okhttp3.ResponseBody;
31-
import so.trophy.resources.admin.points.boosts.requests.BoostsBatchArchiveRequest;
31+
import so.trophy.resources.admin.points.boosts.requests.BoostsDeleteRequest;
3232
import so.trophy.resources.admin.points.boosts.requests.CreatePointsBoostsRequest;
3333
import so.trophy.types.CreatePointsBoostsResponse;
3434
import so.trophy.types.DeletePointsBoostsResponse;
@@ -101,25 +101,24 @@ public TrophyApiHttpResponse<CreatePointsBoostsResponse> create(CreatePointsBoos
101101
}
102102

103103
/**
104-
* Archive multiple points boosts by ID.
104+
* Delete multiple points boosts by ID.
105105
*/
106-
public TrophyApiHttpResponse<DeletePointsBoostsResponse> batchArchive() {
107-
return batchArchive(BoostsBatchArchiveRequest.builder().build());
106+
public TrophyApiHttpResponse<DeletePointsBoostsResponse> delete() {
107+
return delete(BoostsDeleteRequest.builder().build());
108108
}
109109

110110
/**
111-
* Archive multiple points boosts by ID.
111+
* Delete multiple points boosts by ID.
112112
*/
113-
public TrophyApiHttpResponse<DeletePointsBoostsResponse> batchArchive(
114-
BoostsBatchArchiveRequest request) {
115-
return batchArchive(request,null);
113+
public TrophyApiHttpResponse<DeletePointsBoostsResponse> delete(BoostsDeleteRequest request) {
114+
return delete(request,null);
116115
}
117116

118117
/**
119-
* Archive multiple points boosts by ID.
118+
* Delete multiple points boosts by ID.
120119
*/
121-
public TrophyApiHttpResponse<DeletePointsBoostsResponse> batchArchive(
122-
BoostsBatchArchiveRequest request, RequestOptions requestOptions) {
120+
public TrophyApiHttpResponse<DeletePointsBoostsResponse> delete(BoostsDeleteRequest request,
121+
RequestOptions requestOptions) {
123122
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAdminURL()).newBuilder()
124123

125124
.addPathSegments("points/boosts");if (request.getIds().isPresent()) {
@@ -156,54 +155,4 @@ public TrophyApiHttpResponse<DeletePointsBoostsResponse> batchArchive(
156155
throw new TrophyApiException("Network error executing HTTP request", e);
157156
}
158157
}
159-
160-
/**
161-
* Archive a points boost by ID.
162-
*/
163-
public TrophyApiHttpResponse<DeletePointsBoostsResponse> archive(String id) {
164-
return archive(id,null);
165-
}
166-
167-
/**
168-
* Archive a points boost by ID.
169-
*/
170-
public TrophyApiHttpResponse<DeletePointsBoostsResponse> archive(String id,
171-
RequestOptions requestOptions) {
172-
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getAdminURL()).newBuilder()
173-
174-
.addPathSegments("points/boosts")
175-
.addPathSegment(id)
176-
.build();
177-
Request okhttpRequest = new Request.Builder()
178-
.url(httpUrl)
179-
.method("DELETE", null)
180-
.headers(Headers.of(clientOptions.headers(requestOptions)))
181-
.addHeader("Accept", "application/json")
182-
.build();
183-
OkHttpClient client = clientOptions.httpClient();
184-
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
185-
client = clientOptions.httpClientWithTimeout(requestOptions);
186-
}
187-
try (Response response = client.newCall(okhttpRequest).execute()) {
188-
ResponseBody responseBody = response.body();
189-
if (response.isSuccessful()) {
190-
return new TrophyApiHttpResponse<>(ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeletePointsBoostsResponse.class), response);
191-
}
192-
String responseBodyString = responseBody != null ? responseBody.string() : "{}";
193-
try {
194-
switch (response.code()) {
195-
case 400:throw new BadRequestError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response);
196-
case 401:throw new UnauthorizedError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response);
197-
case 404:throw new NotFoundError(ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorBody.class), response);
198-
}
199-
}
200-
catch (JsonProcessingException ignored) {
201-
// unable to map error response, throwing generic error
202-
}
203-
throw new TrophyApiApiException("Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response);
204-
}
205-
catch (IOException e) {
206-
throw new TrophyApiException("Network error executing HTTP request", e);
207-
}
208-
}
209158
}

0 commit comments

Comments
 (0)