[ALS-4412] - Implement query ID API endpoints #111
Merged
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
Member
Luke-Sikina
commented
Apr 20, 2023
Luke-Sikina
commented
- Implement proxy query, queryStatus, and queryResult methods
- Deduplicate code
- Fix 2xx predicates that I broke
- Make logging more consistent
- Check for 2xx response codes, not just 200
- Deduplicate constructor code
- Make some constants final
- Make logging more consistent - Check for 2xx response codes, not just 200 - Deduplicate constructor code - Make some constants final
- Implement proxy query, queryStatus, and queryResult methods - Deduplicate code - Fix 2xx predicates
Luke-Sikina
commented
Apr 20, 2023
| if (response.getStatusLine().getStatusCode() != 200) { | ||
| String composedURL = HttpClientUtil.composeURL(properties.getTargetPicsureUrl(), pathName); | ||
| HttpResponse response = HttpClientUtil.retrievePostResponse(composedURL, headers, payload); | ||
| if (HttpClientUtil.is2xx(response)) { |
There was a problem hiding this comment.
!= 200 is a bit flawed imo. I think all 2xx codes are valid.
Comment on lines
155
to
161
| if (searchRequest == null) { | ||
| if (searchRequest == null || searchRequest.getQuery() == null) { | ||
| throw new ProtocolException(ProtocolException.MISSING_DATA); | ||
| } | ||
| Object search = searchRequest.getQuery(); | ||
| if (search == null) { | ||
| throw new ProtocolException((ProtocolException.MISSING_DATA)); | ||
| } |
There was a problem hiding this comment.
We do this check like 3 different ways. I tried to normalize it a bit.
Comment on lines
158
to
160
| String composedURL = HttpClientUtil.composeURL(properties.getTargetPicsureUrl(), pathName); | ||
| HttpResponse response = HttpClientUtil.retrievePostResponse(composedURL, headers, payload); | ||
| if (HttpClientUtil.is2xx(response)) { |
There was a problem hiding this comment.
Normalizing this pattern across endpoints so I can pull it out later.
| logger.error( | ||
| composedURL + " calling resource with id " + resourceUUID + " did not return a 200: {} {} ", | ||
| "{} calling resource with id {} did not return a 200: {} {} ", composedURL, resourceUUID, |
There was a problem hiding this comment.
Don't know why we were templating half of this.
| response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()); | ||
| throwResponseError(response, targetPicsureUrl); | ||
| HttpClientUtil.throwResponseError(response, properties.getTargetPicsureUrl()); |
There was a problem hiding this comment.
I prefer to qualify these static methods. One step closer to actual DI, and it makes it a bit easier to grok.
| } | ||
|
|
||
|
|
||
| HttpEntity entity = response.getEntity(); | ||
| String entityString = EntityUtils.toString(entity, "UTF-8"); | ||
| String responseString = entityString; | ||
|
|
||
| if(expectedResultType.equals("COUNT")) { | ||
| if("COUNT".equals(expectedResultType)) { |
There was a problem hiding this comment.
Lead with constant values in equals. 1 less way to get npes
| throw new ApplicationException( | ||
| "Error encoding search for resource with id " + searchRequest.getResourceUUID()); | ||
| } | ||
| checkQuery(searchRequest); |
There was a problem hiding this comment.
Not thrilled about all the exception based control flow, but we'll leave that for another PR.
ramari16
reviewed
Apr 20, 2023
| @@ -46,6 +46,10 @@ public class HttpClientUtil { | |||
|
|
|||
| private static final Logger logger = LoggerFactory.getLogger(HttpClientUtil.class); | |||
|
|
|||
| public static boolean is2xx(HttpResponse response) { | |||
There was a problem hiding this comment.
Wow this version of httpclient is old
- Added coverage to AggregateDataSharingResourceRS - Made a helper class for those tests - Fixed a marshalling bug
Luke-Sikina
added a commit
that referenced
this pull request
Jul 26, 2023
* Refactoring AggDataSharingResourceRS - Make logging more consistent - Check for 2xx response codes, not just 200 - Deduplicate constructor code - Make some constants final * [ALS-4412] - Implement query ID API endpoints - Implement proxy query, queryStatus, and queryResult methods - Deduplicate code - Fix 2xx predicates * Unit tests + bug fixes - Added coverage to AggregateDataSharingResourceRS - Made a helper class for those tests - Fixed a marshalling bug * Do not persist to common area repo
Luke-Sikina
added a commit
that referenced
this pull request
Jul 26, 2023
* Refactoring AggDataSharingResourceRS - Make logging more consistent - Check for 2xx response codes, not just 200 - Deduplicate constructor code - Make some constants final - Fix 2xx predicates * Unit tests + bug fixes - Added coverage to AggregateDataSharingResourceRS - Made a helper class for those tests - Fixed a marshalling bug * Do not persist to common area repo
Luke-Sikina
added a commit
that referenced
this pull request
Jul 27, 2023
* Refactoring AggDataSharingResourceRS - Make logging more consistent - Check for 2xx response codes, not just 200 - Deduplicate constructor code - Make some constants final - Fix 2xx predicates * Unit tests + bug fixes - Added coverage to AggregateDataSharingResourceRS - Made a helper class for those tests - Fixed a marshalling bug * Do not persist to common area repo
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.