Skip to content

Commit 48e7c29

Browse files
committed
fix 21 syntax
Signed-off-by: xinyual <xinyual@amazon.com>
1 parent b46b77d commit 48e7c29

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonExtractFunctionImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import java.util.Collection;
1616
import java.util.List;
1717
import java.util.Map;
18+
import java.util.stream.Collectors;
19+
1820
import org.apache.calcite.adapter.enumerable.NotNullImplementor;
1921
import org.apache.calcite.adapter.enumerable.NullPolicy;
2022
import org.apache.calcite.adapter.enumerable.RexImpTable;
@@ -64,7 +66,7 @@ public static Object eval(Object... args) {
6466
String jsonStr = (String) args[0];
6567
List<Object> jsonPaths = Arrays.asList(args).subList(1, args.length);
6668
List<String> pathSpecs =
67-
jsonPaths.stream().map(Object::toString).map(JsonUtils::convertToJsonPath).toList();
69+
jsonPaths.stream().map(Object::toString).map(JsonUtils::convertToJsonPath).collect(Collectors.toList());
6870
List<Object> results = new ArrayList<>();
6971
for (String pathSpec : pathSpecs) {
7072
Object queryResult = a.jsonQuery(jsonStr, pathSpec, WITHOUT_ARRAY, NULL, NULL, false);

core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import com.fasterxml.jackson.databind.JsonNode;
1313
import java.util.List;
14+
import java.util.stream.Collectors;
15+
1416
import org.junit.jupiter.api.Test;
1517
import org.junit.jupiter.api.extension.ExtendWith;
1618
import org.mockito.junit.jupiter.MockitoExtension;
@@ -61,7 +63,7 @@ void test_convertToJsonPath() {
6163
List<String> originalJsonPath = List.of("{}", "a.b.c", "a{2}.c", "{3}.bc{}.d{1}");
6264
List<String> targetJsonPath = List.of("$.[*]", "$.a.b.c", "$.a[2].c", "$.[3].bc[*].d[1]");
6365
List<String> convertedJsonPath =
64-
originalJsonPath.stream().map(JsonUtils::convertToJsonPath).toList();
66+
originalJsonPath.stream().map(JsonUtils::convertToJsonPath).collect(Collectors.toList());
6567
assertEquals(targetJsonPath, convertedJsonPath);
6668
}
6769

0 commit comments

Comments
 (0)