DHIS2-18568: allow Route response timeout to be customised #19872
Conversation
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
Contributor
cjmamo
commented
Feb 6, 2025
cjmamo
commented
- Replaced blocking route HTTP client with non-blocking client to remove connection pool
- Allowing route response timeout to be customised
perf: use non-blocking WebClient instead of RestTemplate
tolerate HTTP errors in WebClient test: add test coverage for response timeout and HTTP errors
cjmamo
changed the title
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/route/RouteService.java
Outdated
Show resolved
Hide resolved
use int instead of Integer for responseTimeout to remove null checks remove redundant annotations rename references use `Json.object` instead handcrafting JSON in RouteService
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dhis-2/dhis-api/src/main/java/org/hisp/dhis/route/Route.java
Dismissed
Show dismissed
Hide dismissed
|
|
Instance deployed to https://dev.im.dhis2.org/pr-19872 |
amcgee
approved these changes
Feb 10, 2025
jbee
approved these changes
Feb 10, 2025
| @@ -48,6 +48,7 @@ | |||
| @EqualsAndHashCode(callSuper = true) | |||
| @Accessors(chain = true) | |||
| public class Route extends BaseIdentifiableObject implements MetadataObject { | |||
| public static final String DEFAULT_RESPONSE_TIMEOUT_SECONDS = "5"; | |||
There was a problem hiding this comment.
FYI: You can declare the constant as an int and use ""+DEFAULT_RESPONSE_TIMEOUT_SECONDS in the annotation to turn it into a string.
| throwable -> { | ||
| JsonObject message = | ||
| Json.object( | ||
| jsonObjectBuilder -> |
There was a problem hiding this comment.
I'd name this just obj or object because in the scope where the variable is valid it reads much better to pretend this is already an object. The "building" will happen implicitly at the end of the scope so it doesn't add anything to make the reader aware that the interface you are using is in fact a builder.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.