-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
feat : streamlining client request handling #1202
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...lient/src/main/java/com/example/restclient/bootrestclient/services/HttpClientService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package com.example.restclient.bootrestclient.services; | ||
|
||
import com.example.restclient.bootrestclient.exception.MyCustomClientException; | ||
import java.net.URI; | ||
import java.util.function.Function; | ||
import org.springframework.core.ParameterizedTypeReference; | ||
import org.springframework.http.HttpMethod; | ||
import org.springframework.http.HttpStatusCode; | ||
import org.springframework.lang.Nullable; | ||
import org.springframework.retry.annotation.Backoff; | ||
import org.springframework.retry.annotation.Retryable; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.web.client.RestClient; | ||
import org.springframework.web.util.UriBuilder; | ||
|
||
@Service | ||
@Retryable( | ||
retryFor = {Exception.class}, | ||
maxAttempts = 3, | ||
backoff = @Backoff(delay = 5000)) | ||
public class HttpClientService { | ||
|
||
private final RestClient restClient; | ||
|
||
public HttpClientService(RestClient restClient) { | ||
this.restClient = restClient; | ||
} | ||
|
||
<T> T callAndFetchResponse( | ||
Function<UriBuilder, URI> uriFunction, | ||
HttpMethod httpMethod, | ||
@Nullable Object body, | ||
Class<T> bodyType) { | ||
return callServer(uriFunction, httpMethod, body, bodyType, null); | ||
} | ||
|
||
<T> T callAndFetchResponse( | ||
Function<UriBuilder, URI> uriFunction, | ||
HttpMethod httpMethod, | ||
@Nullable Object body, | ||
ParameterizedTypeReference<T> bodyType) { | ||
return callServer(uriFunction, httpMethod, body, null, bodyType); | ||
} | ||
|
||
private <T> T callServer( | ||
Function<UriBuilder, URI> uriFunction, | ||
HttpMethod httpMethod, | ||
Object body, | ||
Class<T> bodyType, | ||
ParameterizedTypeReference<T> typeReferenceBodyType) { | ||
RestClient.RequestBodySpec uri = restClient.method(httpMethod).uri(uriFunction); | ||
if (body != null) { | ||
uri.body(body); | ||
} | ||
RestClient.ResponseSpec responseSpec = | ||
uri.retrieve() | ||
.onStatus( | ||
HttpStatusCode::is4xxClientError, | ||
(request, response) -> { | ||
throw new MyCustomClientException( | ||
response.getStatusCode(), response.getHeaders()); | ||
}); | ||
if (bodyType != null) { | ||
return responseSpec.body(bodyType); | ||
} else { | ||
return responseSpec.body(typeReferenceBodyType); | ||
} | ||
} | ||
} |
85 changes: 33 additions & 52 deletions
85
...-restclient/src/main/java/com/example/restclient/bootrestclient/services/PostService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,81 +1,62 @@ | ||
package com.example.restclient.bootrestclient.services; | ||
|
||
import com.example.restclient.bootrestclient.exception.MyCustomRuntimeException; | ||
import com.example.restclient.bootrestclient.model.response.PostDto; | ||
import java.util.List; | ||
import java.util.Optional; | ||
import org.springframework.core.ParameterizedTypeReference; | ||
import org.springframework.http.HttpStatusCode; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.http.HttpMethod; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.web.client.RestClient; | ||
|
||
@Service | ||
public class PostService { | ||
|
||
private final RestClient restClient; | ||
private final HttpClientService httpClientService; | ||
|
||
public PostService(RestClient restClient) { | ||
this.restClient = restClient; | ||
public PostService(HttpClientService httpClientService) { | ||
this.httpClientService = httpClientService; | ||
} | ||
|
||
public List<PostDto> findAllPosts() { | ||
return restClient | ||
.get() | ||
.uri("/posts") | ||
.accept(MediaType.APPLICATION_JSON) | ||
.retrieve() | ||
.body(new ParameterizedTypeReference<List<PostDto>>() {}); | ||
return httpClientService.callAndFetchResponse( | ||
uriBuilder -> uriBuilder.path("/posts").build(), | ||
HttpMethod.GET, | ||
null, | ||
new ParameterizedTypeReference<List<PostDto>>() {}); | ||
} | ||
|
||
public Optional<PostDto> findPostById(Long id) { | ||
return Optional.ofNullable( | ||
restClient | ||
.get() | ||
.uri(uriBuilder -> uriBuilder.path("/posts/{postId}").build(id)) | ||
.accept(MediaType.APPLICATION_JSON) | ||
.retrieve() | ||
.onStatus( | ||
HttpStatusCode::is4xxClientError, | ||
(request, response) -> { | ||
throw new MyCustomRuntimeException( | ||
response.getStatusCode(), response.getHeaders()); | ||
}) | ||
.body(PostDto.class)); | ||
PostDto response = | ||
httpClientService.callAndFetchResponse( | ||
uriBuilder -> uriBuilder.path("/posts/{postId}").build(id), | ||
HttpMethod.GET, | ||
null, | ||
PostDto.class); | ||
return Optional.ofNullable(response); | ||
} | ||
|
||
public PostDto savePost(PostDto post) { | ||
return restClient | ||
.post() | ||
.uri("/posts") | ||
.contentType(MediaType.APPLICATION_JSON) | ||
.body(post) | ||
.retrieve() | ||
.body(PostDto.class); | ||
return httpClientService.callAndFetchResponse( | ||
uriBuilder -> uriBuilder.path("/posts").build(), | ||
HttpMethod.POST, | ||
post, | ||
PostDto.class); | ||
} | ||
|
||
public Optional<PostDto> updatePostById(Long id, PostDto postDto) { | ||
return Optional.ofNullable( | ||
restClient | ||
.put() | ||
.uri(uriBuilder -> uriBuilder.path("/posts/{postId}").build(id)) | ||
.contentType(MediaType.APPLICATION_JSON) | ||
.body(postDto) | ||
.retrieve() | ||
.onStatus( | ||
HttpStatusCode::is4xxClientError, | ||
(request, response) -> { | ||
throw new MyCustomRuntimeException( | ||
response.getStatusCode(), response.getHeaders()); | ||
}) | ||
.body(PostDto.class)); | ||
PostDto response = | ||
httpClientService.callAndFetchResponse( | ||
uriBuilder -> uriBuilder.path("/posts/{postId}").build(id), | ||
HttpMethod.PUT, | ||
postDto, | ||
PostDto.class); | ||
return Optional.ofNullable(response); | ||
} | ||
|
||
public String deletePostById(Long id) { | ||
return restClient | ||
.delete() | ||
.uri(uriBuilder -> uriBuilder.path("/posts/{postId}").build(id)) | ||
.retrieve() | ||
.body(String.class); | ||
return httpClientService.callAndFetchResponse( | ||
uriBuilder -> uriBuilder.path("/posts/{postId}").build(id), | ||
HttpMethod.DELETE, | ||
null, | ||
String.class); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@coderabbitai, can you please generate junits for this class using @AutoConfigureMockRestServiceServer and @SpringBootTest
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rajadilipkolli, here are the JUnit tests for the
PostService
class using@AutoConfigureMockRestServiceServer
and@SpringBootTest
. Each test ensures that the service methods interact correctly with theHttpClientService
.These tests mock the
HttpClientService
to verify thatPostService
is making the correct calls and handling the responses as expected. Let me know if you need any more specific scenarios tested or further modifications!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@coderabbitai, I don't see using
MockRestServiceServer
in the response, can you please use it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rajadilipkolli, I've revised the JUnit tests for the
PostService
class to explicitly useMockRestServiceServer
. This will allow us to set up expectations and responses for the HTTP requests made by the service methods. Here's the updated test class:These tests now use
MockRestServiceServer
to set up expectations on the HTTP requests and provide mock responses, ensuring thatPostService
is making the correct calls and handling the responses as expected. Let me know if you need any more specific scenarios tested or further modifications!