This repository was archived by the owner on Sep 26, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 102
feat: introduce HttpJsonClientCall, Listeners infrastructure and ServerStreaming support in REST transport #1599
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c382b4a
feat: Introduce HttpJsonClientCall, Listeners infrastructure and Serv…
vam-google c86cf8b
roollback `duplicatesStrategy = 'include'` change in build.gradle
vam-google d0faae4
address PR feedback
vam-google 27748aa
add missing stream timeout configs to `HttpJsonCallContext`
vam-google 2e2da06
cleanup and rename a few things
vam-google 0f7edc8
replace ReentrantLock with synchronized. Simplify active delivery loo…
vam-google 912e504
address PR feedback
vam-google ad57564
Merge remote-tracking branch 'upstream/main'
vam-google File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
78 changes: 78 additions & 0 deletions
78
gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonApiExceptionFactory.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright 2022 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.google.api.gax.httpjson; | ||
|
|
||
| import com.google.api.client.http.HttpResponseException; | ||
| import com.google.api.gax.rpc.ApiException; | ||
| import com.google.api.gax.rpc.ApiExceptionFactory; | ||
| import com.google.api.gax.rpc.StatusCode; | ||
| import com.google.api.gax.rpc.StatusCode.Code; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import java.util.Set; | ||
| import java.util.concurrent.CancellationException; | ||
|
|
||
| class HttpJsonApiExceptionFactory { | ||
| private final Set<Code> retryableCodes; | ||
|
|
||
| HttpJsonApiExceptionFactory(Set<Code> retryableCodes) { | ||
| this.retryableCodes = ImmutableSet.copyOf(retryableCodes); | ||
| } | ||
|
|
||
| ApiException create(Throwable throwable) { | ||
| if (throwable instanceof HttpResponseException) { | ||
| HttpResponseException e = (HttpResponseException) throwable; | ||
| StatusCode statusCode = HttpJsonStatusCode.of(e.getStatusCode()); | ||
| boolean canRetry = retryableCodes.contains(statusCode.getCode()); | ||
| String message = e.getStatusMessage(); | ||
| return createApiException(throwable, statusCode, message, canRetry); | ||
| } else if (throwable instanceof HttpJsonStatusRuntimeException) { | ||
| HttpJsonStatusRuntimeException e = (HttpJsonStatusRuntimeException) throwable; | ||
| StatusCode statusCode = HttpJsonStatusCode.of(e.getStatusCode()); | ||
| return createApiException( | ||
| throwable, statusCode, e.getMessage(), retryableCodes.contains(statusCode.getCode())); | ||
| } else if (throwable instanceof CancellationException) { | ||
chanseokoh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return ApiExceptionFactory.createException( | ||
| throwable, HttpJsonStatusCode.of(Code.CANCELLED), false); | ||
| } else if (throwable instanceof ApiException) { | ||
| return (ApiException) throwable; | ||
| } else { | ||
| // Do not retry on unknown throwable, even when UNKNOWN is in retryableCodes | ||
| return ApiExceptionFactory.createException( | ||
chanseokoh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| throwable, HttpJsonStatusCode.of(StatusCode.Code.UNKNOWN), false); | ||
| } | ||
| } | ||
|
|
||
| private ApiException createApiException( | ||
| Throwable throwable, StatusCode statusCode, String message, boolean canRetry) { | ||
| return message == null | ||
| ? ApiExceptionFactory.createException(throwable, statusCode, canRetry) | ||
| : ApiExceptionFactory.createException(message, throwable, statusCode, canRetry); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.