This repository was archived by the owner on Sep 26, 2023. It is now read-only.
Parse ResourceName into http endpoint path - #481
Merged
andreamlin merged 46 commits intoMar 7, 2018
Merged
andreamlin merged 46 commits into
andreamlin merged 46 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Starting implementation for HTTP/JSON. This was tested by using the surface generated from https://github.com/googleapis/toolkit/tree/discogapic to list, get, insert, and delete Compute Address resources in a live Google Cloud project.
Exception handling and retry logic for http calls.
Merge in updates from the master branch.
…p http status codes to wrapper exception types
Copy link
Copy Markdown
Contributor
Author
|
Made the suggested changes. PTAL |
Sorry, something went wrong.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessage.java
Outdated
|
|
||
| @BetaApi | ||
| public interface ApiMessage { | ||
| /* For a each fieldName in a set of fieldNames, fetch that field's List<String> value. */ |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessage.java
Outdated
| ApiMessage getRequestBody(); | ||
| ApiMessage getApiMessageRequestBody(); | ||
|
|
||
| Map<String, String> getApiMessagePathParams(); |
This comment was marked as spam.
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
Author
|
Made the suggested changes. PTAL |
Sorry, something went wrong.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
Outdated
| apiMessage.populateFieldsInMap(Collections.singleton(resourceNameField)); | ||
|
|
||
| String resourceNamePath = pathParamMap.get(resourceNameField).get(0); | ||
| return resourceNameInstance.parseFrom(resourceNamePath).getFieldValues(); |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
Outdated
| return pathParams; | ||
| public Map<String, String> getPathParams(T apiMessage, String resourceNameField) { | ||
| Map<String, List<String>> pathParamMap = | ||
| apiMessage.populateFieldsInMap(Collections.singleton(resourceNameField)); |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ResourceNameStruct.java
Outdated
| public interface ResourceNameStruct extends ResourceName { | ||
| /* Fetch the comprehensive mapping of fieldNames to values. The set of keys of the resulting Map | ||
| should be constant, for a given instance of this interface. */ | ||
| Map<String, String> getFieldValues(); |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
Outdated
| Map<String, List<String>> pathParamMap = | ||
| apiMessage.populateFieldsInMap(Collections.singleton(resourceNameField)); | ||
|
|
||
| String resourceNamePath = pathParamMap.get(resourceNameField).get(0); |
This comment was marked as spam.
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
Author
|
Blocked on googleapis/api-common-java#46. |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
|
PTAL The gradle build task passes for me locally. |
Sorry, something went wrong.
|
|
||
| /* Return a new instance of this interface by parsing a formatted String. This should be treated as a static method. */ | ||
| ResourceNameStruct parseFrom(String formattedString); | ||
| } |
This comment was marked as spam.
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
|
I believe that verifyLicense is failing because of #487 ; I think travis might locally merge your changes to master and run the build on that. |
Sorry, something went wrong.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
| String resourceNamePath = apiMessage.getFieldStringValue(resourceNameField); | ||
| if (resourceNamePath == null) { | ||
| throw new IOException( | ||
| String.format("Resource name field %s is null in message object.", resourceNameField)); |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
Outdated
| @Override | ||
| public Map<String, String> getPathParams(T apiMessage, String resourceNameField) | ||
| throws IOException { | ||
| throws IllegalArgumentException { |
This comment was marked as spam.
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
Author
|
Ok, two api-common releases later and this build passes! Further comments welcome. PTAL |
Sorry, something went wrong.
garrettjonesgoogle
approved these changes
Mar 7, 2018
garrettjonesgoogle
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
LGTM
Sorry, something went wrong.
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Reviewers
1 more reviewer3 participants
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.
Moving parsing of ResourceNames to gax-java (instead of generated message classes). See googleapis/gapic-generator#1847.