Spotless gets it done

Author: MattAlp

server/src/test/java/org/elasticsearch/common/network/NetworkDirectionUtilsTests.java

@@ -16,24 +16,24 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class NetworkDirectionUtilsTests extends ESTestCase {
-    public void testCIDR()  {
+    public void testCIDR() {
         testNetworkDirectionUtils("10.0.1.1", "192.168.1.2", List.of("10.0.0.0/8"), "outbound");
         testNetworkDirectionUtils("192.168.1.2", "10.0.1.1", List.of("10.0.0.0/8"), "inbound");
     }
 
-    public void testUnspecified()  {
+    public void testUnspecified() {
         testNetworkDirectionUtils("0.0.0.0", "0.0.0.0", List.of("unspecified"), "internal");
         testNetworkDirectionUtils("::", "::", List.of("unspecified"), "internal");
     }
 
-    public void testNetworkPrivate()  {
+    public void testNetworkPrivate() {
         testNetworkDirectionUtils("192.168.1.1", "192.168.1.2", List.of("private"), "internal");
         testNetworkDirectionUtils("10.0.1.1", "192.168.1.2", List.of("private"), "internal");
         testNetworkDirectionUtils("192.168.1.1", "172.16.0.1", List.of("private"), "internal");
         testNetworkDirectionUtils("192.168.1.1", "fd12:3456:789a:1::1", List.of("private"), "internal");
     }
 
-    public void testNetworkPublic()  {
+    public void testNetworkPublic() {
         testNetworkDirectionUtils("192.168.1.1", "192.168.1.2", List.of("public"), "external");
         testNetworkDirectionUtils("10.0.1.1", "192.168.1.2", List.of("public"), "external");
         testNetworkDirectionUtils("192.168.1.1", "172.16.0.1", List.of("public"), "external");

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

@@ -37,7 +37,6 @@
 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;
 
@@ -75,8 +74,8 @@ public NetworkDirection(
         @Param(
             name = "internal_networks",
             type = { "keyword", "text" },
-            description = "List of internal networks. Supports IPv4 and IPv6 addresses, ranges in CIDR notation, and named ranges.")
-        Expression internalNetworks
+            description = "List of internal networks. Supports IPv4 and IPv6 addresses, ranges in CIDR notation, and named ranges."
+        ) Expression internalNetworks
     ) {
         super(source, Arrays.asList(sourceIpField, destinationIpField, internalNetworks));
         this.sourceIpField = sourceIpField;
@@ -116,7 +115,6 @@ protected NodeInfo<? extends Expression> info() {
         return NodeInfo.create(this, NetworkDirection::new, sourceIpField, destinationIpField, internalNetworks);
     }
 
-
     @Override
     public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
         var sourceIpEvaluatorSupplier = toEvaluator.apply(sourceIpField);
@@ -133,7 +131,15 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
     }
 
     @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) {
+    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) {
             builder.appendNull();
@@ -176,8 +182,7 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        return isIPAndExact(sourceIpField, sourceText(), FIRST)
-            .and(isIPAndExact(destinationIpField, sourceText(), SECOND))
+        return isIPAndExact(sourceIpField, sourceText(), FIRST).and(isIPAndExact(destinationIpField, sourceText(), SECOND))
             .and(isStringAndExact(internalNetworks, sourceText(), THIRD));
     }