Skip to content

Commit 8e8ab27

Browse files
committed
Use AbstractMap.SimpleEntry instead of Map.entry to permit null values.
- Map flattening logic needs to be able to handle null values Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent f68fbad commit 8e8ab27

File tree

1 file changed

+2
-1
lines changed
  • org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers

1 file changed

+2
-1
lines changed

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/MapFlattener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
package org.eclipse.jdt.ls.core.internal.handlers;
1414

1515
import java.lang.reflect.Type;
16+
import java.util.AbstractMap;
1617
import java.util.Arrays;
1718
import java.util.HashMap;
1819
import java.util.List;
@@ -181,7 +182,7 @@ public static void putAll(Map<String, Object> currentConfiguration, Map<String,
181182
private static Stream<Map.Entry<String, Object>> flatten(Map.Entry<String, Object> entry) {
182183
if (entry.getValue() instanceof Map<?, ?>) {
183184
Map<String, Object> nested = (Map<String, Object>) entry.getValue();
184-
return nested.entrySet().stream().map(e -> Map.entry(entry.getKey() + "." + e.getKey(), e.getValue())).flatMap(MapFlattener::flatten);
185+
return nested.entrySet().stream().map(e -> new AbstractMap.SimpleEntry<String, Object>(entry.getKey() + "." + e.getKey(), e.getValue())).flatMap(MapFlattener::flatten);
185186
}
186187
return Stream.of(entry);
187188
}

0 commit comments

Comments
 (0)