Skip to content

core: support Integer and Long in service configuration parsing #12827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kannanjgithub wants to merge 2 commits into from
+152 −19
Closed

core: support Integer and Long in service configuration parsing #12827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbf05d2
core: support Integer and Long in service configuration parsing
kannanjgithub May 25, 2026
26f7b31
Potential fix for pull request finding
kannanjgithub May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 47 additions & 16 deletions core/src/main/java/io/grpc/internal/JsonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import static com.google.common.math.LongMath.checkedAdd;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.ParseException;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -106,8 +108,8 @@ public static Double getNumberAsDouble(Map<String, ?> obj, String key) {
return null;
}
Object value = obj.get(key);
if (value instanceof Double) {
return (Double) value;
if (value instanceof Number) {
return ((Number) value).doubleValue();
}
Comment thread
kannanjgithub marked this conversation as resolved.
if (value instanceof String) {
try {
Expand All @@ -132,8 +134,8 @@ public static Float getNumberAsFloat(Map<String, ?> obj, String key) {
return null;
}
Object value = obj.get(key);
if (value instanceof Float) {
return (Float) value;
if (value instanceof Number) {
return ((Number) value).floatValue();
}
if (value instanceof String) {
try {
Expand All @@ -159,13 +161,29 @@ public static Integer getNumberAsInteger(Map<String, ?> obj, String key) {
return null;
}
Object value = obj.get(key);
if (value instanceof Double) {
Double d = (Double) value;
int i = d.intValue();
if (i != d) {
throw new ClassCastException("Number expected to be integer: " + d);
if (value instanceof Number) {
Number n = (Number) value;
if (n instanceof Integer || n instanceof Short || n instanceof Byte) {
return n.intValue();
}
return i;
try {
if (n instanceof Long) {
return Math.toIntExact(n.longValue());
}
if (n instanceof BigInteger) {
return ((BigInteger) n).intValueExact();
}
if (n instanceof BigDecimal) {
return ((BigDecimal) n).intValueExact();
}
} catch (ArithmeticException e) {
throw new ClassCastException("Number expected to be integer: " + n);
}
double d = n.doubleValue();
if (Math.rint(d) == d && d >= Integer.MIN_VALUE && d <= Integer.MAX_VALUE) {
return n.intValue();
}
throw new ClassCastException("Number expected to be integer: " + n);
}
if (value instanceof String) {
try {
Expand All @@ -190,13 +208,26 @@ public static Long getNumberAsLong(Map<String, ?> obj, String key) {
return null;
}
Object value = obj.get(key);
if (value instanceof Double) {
Double d = (Double) value;
long l = d.longValue();
if (l != d) {
throw new ClassCastException("Number expected to be long: " + d);
if (value instanceof Number) {
Number n = (Number) value;
if (n instanceof Long || n instanceof Integer || n instanceof Short || n instanceof Byte) {
return n.longValue();
}
try {
if (n instanceof BigInteger) {
return ((BigInteger) n).longValueExact();
}
if (n instanceof BigDecimal) {
return ((BigDecimal) n).longValueExact();
}
} catch (ArithmeticException e) {
throw new ClassCastException("Number expected to be long: " + n);
}
Comment on lines +211 to 225

@kannanjgithub kannanjgithub May 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

double d = n.doubleValue();
if (Math.rint(d) == d && d >= (double) Long.MIN_VALUE && d < Math.scalb(1.0, 63)) {
return n.longValue();
}
return l;
throw new ClassCastException("Number expected to be long: " + n);
}
if (value instanceof String) {
try {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ public ManagedChannelImplBuilder defaultServiceConfig(@Nullable Map<String, ?> s
parsedMap.put(key, checkListEntryTypes((List<?>) value));
} else if (value instanceof String) {
parsedMap.put(key, value);
} else if (value instanceof Double) {
} else if (value instanceof Number) {
parsedMap.put(key, value);
} else if (value instanceof Boolean) {
parsedMap.put(key, value);
Expand All @@ -606,7 +606,7 @@ private static List<?> checkListEntryTypes(List<?> list) {
parsedList.add(checkListEntryTypes((List<?>) value));
} else if (value instanceof String) {
parsedList.add(value);
} else if (value instanceof Double) {
} else if (value instanceof Number) {
parsedList.add(value);
} else if (value instanceof Boolean) {
parsedList.add(value);
Expand Down
68 changes: 68 additions & 0 deletions core/src/test/java/io/grpc/internal/JsonUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -160,6 +162,72 @@ public void getNumber() {
}
}

@Test
public void getNumber_precision() {
Map<String, Object> map = new HashMap<>();
long largeLong = (1L << 60) + 1;
map.put("large_long", (double) largeLong); // This is 2^60
map.put("large_long_actual", largeLong);
map.put("big_int", new BigInteger(String.valueOf(largeLong)));
map.put("big_decimal", new BigDecimal(String.valueOf(largeLong)));
map.put("big_int_too_large", new BigInteger(String.valueOf(largeLong)).multiply(BigInteger.valueOf(100)));
Comment thread
kannanjgithub marked this conversation as resolved.
Outdated
map.put("double_fractional", 1.5D);
map.put("double_nan", Double.NaN);
map.put("double_inf", Double.POSITIVE_INFINITY);

// Large long represented as double is 2^60, which is a valid long
assertThat(JsonUtil.getNumberAsLong(map, "large_long")).isEqualTo(1L << 60);

// Large long actual should pass
assertThat(JsonUtil.getNumberAsLong(map, "large_long_actual")).isEqualTo(largeLong);

// BigInteger and BigDecimal should pass
assertThat(JsonUtil.getNumberAsLong(map, "big_int")).isEqualTo(largeLong);
assertThat(JsonUtil.getNumberAsLong(map, "big_decimal")).isEqualTo(largeLong);

// Too large BigInteger should fail
try {
JsonUtil.getNumberAsLong(map, "big_int_too_large");
fail("Should have failed");
} catch (ClassCastException e) {
assertThat(e).hasMessageThat().startsWith("Number expected to be long:");
}

// Integer specific tests
map.put("int_actual", 123);
map.put("long_as_int", 123L);
map.put("long_too_large_for_int", (long) Integer.MAX_VALUE + 1);

assertThat(JsonUtil.getNumberAsInteger(map, "int_actual")).isEqualTo(123);
assertThat(JsonUtil.getNumberAsInteger(map, "long_as_int")).isEqualTo(123);
try {
JsonUtil.getNumberAsInteger(map, "long_too_large_for_int");
fail("Should have failed");
} catch (ClassCastException e) {
assertThat(e).hasMessageThat().startsWith("Number expected to be integer:");
}

// Fractional and special doubles
try {
JsonUtil.getNumberAsLong(map, "double_fractional");
fail("Should have failed");
} catch (ClassCastException e) {
assertThat(e).hasMessageThat().startsWith("Number expected to be long:");
}
try {
JsonUtil.getNumberAsLong(map, "double_nan");
fail("Should have failed");
} catch (ClassCastException e) {
assertThat(e).hasMessageThat().startsWith("Number expected to be long:");
}
try {
JsonUtil.getNumberAsLong(map, "double_inf");
fail("Should have failed");
} catch (ClassCastException e) {
assertThat(e).hasMessageThat().startsWith("Number expected to be long:");
}
}

@Test
public void getObject_mapExplicitNullValue() {
Map<String, ?> mapWithNullValue = Collections.singletonMap("key", null);
Expand Down
34 changes: 33 additions & 1 deletion core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,39 @@ public void defaultServiceConfig_intValue() {
Map<String, Object> config = new HashMap<>();
config.put("key", 3);

assertThrows(IllegalArgumentException.class, () -> builder.defaultServiceConfig(config));
builder.defaultServiceConfig(config);

assertThat(builder.defaultServiceConfig).containsExactlyEntriesIn(config);
}

@Test
public void defaultServiceConfig_longValue() {
Map<String, Object> config = new HashMap<>();
config.put("key", 3L);

builder.defaultServiceConfig(config);

assertThat(builder.defaultServiceConfig).containsExactlyEntriesIn(config);
}
Comment thread
kannanjgithub marked this conversation as resolved.

@Test
public void defaultServiceConfig_list_intValue() {
Map<String, Object> config = new HashMap<>();
config.put("key", Collections.singletonList(3));

builder.defaultServiceConfig(config);

assertThat(builder.defaultServiceConfig).containsExactlyEntriesIn(config);
}

@Test
public void defaultServiceConfig_list_longValue() {
Map<String, Object> config = new HashMap<>();
config.put("key", Collections.singletonList(3L));

builder.defaultServiceConfig(config);

assertThat(builder.defaultServiceConfig).containsExactlyEntriesIn(config);
}

@Test
Expand Down
Loading