feat: have DatastoreException extend BaseHttpServiceException, convert gRPC status codes to existing Datastore codes #1409
Conversation
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
…t gRPC status codes to existing Datastore codes
product-auto-label
bot
added
the
api: datastore
gcf-owl-bot
bot
removed
the
owlbot:run
BenWhitehead
approved these changes
Apr 25, 2024
| GrpcToDatastoreCodeTranslation.grpcCodeToDatastoreStatusCode(gsc.getTransportCode()); | ||
| } | ||
|
|
||
| // If there is a gRPC exception in our cause change pull it's error message up to be our |
There was a problem hiding this comment.
Suggested change
| // If there is a gRPC exception in our cause change pull it's error message up to be our | |
| // If there is a gRPC exception in our cause, pull it's error message up to be our |
There was a problem hiding this comment.
Fixed in subsequent commit.
| @@ -1316,6 +1319,12 @@ public void testUpdate() { | |||
| datastore.delete(ENTITY3.getKey()); | |||
| } | |||
|
|
|||
| private void assertDatastoreException( | |||
| DatastoreException expected, String reason, int datastoreStatusCode) { | |||
There was a problem hiding this comment.
nit: this naming feels backward to me. I interpret expected as the value that is expected to hold in the assertion, not the exception that was expected to be thrown.
May not be worth the hassell, but I prefer the following pattern for asserting exceptions that are expected to be thrown:
DatastoreException datastoreException = org.junit.Assert.assertThrows(DatastoreException.class, () -> datastore.update(ENTITY3));
com.google.common.truth.Truth.assertThat(datastoreException.getReason()).isEqualTo(NOT_FOUND.name());
com.google.common.truth.Truth.assertThat(datastoreException.getCode()).isEqualTo(5);There was a problem hiding this comment.
I like it! I've made these updates.
gcf-owl-bot
bot
removed
the
owlbot:run
danieljbruce
approved these changes
Apr 25, 2024
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.
Building on top of changes in #1400, this PR reverts the updates in #1244 and instead translates gRPC error codes into existing Datastore ones.
This follows the same logic and patterns as in java-storage: https://github.com/googleapis/java-storage/blob/main/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcToHttpStatusCodeTranslation.java