Skip to content

fix: Remove un-used @Deprecated methods in ApiException. #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −57
Open

fix: Remove un-used @Deprecated methods in ApiException. #808

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions src/main/java/com/google/genai/errors/ApiException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
import java.io.IOException;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.util.EntityUtils;

/** General exception class for all exceptions originating from the GenAI API side. */
public class ApiException extends BaseException {
Expand All @@ -52,31 +47,6 @@ public ApiException(int code, String status, String message) {
this.message = message;
}

/**
* Throws an ApiException from the response if the response is not a OK status.
*
* @param response The response from the API call.
* @deprecated Use {@link #throwFromResponse(Response)} instead.
*/
@ExcludeFromGeneratedCoverageReport
@Deprecated
public static void throwFromResponse(CloseableHttpResponse response) {
StatusLine statusLine = response.getStatusLine();
int code = statusLine.getStatusCode();
if (code == HttpStatus.SC_OK) {
return;
}
String status = statusLine.getReasonPhrase();
String message = getErrorMessageFromResponse(response);
if (code >= 400 && code < 500) { // Client errors.
throw new ClientException(code, status, message);
} else if (code >= 500 && code < 600) { // Server errors.
throw new ServerException(code, status, message);
} else {
throw new ApiException(code, status, message);
}
}

/**
* Throws an ApiException from the response if the response is not a OK status.
*
Expand All @@ -99,33 +69,6 @@ public static void throwFromResponse(Response response) {
}
}

/**
* Returns the error message from the response, if no error or error message is not found, then
* returns an empty string.
*/
@ExcludeFromGeneratedCoverageReport
@Deprecated
static String getErrorMessageFromResponse(CloseableHttpResponse response) {
HttpEntity entity = response.getEntity();
try {
String responseBody = EntityUtils.toString(entity);
if (responseBody == null || responseBody.isEmpty()) {
return "";
}
ObjectMapper mapper = new ObjectMapper();
JsonNode errorNode = mapper.readTree(responseBody).get("error");
if (errorNode != null && errorNode.isObject()) {
JsonNode messageNode = errorNode.get("message");
if (messageNode != null && messageNode.isTextual()) {
return messageNode.asText();
}
}
return "";
} catch (IOException ignored) {
return "";
}
}

/**
* Returns the error message from the response, if no error or error message is not found, then
* returns an empty string.
Expand Down