Tests work great now

Author: MattAlp

x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/NetworkDirectionEvaluator.java

@@ -34,6 +34,12 @@
 import java.util.List;
 
 import static org.elasticsearch.compute.ann.Fixed.Scope.THREAD_LOCAL;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.THIRD;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.fromIndex;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isIPAndExact;
+import static org.elasticsearch.xpack.esql.expression.EsqlTypeResolutions.isStringAndExact;
 
 /**
  * Returns the direction type (inbound, outbound, internal, external) given a source IP address, destination IP address, and a list of internal networks.
@@ -126,15 +132,15 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
         );
     }
 
-    @Evaluator(warnExceptions = IllegalArgumentException.class)
-    static BytesRef process(@Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef scratch, @Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef netScratch, BytesRef sourceIp, BytesRef destinationIp, @Position int position, BytesRefBlock networks) {
+    @Evaluator()
+    static void process(BytesRefBlock.Builder builder, @Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef scratch, @Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef netScratch, BytesRef sourceIp, BytesRef destinationIp, @Position int position, BytesRefBlock networks) {
         int valueCount = networks.getValueCount(position);
         if (valueCount == 0) {
-            throw new IllegalArgumentException("List of internal networks must not be empty");
+            builder.appendNull();
+            return;
         }
         int first = networks.getFirstValueIndex(position);
 
-
         System.arraycopy(sourceIp.bytes, sourceIp.offset, scratch.bytes, 0, sourceIp.length);
         InetAddress sourceIpAddress = InetAddressPoint.decode(scratch.bytes);
         System.arraycopy(destinationIp.bytes, destinationIp.offset, scratch.bytes, 0, destinationIp.length);
@@ -156,14 +162,25 @@ static BytesRef process(@Fixed(includeInToString=false, scope=THREAD_LOCAL) Byte
             }
         }
 
-        return new BytesRef(NetworkDirectionUtils.getDirection(sourceInternal, destinationInternal));
+        builder.appendBytesRef(new BytesRef(NetworkDirectionUtils.getDirection(sourceInternal, destinationInternal)));
     }
 
     @Override
     public DataType dataType() {
         return DataType.KEYWORD;
     }
 
+    @Override
+    protected TypeResolution resolveType() {
+        if (childrenResolved() == false) {
+            return new TypeResolution("Unresolved children");
+        }
+
+        return isIPAndExact(sourceIpField, sourceText(), FIRST)
+            .and(isIPAndExact(destinationIpField, sourceText(), SECOND))
+            .and(isStringAndExact(internalNetworks, sourceText(), THIRD));
+    }
+
     public Expression sourceIpField() {
         return sourceIpField;
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/ip/NetworkDirection.java

@@ -34,7 +34,7 @@ protected Expression build(Source source, List<Expression> args) {
     protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerPosition, List<DataType> signature) {
         return equalTo(typeErrorMessage(true, validPerPosition, signature, (v, p) -> switch (p) {
             case 0, 1 -> "ip";
-            case 2 -> "keyword";
+            case 2 -> "string";
             default -> "";
         }));
     }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/ip/NetworkDirectionErrorTests.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsEqual.equalTo;
 
 public class NetworkDirectionTests extends AbstractScalarFunctionTestCase {
@@ -34,7 +35,7 @@ public NetworkDirectionTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCas
     @ParametersFactory
     public static Iterable<Object[]> parameters() {
         // These tests copy the data from the NetworkDirectionUtils tests
-        var suppliers = new ArrayList<TestCaseSupplier>();
+        List<TestCaseSupplier> suppliers = new ArrayList<>();
 
         for (var stringType : DataType.stringTypes()) {
             suppliers.addAll(List.of(
@@ -212,6 +213,7 @@ public static Iterable<Object[]> parameters() {
                 )
             ));
         }
+        suppliers = anyNullIsNull(true, suppliers);
 
         return parameterSuppliersFromTypedData(randomizeBytesRefsOffset(suppliers));
     }