Fix NPE in switch

gaobinlong · gaobinlong · commit 1f9ae8a661a6 · 2025-11-17T15:31:51.000+08:00
Signed-off-by: Binlong Gao &lt;gbinlong@amazon.com&gt;
diff --git a/libs/core/src/main/java/org/opensearch/core/common/util/CollectionUtils.java b/libs/core/src/main/java/org/opensearch/core/common/util/CollectionUtils.java
@@ -167,7 +167,7 @@ private static Iterable<?> convert(Object value) {
             case Map<?, ?> map -> () -> Iterators.concat(map.keySet().iterator(), map.values().iterator());
             case Iterable<?> iterable when value instanceof Path == false -> iterable;
             case Object[] objects -> Arrays.asList(objects);
-            default -> null;
+            case null, default -> null;
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private static Iterable<?> convert(Object value) {`
`167`	`167`	`case Map<?, ?> map -> () -> Iterators.concat(map.keySet().iterator(), map.values().iterator());`
`168`	`168`	`case Iterable<?> iterable when value instanceof Path == false -> iterable;`
`169`	`169`	`case Object[] objects -> Arrays.asList(objects);`
`170`		`- default -> null;`
	`170`	`+ case null, default -> null;`
`171`	`171`	`};`
`172`	`172`	`}`
`173`	`173`