feat(gax): allow non-JSON HttpContent and absolute target URLs in HttpRequest Formatter and Runnable #14085
+140
−27
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,19 +31,24 @@ | |
|
|
||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import com.google.api.client.http.ByteArrayContent; | ||
| import com.google.api.client.http.EmptyContent; | ||
| import com.google.api.client.http.HttpContent; | ||
| import com.google.api.client.http.HttpRequest; | ||
| import com.google.api.client.testing.http.MockHttpTransport; | ||
| import com.google.api.gax.tracing.ApiTracer; | ||
| import com.google.api.pathtemplate.PathTemplate; | ||
| import com.google.common.truth.Truth; | ||
| import com.google.longrunning.ListOperationsRequest; | ||
| import com.google.protobuf.ByteString; | ||
| import com.google.protobuf.Empty; | ||
| import com.google.protobuf.Field; | ||
| import com.google.protobuf.util.JsonFormat; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
|
|
@@ -326,4 +331,110 @@ void testUpdateRunnableTimeout_shouldUpdate() throws IOException { | |
| Truth.assertThat(httpRequest.getReadTimeout()).isEqualTo(30000L); | ||
| Truth.assertThat(httpRequest.getConnectTimeout()).isEqualTo(30000L); | ||
| } | ||
|
|
||
| @Test | ||
| void testNonJsonHttpContent() throws IOException { | ||
| ByteString rawPayload = ByteString.copyFromUtf8("binary \0 raw \1 payload"); | ||
| HttpRequestFormatter<Field> binaryRequestFormatter = | ||
| new HttpRequestFormatter<Field>() { | ||
| @Override | ||
| public Map<String, List<String>> getQueryParamNames(Field apiMessage) { | ||
| return Collections.emptyMap(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getRequestBody(Field apiMessage) { | ||
| return ""; | ||
| } | ||
|
|
||
| @Override | ||
| public HttpContent getHttpContent(Field apiMessage) { | ||
| return new ByteArrayContent("application/octet-stream", rawPayload.toByteArray()); | ||
| } | ||
|
|
||
| @Override | ||
| public String getPath(Field apiMessage) { | ||
| return "/upload"; | ||
| } | ||
|
|
||
| @Override | ||
| public PathTemplate getPathTemplate() { | ||
| return PathTemplate.create("{+path}"); | ||
| } | ||
| }; | ||
|
|
||
| ApiMethodDescriptor<Field, Empty> methodDescriptor = | ||
| ApiMethodDescriptor.<Field, Empty>newBuilder() | ||
| .setFullMethodName("upload.binary") | ||
| .setHttpMethod("POST") | ||
| .setRequestFormatter(binaryRequestFormatter) | ||
| .setResponseParser(responseParser) | ||
| .build(); | ||
|
|
||
| HttpRequestRunnable<Field, Empty> httpRequestRunnable = | ||
| new HttpRequestRunnable<>( | ||
| requestMessage, | ||
| methodDescriptor, | ||
| ENDPOINT, | ||
| HttpJsonCallOptions.newBuilder().build(), | ||
| new MockHttpTransport(), | ||
| HttpJsonMetadata.newBuilder().build(), | ||
| result -> {}); | ||
|
|
||
| HttpRequest httpRequest = httpRequestRunnable.createHttpRequest(); | ||
| Truth.assertThat(httpRequest.getContent()).isInstanceOf(ByteArrayContent.class); | ||
| Truth.assertThat(httpRequest.getContent().getType()).isEqualTo("application/octet-stream"); | ||
| try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { | ||
| httpRequest.getContent().writeTo(out); | ||
| Truth.assertThat(out.toByteArray()).isEqualTo(rawPayload.toByteArray()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testAbsoluteUrlSupport() throws IOException { | ||
| String absoluteUrl = "https://custom-upload-host.googleapis.com/upload/session/123?sid=abc"; | ||
| HttpRequestFormatter<Field> absoluteUrlFormatter = | ||
| new HttpRequestFormatter<Field>() { | ||
| @Override | ||
| public Map<String, List<String>> getQueryParamNames(Field apiMessage) { | ||
| return Collections.emptyMap(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getRequestBody(Field apiMessage) { | ||
| return ""; | ||
| } | ||
|
|
||
| @Override | ||
| public String getPath(Field apiMessage) { | ||
| return absoluteUrl; | ||
| } | ||
|
|
||
| @Override | ||
| public PathTemplate getPathTemplate() { | ||
| return PathTemplate.create("{+path}"); | ||
| } | ||
| }; | ||
|
|
||
| ApiMethodDescriptor<Field, Empty> methodDescriptor = | ||
| ApiMethodDescriptor.<Field, Empty>newBuilder() | ||
| .setFullMethodName("upload.absolute") | ||
| .setHttpMethod("POST") | ||
| .setRequestFormatter(absoluteUrlFormatter) | ||
| .setResponseParser(responseParser) | ||
| .build(); | ||
|
|
||
| HttpRequestRunnable<Field, Empty> httpRequestRunnable = | ||
| new HttpRequestRunnable<>( | ||
| requestMessage, | ||
| methodDescriptor, | ||
| ENDPOINT, | ||
| HttpJsonCallOptions.newBuilder().build(), | ||
| new MockHttpTransport(), | ||
| HttpJsonMetadata.newBuilder().build(), | ||
| result -> {}); | ||
|
|
||
| HttpRequest httpRequest = httpRequestRunnable.createHttpRequest(); | ||
| Truth.assertThat(httpRequest.getUrl().build()).isEqualTo(absoluteUrl); | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To make the absolute URL detection robust against uppercase schemes (e.g.,
HTTP://orHTTPS://) without allocating new string objects, consider usingregionMatcheswith case-insensitivity enabled.