Update OpenAPI Spec & Merge Files API #139
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
…m-for-request-and-response-bodies
…-bodies # Conflicts: # .codegen/_openapi_sha
…m-for-request-and-response-bodies
…m-for-request-and-response-bodies
…m-for-request-and-response-bodies
nfx
reviewed
Aug 19, 2023
.codegen/impl.java.tmpl
Outdated
|
|
||
| {{ define "headers" -}} | ||
| Map<String, String> headers = new HashMap<>(); |
There was a problem hiding this comment.
this results in the unnecessary diff and headers variable for literally every single method. surround it with if and make sure there's no diff in the unaffected methods
Suggested change
| Map<String, String> headers = new HashMap<>(); | |
| {{if .FixedRequestHeaders}} | |
| ... what you have here | |
| {{end}} |
.codegen/impl.java.tmpl
Outdated
| {{- else}}{{template "type" .Response}} | ||
| {{- end -}}{{else}}, Void{{end}}.class); | ||
| {{end}} | ||
| {{ template "headers" . -}} |
There was a problem hiding this comment.
Suggested change
| {{ template "headers" . -}} | |
| {{- template "headers" . -}} |
to cut whitespace before
.codegen/impl.java.tmpl
Outdated
| {{- else if .Response.ArrayValue -}} return apiClient.getCollection(path, null, {{template "type" .Response.ArrayValue}}.class, headers); | ||
| {{- else if .Response.MapValue -}} return apiClient.getStringMap(path, {{ template "request-param" .}}, headers); | ||
| {{- else if .IsResponseByteStream -}} | ||
| InputStream response = {{ template "api-call" . }} |
There was a problem hiding this comment.
why not returning InputStream as a result type? it makes sense to return a wrapping response type only if there's more than one field in it, otherwise it's confusing.
.codegen/impl.java.tmpl
Outdated
| {{ template "headers" . -}} | ||
| {{ if not .Response -}} | ||
| {{ template "api-call" . }} | ||
| {{- else if .Response.ArrayValue -}} return apiClient.getCollection(path, null, {{template "type" .Response.ArrayValue}}.class, headers); |
There was a problem hiding this comment.
why this cannot be solved with overloading?
Suggested change
| {{- else if .Response.ArrayValue -}} return apiClient.getCollection(path, null, {{template "type" .Response.ArrayValue}}.class, headers); | |
| {{- else if .Response.ArrayValue -}} return apiClient.getCollection(path, null, {{template "type" .Response.ArrayValue}}.class{{.HasRequestReaders}}, headers{{end}}); |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 24, 2023
## Changes Query parameters are determined reflectively from request classes by scanning for fields with a QueryParam annotation. Serialization of query parameters is recursive in order to support complex types like the filter structures used for listing in the SQL query history service. This PR makes the following changes: 1. Terminate recursion when the request field is an enum. 2. When iterating through the request object's fields, skip any fields not annotated with QueryParam (but recursively, all fields do need to be serialized). 3. Rename the inner class from HeaderEntry to QueryParamPair (it represents query param pairs, not header entries). ## Tests Test for this change is dependent on other testing refactors that will be merged as part of #139.
mgyucht
commented
Aug 28, 2023
| @@ -84,8 +84,7 @@ private Response computeResponse(Request in, CloseableHttpResponse response) thr | |||
| boolean streamResponse = | |||
| in.getHeaders().containsKey("Accept") | |||
| && !APPLICATION_JSON.getMimeType().equals(in.getHeaders().get("Accept")) | |||
| && hs.containsKey("Content-Type") | |||
There was a problem hiding this comment.
This is needed because header keys are not case-sensitive (esp. if response is HTTP 2.0, which enforces header keys to be lower case). In theory, the same check applies to request headers, but we know the case used because we control it.
tanmay-db
approved these changes
Aug 28, 2023
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.
Changes
This PR adds recent changes from OpenAPI to the Java SDK. Notably, it adds support for the Files API. The integration test for this API can only be run in UC workspaces, so this PR also adds support for UC-only integration tests at the workspace- and account-level.
Tests