okNick/Bat
1
0
Fork 0
forked from Fascinated/Bat
Code Pull Requests Activity

fix WebRequest#getAsEntity

Browse Source
This commit is contained in:
Lee 2024-07-03 00:39:20 +01:00
parent 6202aa6691
commit da06a01097
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/cc/fascinated/bat/common/WebRequest.java
View File

@ -31,20 +31,26 @@ public class WebRequest {
* @return the response * @return the response
*/ */
public static <T> T getAsEntity(String url, Class<T> clazz) throws RateLimitException { public static <T> T getAsEntity(String url, Class<T> clazz) throws RateLimitException {
ResponseEntity<T> responseEntity = CLIENT.get() try {
.uri(url) ResponseEntity<T> responseEntity = CLIENT.get()
.retrieve() .uri(url)
.onStatus(HttpStatusCode::isError, (request, response) -> { .retrieve()
}) // Don't throw exceptions on error .onStatus(HttpStatusCode::isError, (request, response) -> {
.toEntity(clazz); }) // Don't throw exceptions on error
.toEntity(clazz);
if (responseEntity.getStatusCode().isError()) { if (responseEntity.getStatusCode().isError()) {
return null;
}
if (responseEntity.getStatusCode().isSameCodeAs(HttpStatus.TOO_MANY_REQUESTS)) {
throw new RateLimitException("Rate limit reached");
}
return responseEntity.getBody();
} catch (RateLimitException e) {
throw e;
} catch (Exception e) {
return null; return null;
} }
if (responseEntity.getStatusCode().isSameCodeAs(HttpStatus.TOO_MANY_REQUESTS)) {
throw new RateLimitException("Rate limit reached");
}
return responseEntity.getBody();
} }
/** /**