Fix a bug where a JSON file cannot be watched and fetched as String #511
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
Motivation: A user might want to watch and fetch a JSON file as String. Currently, it's not possible. Modifications: - Add `contetType` to `Query` which indicates the type of the file being queried. - Remove JSON related annotations in `Query` and its subclases. - `Query` is not directly (de)serialized into JSON. - Remove `QueryDto` and `NamedQueryDto` which are not used. Result: - You can now fetch and watch a JSON as String.
Codecov Report
@@ Coverage Diff @@
## master #511 +/- ##
============================================
+ Coverage 69.58% 69.74% +0.16%
- Complexity 3152 3168 +16
============================================
Files 327 325 -2
Lines 12755 12747 -8
Branches 1356 1362 +6
============================================
+ Hits 8875 8891 +16
+ Misses 3021 2994 -27
- Partials 859 862 +3 Continue to review full report at Codecov.
|
trustin
reviewed
Apr 6, 2020
common/src/main/java/com/linecorp/centraldogma/common/QueryType.java
Outdated
Show resolved
Hide resolved
trustin
approved these changes
Apr 6, 2020
ikhoon
approved these changes
Apr 6, 2020
| @@ -894,7 +897,7 @@ private static Revision watchRepository(AggregatedHttpResponse res) { | |||
| return client.execute(builder.build()).aggregate() | |||
| .handle((res, cause) -> { | |||
| if (cause == null) { | |||
| return func.apply(res); | |||
| return func.apply(res, queryType); | |||
| } | |||
|
|
|||
| if ((cause instanceof ClosedSessionException || | |||
There was a problem hiding this comment.
nit: Could remove ClosedSessionException (not related to this PR 😉)
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.
Motivation:
A user might want to watch and fetch a JSON file as String. Currently, it's not possible.
Modifications:
IDENTITY_TEXTandIDENTITY_JSONtoQueryType.Queryand its subclasses.Queryis not directly (de)serialized into JSON.QueryDtoandNamedQueryDtowhich are not used.Result: