Skip to content

@W-21053358 Handle 429 response from svc-api gracefully by adding NPE checks and relevant messages #40

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

Merged
bharatsuri97 merged 7 commits into from
Feb 23, 2026
Merged

@W-21053358 Handle 429 response from svc-api gracefully by adding NPE checks and relevant messages #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30cf397
Add NPE check while extracting body contents and add a meaningful mes…
SaranshSinha Feb 19, 2026
97e6d01
Enhance error message handling in WebClientUtil
SaranshSinha Feb 19, 2026
9d76891
Add relevant test cases
SaranshSinha Feb 19, 2026
560bf13
Refactor error handling in WebClientUtil
SaranshSinha Feb 19, 2026
06b3b2e
Make content type check case insensitive for JSON
SaranshSinha Feb 20, 2026
d2404e6
Fix formatting
SaranshSinha Feb 20, 2026
23f3d63
Refactor WebClientUtil for formatting improvements
SaranshSinha Feb 20, 2026
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
14 changes: 8 additions & 6 deletions src/main/java/com/salesforce/einsteinbot/sdk/util/WebClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import com.salesforce.einsteinbot.sdk.model.Error;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ReactiveHttpInputMessage;
import org.springframework.http.client.reactive.ClientHttpResponse;
import org.springframework.web.reactive.function.BodyExtractor;
Expand All @@ -32,7 +34,6 @@
public class WebClientUtil {

private static final Logger logger = LoggerFactory.getLogger(WebClientUtil.class);

public static Mono<ClientRequest> createLoggingRequestProcessor(ClientRequest clientRequest) {
logger.info("Making {} Request to URI {} with Headers : {}", clientRequest.method(),
clientRequest.url(), maskAuthorizationHeader(clientRequest.headers()));
Expand Down Expand Up @@ -60,8 +61,9 @@ public static ExchangeFilterFunction createFilter(

public static BodyExtractor<Mono<Error>, ReactiveHttpInputMessage> errorBodyExtractor() {
BodyExtractor<Mono<Error>, ReactiveHttpInputMessage> extractor = (inputMessage, context) -> {
String contentType = inputMessage.getHeaders().getContentType().toString();
if (contentType.contains("application/json")) {
HttpHeaders headers = inputMessage.getHeaders();
MediaType contentType = headers != null ? headers.getContentType() : null;
if (contentType != null && contentType.toString().toLowerCase().contains("application/json")) {
return BodyExtractors.toMono(Error.class)
.extract(inputMessage, context);
} else {
Expand All @@ -72,10 +74,10 @@ public static BodyExtractor<Mono<Error>, ReactiveHttpInputMessage> errorBodyExtr
}

private static Mono<Error> buildErrorFromClientResponseBodyString(ReactiveHttpInputMessage clientResponse, BodyExtractor.Context context) {
ClientHttpResponse response = (ClientHttpResponse) clientResponse;
Mono<String> bodyString = BodyExtractors.toMono(String.class).
ClientHttpResponse response = (ClientHttpResponse) clientResponse;
Mono<String> bodyString = BodyExtractors.toMono(String.class).
extract(clientResponse, context);
return bodyString.map(errorMessage -> new Error()
return bodyString.map(errorMessage -> new Error()
.status(response.getRawStatusCode())
.message("This Response content type is not 'application/json', " +
"See the 'error' field for actual error returned by the server.")
Expand Down
39 changes: 38 additions & 1 deletion src/test/java/com/salesforce/einsteinbot/sdk/client/ClientApiWireMockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,41 @@ private void stubVersionsResponse(String responseBodyFile, int statusCode) {
);
}

}
@Test
public void test429ResponseWithNullContentType() {
wireMock.stubFor(
get(VERSIONS_URI)
.willReturn(
aResponse()
.withStatus(HttpStatus.TOO_MANY_REQUESTS.value())
.withBody("Too many requests")
)
);

Throwable exceptionThrown = assertThrows(RuntimeException.class,
() -> client.getSupportedVersions());

ChatbotResponseException chatbotResponseException = validateAndGetCause(exceptionThrown,
ChatbotResponseException.class);
assertEquals(HttpStatus.TOO_MANY_REQUESTS.value(), chatbotResponseException.getStatus());
Copy link
Copy Markdown

@sarathm09 sarathm09 Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting... Why is it a 429?

Copy link
Copy Markdown
Contributor Author

@SaranshSinha SaranshSinha Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are stubbing this response in line 416 along with a null contentType. This basically mocks the current flow where the sdk breaks due to NPE. Now the test verifies that the NPE issue is fixed for such responses

Copy link
Copy Markdown

@sarathm09 sarathm09 Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... I'm not convinced on the 429 part. If the issue is with content type, it should have been a 415.

Copy link
Copy Markdown
Contributor Author

@SaranshSinha SaranshSinha Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is with a "null" content-type. GRLS metrics confirmed that it was throwing 429 and we faced this NPE during that time interval

}

@Test
public void test200ResponseWithApplicationJsonContentType() throws Exception {
String responseBodyFile = "versionsResponse.json";
wireMock.stubFor(
get(VERSIONS_URI)
.willReturn(
aResponse()
.withStatus(HttpStatus.OK.value())
.withHeader("Content-Type", "application/json;charset=UTF-8")
.withBodyFile(TEST_MOCK_DIR + responseBodyFile)
)
);

SupportedVersions versions = client.getSupportedVersions();

verifyResponseEnvelope(responseBodyFile, versions);
}

}
Loading