Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit 61b1617

Browse files
authored
fix: Fix com.google.rpc.Code to StatusCode.Code conversion logic (#1508)
Also add tests for HTTP status code conversion (according to the current implementation, which may change in the future).
1 parent 0ba571a commit 61b1617

File tree

2 files changed

+132
-1
lines changed

2 files changed

+132
-1
lines changed

‎gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static StatusCode.Code rpcCodeToStatusCode(com.google.rpc.Code rpcCode) {
7474
case DEADLINE_EXCEEDED:
7575
return Code.DEADLINE_EXCEEDED;
7676
case NOT_FOUND:
77-
return Code.DEADLINE_EXCEEDED;
77+
return Code.NOT_FOUND;
7878
case ALREADY_EXISTS:
7979
return Code.ALREADY_EXISTS;
8080
case PERMISSION_DENIED:
Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
/*
2+
* Copyright 2021 Google LLC
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions are
6+
* met:
7+
*
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above
11+
* copyright notice, this list of conditions and the following disclaimer
12+
* in the documentation and/or other materials provided with the
13+
* distribution.
14+
* * Neither the name of Google LLC nor the names of its
15+
* contributors may be used to endorse or promote products derived from
16+
* this software without specific prior written permission.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
package com.google.api.gax.httpjson;
31+
32+
import static org.junit.Assert.assertEquals;
33+
import static org.junit.Assert.assertNotNull;
34+
import static org.junit.Assert.fail;
35+
36+
import com.google.api.gax.rpc.StatusCode;
37+
import java.util.Arrays;
38+
import java.util.HashSet;
39+
import java.util.Set;
40+
import org.junit.Test;
41+
42+
public class HttpJsonStatusCodeTest {
43+
44+
@Test
45+
public void rpcCodeToStatusCodeTest() {
46+
Set<StatusCode.Code> allCodes = new HashSet<>();
47+
for (com.google.rpc.Code rpcCode : com.google.rpc.Code.values()) {
48+
StatusCode.Code statusCode;
49+
try {
50+
statusCode = HttpJsonStatusCode.rpcCodeToStatusCode(rpcCode);
51+
} catch (IllegalArgumentException e) {
52+
if (rpcCode != com.google.rpc.Code.UNRECOGNIZED) {
53+
fail("Unrecognized com.google.rpc.Code found " + rpcCode);
54+
}
55+
continue;
56+
}
57+
58+
assertNotNull(statusCode);
59+
allCodes.add(statusCode);
60+
}
61+
62+
assertEquals(allCodes, new HashSet<>(Arrays.asList(StatusCode.Code.values())));
63+
}
64+
65+
@Test
66+
public void httpStatusToStatusCodeTest() {
67+
// The HTTP status code conversion logic is currently in the process of being standardized,
68+
// the tested logic may change in nearest future.
69+
final String defaultMessage = "anything";
70+
assertEquals(
71+
StatusCode.Code.OK, HttpJsonStatusCode.httpStatusToStatusCode(200, defaultMessage));
72+
assertEquals(
73+
StatusCode.Code.OUT_OF_RANGE,
74+
HttpJsonStatusCode.httpStatusToStatusCode(400, HttpJsonStatusCode.OUT_OF_RANGE));
75+
assertEquals(
76+
StatusCode.Code.FAILED_PRECONDITION,
77+
HttpJsonStatusCode.httpStatusToStatusCode(400, HttpJsonStatusCode.FAILED_PRECONDITION));
78+
assertEquals(
79+
StatusCode.Code.INVALID_ARGUMENT,
80+
HttpJsonStatusCode.httpStatusToStatusCode(400, defaultMessage));
81+
assertEquals(
82+
StatusCode.Code.UNAUTHENTICATED,
83+
HttpJsonStatusCode.httpStatusToStatusCode(401, defaultMessage));
84+
assertEquals(
85+
StatusCode.Code.PERMISSION_DENIED,
86+
HttpJsonStatusCode.httpStatusToStatusCode(403, defaultMessage));
87+
assertEquals(
88+
StatusCode.Code.NOT_FOUND, HttpJsonStatusCode.httpStatusToStatusCode(404, defaultMessage));
89+
assertEquals(
90+
StatusCode.Code.ALREADY_EXISTS,
91+
HttpJsonStatusCode.httpStatusToStatusCode(409, HttpJsonStatusCode.ALREADY_EXISTS));
92+
assertEquals(
93+
StatusCode.Code.ABORTED, HttpJsonStatusCode.httpStatusToStatusCode(409, defaultMessage));
94+
assertEquals(
95+
StatusCode.Code.RESOURCE_EXHAUSTED,
96+
HttpJsonStatusCode.httpStatusToStatusCode(429, defaultMessage));
97+
assertEquals(
98+
StatusCode.Code.CANCELLED, HttpJsonStatusCode.httpStatusToStatusCode(499, defaultMessage));
99+
assertEquals(
100+
StatusCode.Code.DATA_LOSS,
101+
HttpJsonStatusCode.httpStatusToStatusCode(500, HttpJsonStatusCode.DATA_LOSS));
102+
assertEquals(
103+
StatusCode.Code.UNKNOWN,
104+
HttpJsonStatusCode.httpStatusToStatusCode(500, HttpJsonStatusCode.UNKNOWN));
105+
assertEquals(
106+
StatusCode.Code.INTERNAL, HttpJsonStatusCode.httpStatusToStatusCode(500, defaultMessage));
107+
assertEquals(
108+
StatusCode.Code.UNIMPLEMENTED,
109+
HttpJsonStatusCode.httpStatusToStatusCode(501, defaultMessage));
110+
assertEquals(
111+
StatusCode.Code.UNAVAILABLE,
112+
HttpJsonStatusCode.httpStatusToStatusCode(503, defaultMessage));
113+
assertEquals(
114+
StatusCode.Code.DEADLINE_EXCEEDED,
115+
HttpJsonStatusCode.httpStatusToStatusCode(504, defaultMessage));
116+
117+
try {
118+
HttpJsonStatusCode.httpStatusToStatusCode(411, defaultMessage);
119+
fail();
120+
} catch (IllegalStateException e) {
121+
// expected
122+
}
123+
124+
try {
125+
HttpJsonStatusCode.httpStatusToStatusCode(666, defaultMessage);
126+
fail();
127+
} catch (IllegalArgumentException e) {
128+
// expected
129+
}
130+
}
131+
}

0 commit comments

Comments
 (0)