Skip to content

core: normalize service config number values #12826

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

Open
codingkiddo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

core: normalize service config number values #12826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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,8 +582,8 @@ 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) {
parsedMap.put(key, value);
} else if (value instanceof Number) {
parsedMap.put(key, ((Number) value).doubleValue());
} else if (value instanceof Boolean) {
parsedMap.put(key, value);
} else {
Expand All @@ -606,8 +606,8 @@ private static List<?> checkListEntryTypes(List<?> list) {
parsedList.add(checkListEntryTypes((List<?>) value));
} else if (value instanceof String) {
parsedList.add(value);
} else if (value instanceof Double) {
parsedList.add(value);
} else if (value instanceof Number) {
parsedList.add(((Number) value).doubleValue());
} else if (value instanceof Boolean) {
parsedList.add(value);
} else {
Expand Down
28 changes: 27 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 @@ -735,9 +735,35 @@ public void defaultServiceConfig_intKey() {
@Test
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).containsEntry("key", 3D);
}

@Test
public void defaultServiceConfig_nestedIntValue() {
Map<String, Object> config = new HashMap<>();
List<Object> list = new ArrayList<>();
Map<String, Object> nested = new HashMap<>();

list.add(123);
nested.put("key", 456);
list.add(nested);
config.put("list", list);

builder.defaultServiceConfig(config);

assertThat(builder.defaultServiceConfig).containsKey("list");

@SuppressWarnings("unchecked")
List<Object> parsedList = (List<Object>) builder.defaultServiceConfig.get("list");
assertThat(builder.defaultServiceConfig)
.containsEntry(
"list",
Arrays.asList(123D, Collections.singletonMap("key", 456D)));
}

@Test
Expand Down
Loading