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 104
[LRO] Add ApiMessageOperationTransformer #683
Merged
andreamlin
merged 13 commits into
googleapis:master
from
andreamlin:just_apimessageoptransformers
Mar 5, 2019
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
d9b7641
add diff
andreamlin 67482da
2019
andreamlin 2ab22dd
string.format exception message
andreamlin f2abc31
make 200-299 codes 200
andreamlin d3230f5
move SuppressWarnings to the line that triggers it
andreamlin 681bc98
again move suppresswarnings
andreamlin 40ecd2e
helper method transformEntityFromOperationSnapshot
andreamlin d1f3bb1
renaming
andreamlin a19e0dd
formatting
andreamlin b5cec71
rebase on master
andreamlin a53600a
revert status code
andreamlin ac2fd7c
revert again
andreamlin a311056
comment for 2xx
andreamlin 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
122 changes: 122 additions & 0 deletions
122
gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageOperationTransformers.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,122 @@ | ||
| /* | ||
| * Copyright 2019 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.core.ApiFunction; | ||
| import com.google.api.core.BetaApi; | ||
| import com.google.api.gax.longrunning.OperationSnapshot; | ||
| import com.google.api.gax.rpc.ApiExceptionFactory; | ||
| import com.google.api.gax.rpc.StatusCode.Code; | ||
|
|
||
| /** | ||
| * Transformers from OperationSnapshot wrappers to the underlying native ApiMessage objects. Public | ||
| * for technical reasons; intended for use by generated code. | ||
| */ | ||
| @BetaApi("The surface for use by generated code is not stable yet and may change in the future.") | ||
| public class ApiMessageOperationTransformers { | ||
| private ApiMessageOperationTransformers() {} | ||
|
|
||
| public static class ResponseTransformer<ResponseT extends ApiMessage> | ||
| implements ApiFunction<OperationSnapshot, ResponseT> { | ||
| private final Class<ResponseT> responseTClass; | ||
|
|
||
| private ResponseTransformer(Class<ResponseT> responseTClass) { | ||
| this.responseTClass = responseTClass; | ||
| } | ||
|
|
||
| /** Unwraps an OperationSnapshot and returns the contained method response message. */ | ||
| public ResponseT apply(OperationSnapshot operationSnapshot) { | ||
| if (!operationSnapshot.getErrorCode().getCode().equals(Code.OK)) { | ||
| // We potentially need to handle 2xx codes that are also successful. | ||
| throw ApiExceptionFactory.createException( | ||
| String.format( | ||
| "Operation with name \"%s\" failed with status = %s and message = %s", | ||
| operationSnapshot.getName(), | ||
| operationSnapshot.getErrorCode(), | ||
| operationSnapshot.getErrorMessage()), | ||
| null, | ||
| operationSnapshot.getErrorCode(), | ||
| false); | ||
| } | ||
| return transformEntityFromOperationSnapshot( | ||
| operationSnapshot, responseTClass, operationSnapshot.getResponse(), "response"); | ||
| } | ||
|
|
||
| public static <ResponseT extends ApiMessage> | ||
| ApiMessageOperationTransformers.ResponseTransformer<ResponseT> create( | ||
| Class<ResponseT> packedClass) { | ||
| return new ApiMessageOperationTransformers.ResponseTransformer<>(packedClass); | ||
| } | ||
| } | ||
|
|
||
| public static class MetadataTransformer<MetadataT extends ApiMessage> | ||
| implements ApiFunction<OperationSnapshot, MetadataT> { | ||
| private final Class<MetadataT> metadataTClass; | ||
|
|
||
| private MetadataTransformer(Class<MetadataT> metadataTClass) { | ||
| this.metadataTClass = metadataTClass; | ||
| } | ||
|
|
||
| /** Unwraps an OperationSnapshot and returns the contained operation metadata message. */ | ||
| @Override | ||
| public MetadataT apply(OperationSnapshot operationSnapshot) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems like this is same logic as in the response transformer (the "response type" and "metadata type" in error message string can be a parameter). Please consider putting this in helper method and reuse it (static or make transformers extend same class and put this method in the parent class).
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done; implemented in |
||
| return transformEntityFromOperationSnapshot( | ||
| operationSnapshot, metadataTClass, operationSnapshot.getMetadata(), "metadata"); | ||
| } | ||
|
|
||
| public static <MetadataT extends ApiMessage> | ||
| ApiMessageOperationTransformers.MetadataTransformer<MetadataT> create( | ||
| Class<MetadataT> packedClass) { | ||
| return new ApiMessageOperationTransformers.MetadataTransformer<>(packedClass); | ||
| } | ||
| } | ||
|
|
||
| private static <T extends ApiMessage> T transformEntityFromOperationSnapshot( | ||
| OperationSnapshot operationSnapshot, | ||
| Class<T> clazz, | ||
| Object operationEntity, | ||
| String entityName) { | ||
| if (!clazz.isAssignableFrom(operationEntity.getClass())) { | ||
| throw ApiExceptionFactory.createException( | ||
| new Throwable( | ||
| String.format( | ||
| "Operation with name \"%s\" succeeded, but its %s type %s cannot be cast to %s.", | ||
| operationSnapshot.getName(), | ||
| entityName, | ||
| operationEntity.getClass().getCanonicalName(), | ||
| clazz.getCanonicalName())), | ||
| operationSnapshot.getErrorCode(), | ||
| false); | ||
| } | ||
| @SuppressWarnings("unchecked") | ||
| T typedEntity = (T) operationEntity; | ||
| return typedEntity; | ||
| } | ||
| } | ||
229 changes: 229 additions & 0 deletions
229
...tpjson/src/test/java/com/google/api/gax/httpjson/ApiMessageOperationTransformersTest.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,229 @@ | ||
| /* | ||
| * Copyright 2019 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.gax.httpjson.ApiMessageOperationTransformers.MetadataTransformer; | ||
| import com.google.api.gax.httpjson.ApiMessageOperationTransformers.ResponseTransformer; | ||
| import com.google.api.gax.httpjson.testing.FakeApiMessage; | ||
| import com.google.api.gax.longrunning.OperationSnapshot; | ||
| import com.google.api.gax.rpc.ApiException; | ||
| import com.google.api.gax.rpc.StatusCode; | ||
| import com.google.api.gax.rpc.StatusCode.Code; | ||
| import com.google.api.gax.rpc.UnavailableException; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import com.google.common.truth.Truth; | ||
| import java.util.List; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.ExpectedException; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.JUnit4; | ||
|
|
||
| /** Tests for ApiMessageOperationTransformers. */ | ||
| @RunWith(JUnit4.class) | ||
| public class ApiMessageOperationTransformersTest { | ||
| @Rule public ExpectedException thrown = ExpectedException.none(); | ||
|
|
||
| @Test | ||
| public void testResponseTransformer() { | ||
| ResponseTransformer<EmptyMessage> transformer = ResponseTransformer.create(EmptyMessage.class); | ||
| EmptyMessage emptyResponse = EmptyMessage.getDefaultInstance(); | ||
|
|
||
| FakeMetadataMessage metadata = new FakeMetadataMessage(Status.PENDING, Code.OK); | ||
| OperationSnapshot operationSnapshot = | ||
| new OperationSnapshotImpl( | ||
| new FakeOperationMessage<>("Pending; no response method", emptyResponse, metadata)); | ||
|
|
||
| Truth.assertThat(transformer.apply(operationSnapshot)).isEqualTo(emptyResponse); | ||
| } | ||
|
|
||
| @Test | ||
| public void testResponseTransformer_exception() { | ||
| thrown.expect(UnavailableException.class); | ||
| ResponseTransformer<EmptyMessage> transformer = ResponseTransformer.create(EmptyMessage.class); | ||
| EmptyMessage emptyResponse = EmptyMessage.getDefaultInstance(); | ||
| FakeMetadataMessage metadata = new FakeMetadataMessage(Status.PENDING, Code.UNAVAILABLE); | ||
| OperationSnapshot operationSnapshot = | ||
| new OperationSnapshotImpl( | ||
| new FakeOperationMessage<>("Unavailable; no response method", emptyResponse, metadata)); | ||
|
|
||
| Truth.assertThat(transformer.apply(operationSnapshot)).isEqualTo(emptyResponse); | ||
| } | ||
|
|
||
| @Test | ||
| public void testResponseTransformer_mismatchedTypes() { | ||
| thrown.expect(ApiException.class); | ||
| thrown.expectMessage("cannot be cast"); | ||
| ResponseTransformer<EmptyMessage> transformer = ResponseTransformer.create(EmptyMessage.class); | ||
| FakeMetadataMessage metadata = new FakeMetadataMessage(Status.PENDING, Code.OK); | ||
| ApiMessage bananaResponse = | ||
| new FakeApiMessage(ImmutableMap.<String, Object>of("name", "banana"), null, null); | ||
| EmptyMessage emptyResponse = EmptyMessage.getDefaultInstance(); | ||
| OperationSnapshot operationSnapshot = | ||
| new OperationSnapshotImpl( | ||
| new FakeOperationMessage<>("No response method", bananaResponse, metadata)); | ||
| Truth.assertThat(transformer.apply(operationSnapshot)).isEqualTo(emptyResponse); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMetadataTransformer() { | ||
| MetadataTransformer<FakeMetadataMessage> transformer = | ||
| MetadataTransformer.create(FakeMetadataMessage.class); | ||
| EmptyMessage returnType = EmptyMessage.getDefaultInstance(); | ||
| FakeMetadataMessage metadataMessage = new FakeMetadataMessage(Status.PENDING, Code.OK); | ||
| FakeOperationMessage operation = new FakeOperationMessage<>("foo", returnType, metadataMessage); | ||
| OperationSnapshot operationSnapshot = new OperationSnapshotImpl(operation); | ||
| Truth.assertThat(transformer.apply(operationSnapshot)).isEqualTo(metadataMessage); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMetadataTransformer_mismatchedTypes() { | ||
| thrown.expect(ApiException.class); | ||
| thrown.expectMessage("cannot be cast"); | ||
| MetadataTransformer<FakeOperationMessage> transformer = | ||
| MetadataTransformer.create(FakeOperationMessage.class); | ||
| FakeMetadataMessage metadataMessage = new FakeMetadataMessage(Status.PENDING, Code.OK); | ||
| ApiMessage bananaResponse = | ||
| new FakeApiMessage(ImmutableMap.<String, Object>of("name", "banana"), null, null); | ||
| FakeOperationMessage metadata = | ||
| new FakeOperationMessage<>("No response method", bananaResponse, metadataMessage); | ||
| OperationSnapshot operationSnapshot = new OperationSnapshotImpl(metadata); | ||
| Truth.assertThat(transformer.apply(operationSnapshot)).isEqualTo(bananaResponse); | ||
| } | ||
|
|
||
| private enum Status { | ||
| PENDING, | ||
| DONE | ||
| } | ||
|
|
||
| private static class FakeMetadataMessage<ResponseT extends ApiMessage> implements ApiMessage { | ||
|
|
||
| private final Status status; | ||
| private final Code code; | ||
|
|
||
| public FakeMetadataMessage(Status status, Code code) { | ||
| this.status = status; | ||
| this.code = code; | ||
| } | ||
|
|
||
| public Object getFieldValue(String fieldName) { | ||
| if ("status".equals(fieldName)) { | ||
| return status; | ||
| } | ||
| if ("code".equals(fieldName)) { | ||
| return code; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public List<String> getFieldMask() { | ||
| return null; | ||
| } | ||
|
|
||
| public ApiMessage getApiMessageRequestBody() { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| private static class FakeOperationMessage< | ||
| ResponseT extends ApiMessage, MetadataT extends ApiMessage> | ||
| implements ApiMessage { | ||
|
|
||
| private final String name; | ||
| private final ResponseT responseT; | ||
| private final MetadataT metadata; | ||
|
|
||
| public FakeOperationMessage(String name, ResponseT responseT, MetadataT metadata) { | ||
| this.name = name; | ||
| this.responseT = responseT; | ||
| this.metadata = metadata; | ||
| } | ||
|
|
||
| public Object getFieldValue(String fieldName) { | ||
| if ("name".equals(fieldName)) { | ||
| return name; | ||
| } | ||
| if ("responseT".equals(fieldName)) { | ||
| return responseT; | ||
| } | ||
| if ("metadata".equals(fieldName)) { | ||
| return metadata; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public List<String> getFieldMask() { | ||
| return null; | ||
| } | ||
|
|
||
| public ResponseT getApiMessageRequestBody() { | ||
| return responseT; | ||
| } | ||
| } | ||
|
|
||
| private static class OperationSnapshotImpl implements OperationSnapshot { | ||
|
|
||
| private final FakeOperationMessage operation; | ||
|
|
||
| public OperationSnapshotImpl(FakeOperationMessage operation) { | ||
| this.operation = operation; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return (String) operation.getFieldValue("name"); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getMetadata() { | ||
| return operation.metadata; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isDone() { | ||
| return operation.metadata.getFieldValue("status") != Status.PENDING; | ||
| } | ||
|
|
||
| @Override | ||
| public Object getResponse() { | ||
| return operation.getApiMessageRequestBody(); | ||
| } | ||
|
|
||
| @Override | ||
| public StatusCode getErrorCode() { | ||
| return HttpJsonStatusCode.of((Code) operation.metadata.getFieldValue("code")); | ||
| } | ||
|
|
||
| @Override | ||
| public String getErrorMessage() { | ||
| return ((Code) operation.metadata.getFieldValue("code")).name(); | ||
| } | ||
| } | ||
| } |
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.
Same issue applies to
ProtoOperationTransformers. It looks like we are interested if the call was successful or no. This treats only200as success, but any2xxcode can be considered success HTTP Status Codes.Though, this is unlikely that we can get anything but
200here for success in practical cases (maybe201also). Please add at least a comment about "potential need to handle other error codes". If that ever happens (other than 200 success status code returned) it may save time for those who will be fixing it.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.
TIL
See the new diff in HttpJsonStatusCode.java to squash all 2xx codes into the OK 200 code.
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.
Please add a comment here about potential need to handle more than only 200.