Skip to content

feat: fix hard coded status code in response #10

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
merged 1 commit into from
Oct 4, 2023
Merged

feat: fix hard coded status code in response #10

Show file tree
Hide file tree
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
87 changes: 48 additions & 39 deletions src/main/java/com/intuit/springwebclient/client/CommonSpringWebClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
package com.intuit.springwebclient.client;

import com.intuit.springwebclient.entity.ClientHttpRequest;
import com.intuit.springwebclient.entity.ClientHttpResponse;
import com.intuit.springwebclient.retryHandler.RetryHandlerFactory;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.time.Duration;
import java.util.Objects;
import java.util.function.Consumer;

import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.UnknownContentTypeException;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClient.RequestBodySpec;
import org.springframework.web.reactive.function.client.WebClientResponseException;

import com.intuit.springwebclient.entity.ClientHttpRequest;
import com.intuit.springwebclient.entity.ClientHttpResponse;
import com.intuit.springwebclient.retryHandler.RetryHandlerFactory;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Mono;
import reactor.util.retry.Retry;

import java.time.Duration;
import java.util.Objects;
import java.util.function.Consumer;

/**
* Spring 5 Web Client Method executor.
*/
Expand All @@ -37,16 +40,21 @@ public class CommonSpringWebClient {
* @param <RESPONSE>
*/
public <REQUEST, RESPONSE> ClientHttpResponse<RESPONSE> syncHttpResponse(ClientHttpRequest<REQUEST, RESPONSE> httpRequest) {
try {
log.info("Executing http request for request={}, method={}", httpRequest.getUrl(), httpRequest.getHttpMethod());
return generateResponse(
generateResponseSpec(httpRequest)
.bodyToMono(httpRequest.getResponseType())
.retryWhen(generateRetrySpec(httpRequest))
.block());
} catch (final HttpStatusCodeException ex) {
final String errorMessage = String.format("Error in making rest call. Error=%s Headers=%s",
ex.getResponseBodyAsString(), ex.getResponseHeaders());
try {
log.info("Executing http request for request={}, method={}", httpRequest.getUrl(),
httpRequest.getHttpMethod());
return generateResponseSpec(httpRequest).toEntity(httpRequest.getResponseType()).map(resp -> {
return generateResponse(resp);
}).retryWhen(generateRetrySpec(httpRequest)).block();
}
catch (final WebClientResponseException ex) {
final String errorMessage = String.format("Error in making rest call. Error=%s Headers=%s statusCode=%s",
ex.getResponseBodyAsString(), ex.getHeaders(), ex.getStatusCode());
return handleException(ex, errorMessage, HttpStatus.valueOf(ex.getStatusCode().value()), httpRequest);
}
catch (final HttpStatusCodeException ex) {
final String errorMessage = String.format("Error in making rest call. Error=%s Headers=%s statusCode=%s",
ex.getResponseBodyAsString(), ex.getResponseHeaders(),ex.getStatusCode());
return handleException(ex, errorMessage, HttpStatus.valueOf(ex.getStatusCode().value()), httpRequest);
} catch (final UnknownContentTypeException ex) {
// It was observed that this exception was thrown whenever there was a HTTP 5XX error
Expand Down Expand Up @@ -90,25 +98,26 @@ private <REQUEST, RESPONSE> WebClient.ResponseSpec generateResponseSpec(
* @param httpRequest
* @return
*/
private Retry generateRetrySpec(ClientHttpRequest httpRequest) {
return Retry.fixedDelay(httpRequest.getClientRetryConfig().getMaxAttempts(), Duration.ofSeconds(httpRequest.getClientRetryConfig().getBackOff()))
.doBeforeRetry(signal -> log.info("Retrying for request={}, retryCount={}", httpRequest.getUrl(), signal.totalRetries()))
.filter(httpRequest.getClientRetryConfig().getRetryFilter());
}
private <REQUEST, RESPONSE> Retry generateRetrySpec(ClientHttpRequest<REQUEST, RESPONSE> httpRequest) {
return Retry
.fixedDelay(httpRequest.getClientRetryConfig().getMaxAttempts(),
Duration.ofSeconds(httpRequest.getClientRetryConfig().getBackOff()))
.doBeforeRetry(signal -> log.info("Retrying for request={}, retryCount={}", httpRequest.getUrl(),
signal.totalRetries()))
.filter(httpRequest.getClientRetryConfig().getRetryFilter());
}

/**
* Handle Success response.
* @param response
* @return
* @param <RESPONSE>
*/
private <RESPONSE> ClientHttpResponse<RESPONSE> generateResponse(RESPONSE response) {
return ClientHttpResponse.<RESPONSE>builder()
.response(response)
.status(HttpStatus.OK)
.isSuccess2xx(HttpStatus.OK.is2xxSuccessful())
.build();
}
/**
* Handle Success response.
*
* @param response
* @return
* @param <RESPONSE>
*/
private <RESPONSE> ClientHttpResponse<RESPONSE> generateResponse(ResponseEntity<RESPONSE> response) {
return ClientHttpResponse.<RESPONSE>builder().response(response.getBody()).status(response.getStatusCode())
.isSuccess2xx(response.getStatusCode().is2xxSuccessful()).build();
}

/**
* Handle Exception and send back response.
Expand All @@ -119,11 +128,11 @@ private <RESPONSE> ClientHttpResponse<RESPONSE> generateResponse(RESPONSE respon
* @return
* @param <RESPONSE>
*/
private <RESPONSE> ClientHttpResponse<RESPONSE> handleException(
private <REQUEST, RESPONSE> ClientHttpResponse<RESPONSE> handleException(
final Exception exception,
final String errorMessage,
final HttpStatus httpStatus,
final ClientHttpRequest httpRequest) {
final ClientHttpRequest<REQUEST, RESPONSE> httpRequest) {
log.error("Exception while executing http request for request={}, status={}, errorMessage={}", httpRequest.getUrl(), httpStatus, errorMessage);
httpRequest.getRetryHandlers()
.forEach(handlerId -> RetryHandlerFactory.getHandler(handlerId.toString()).checkAndThrowRetriableException(exception));
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/com/intuit/springwebclient/client/CommonSpringWebClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.intuit.springwebclient.client;

import com.intuit.springwebclient.entity.ClientHttpRequest;
import com.intuit.springwebclient.entity.ClientHttpRequest.ClientHttpRequestBuilder;
import java.util.function.Consumer;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand All @@ -16,8 +15,11 @@
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.UnknownContentTypeException;
import org.springframework.web.reactive.function.client.WebClient;

import com.intuit.springwebclient.entity.ClientHttpRequest;
import com.intuit.springwebclient.entity.ClientHttpRequest.ClientHttpRequestBuilder;

import reactor.core.publisher.Mono;
import java.util.function.Consumer;


@ExtendWith(MockitoExtension.class)
Expand Down