Include NodeInfo as well

costin · costin · commit 71ee5bbc1d62 · 2025-03-08T09:49:33.000-08:00
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/NodeInfo.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/NodeInfo.java
@@ -52,7 +52,7 @@ final <E> T transform(Function<? super E, ? extends E> rule, Class<E> typeToken)
         List<?> children = node.children();
 
         Function<Object, Object> realRule = p -> {
-            if (p != children && false == children.contains(p) && (p == null || typeToken.isInstance(p))) {
+            if (p != children && (p == null || typeToken.isInstance(p)) && false == children.contains(p)) {
                 return rule.apply(typeToken.cast(p));
             }
             return p;
diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/NodeInfo.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/NodeInfo.java
@@ -52,7 +52,7 @@ final <E> T transform(Function<? super E, ? extends E> rule, Class<E> typeToken)
         List<?> children = node.children();
 
         Function<Object, Object> realRule = p -> {
-            if (p != children && false == children.contains(p) && (p == null || typeToken.isInstance(p))) {
+            if (p != children && (p == null || typeToken.isInstance(p)) && false == children.contains(p)) {
                 return rule.apply(typeToken.cast(p));
             }
             return p;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final <E> T transform(Function<? super E, ? extends E> rule, Class<E> typeToken)`
`52`	`52`	`List<?> children = node.children();`
`53`	`53`
`54`	`54`	`Function<Object, Object> realRule = p -> {`
`55`		`- if (p != children && false == children.contains(p) && (p == null \|\| typeToken.isInstance(p))) {`
	`55`	`+ if (p != children && (p == null \|\| typeToken.isInstance(p)) && false == children.contains(p)) {`
`56`	`56`	`return rule.apply(typeToken.cast(p));`
`57`	`57`	`}`
`58`	`58`	`return p;`