-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
core: have JsonUtil support parsing String value as number (#8711)
As documented in https://developers.google.com/protocol-buffers/docs/proto3#json, the canonical proto-to-json converter converts int64 (Java long) values to string values in Json rather than Json numbers (Java Double). Conversely, either Json string value or number value are accepted to be converted to int64 proto value. To better support service configs defined by protobuf messages, support parsing String values as numbers in `JsonUtil`.
- Loading branch information
1 parent
8382bd8
commit a5f1fb5
Showing
4 changed files
with
195 additions
and
27 deletions.
There are no files selected for viewing
This file contains 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 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 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 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,133 @@ | ||
/* | ||
* Copyright 2021, gRPC Authors All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package io.grpc.internal; | ||
|
||
import static com.google.common.truth.Truth.assertThat; | ||
import static org.junit.Assert.fail; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.junit.runners.JUnit4; | ||
|
||
/** Tests for {@link JsonUtil}. */ | ||
@RunWith(JUnit4.class) | ||
public class JsonUtilTest { | ||
@Test | ||
public void getNumber() { | ||
Map<String, Object> map = new HashMap<>(); | ||
map.put("key_number_1", 1D); | ||
map.put("key_string_2.0", "2.0"); | ||
map.put("key_string_3", "3"); | ||
map.put("key_string_nan", "NaN"); | ||
map.put("key_number_5.5", 5.5D); | ||
map.put("key_string_six", "six"); | ||
map.put("key_string_infinity", "Infinity"); | ||
map.put("key_string_minus_infinity", "-Infinity"); | ||
map.put("key_string_exponent", "2.998e8"); | ||
map.put("key_string_minus_zero", "-0"); | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_number_1")).isEqualTo(1D); | ||
assertThat(JsonUtil.getNumberAsInteger(map, "key_number_1")).isEqualTo(1); | ||
assertThat(JsonUtil.getNumberAsLong(map, "key_number_1")).isEqualTo(1L); | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_2.0")).isEqualTo(2D); | ||
try { | ||
JsonUtil.getNumberAsInteger(map, "key_string_2.0"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value '2.0' for key 'key_string_2.0' is not an integer"); | ||
} | ||
try { | ||
JsonUtil.getNumberAsLong(map, "key_string_2.0"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value '2.0' for key 'key_string_2.0' is not a long integer"); | ||
} | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_3")).isEqualTo(3D); | ||
assertThat(JsonUtil.getNumberAsInteger(map, "key_string_3")).isEqualTo(3); | ||
assertThat(JsonUtil.getNumberAsLong(map, "key_string_3")).isEqualTo(3L); | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_nan")).isNaN(); | ||
try { | ||
JsonUtil.getNumberAsInteger(map, "key_string_nan"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value 'NaN' for key 'key_string_nan' is not an integer"); | ||
} | ||
try { | ||
JsonUtil.getNumberAsLong(map, "key_string_nan"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value 'NaN' for key 'key_string_nan' is not a long integer"); | ||
} | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_number_5.5")).isEqualTo(5.5D); | ||
try { | ||
JsonUtil.getNumberAsInteger(map, "key_number_5.5"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo("Number expected to be integer: 5.5"); | ||
} | ||
try { | ||
JsonUtil.getNumberAsLong(map, "key_number_5.5"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo("Number expected to be long: 5.5"); | ||
} | ||
|
||
try { | ||
JsonUtil.getNumberAsDouble(map, "key_string_six"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value 'six' for key 'key_string_six' is not a double"); | ||
} | ||
try { | ||
JsonUtil.getNumberAsInteger(map, "key_string_six"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value 'six' for key 'key_string_six' is not an integer"); | ||
} | ||
try { | ||
JsonUtil.getNumberAsLong(map, "key_string_six"); | ||
fail("expecting to throw but did not"); | ||
} catch (RuntimeException e) { | ||
assertThat(e).hasMessageThat().isEqualTo( | ||
"value 'six' for key 'key_string_six' is not a long integer"); | ||
} | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_infinity")).isPositiveInfinity(); | ||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_minus_infinity")).isNegativeInfinity(); | ||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_exponent")).isEqualTo(2.998e8D); | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_string_minus_zero")).isZero(); | ||
assertThat(JsonUtil.getNumberAsInteger(map, "key_string_minus_zero")).isEqualTo(0); | ||
assertThat(JsonUtil.getNumberAsLong(map, "key_string_minus_zero")).isEqualTo(0L); | ||
|
||
assertThat(JsonUtil.getNumberAsDouble(map, "key_nonexistent")).isNull(); | ||
assertThat(JsonUtil.getNumberAsInteger(map, "key_nonexistent")).isNull(); | ||
assertThat(JsonUtil.getNumberAsLong(map, "key_nonexistent")).isNull(); | ||
} | ||
} |