Simplify EsIndex class (elastic#119582) (elastic#119628)

This change simplifies EsIndex class by replacing it with a record

Author: idegtiarenko

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/index/EsIndex.java

@@ -15,15 +15,16 @@
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
-public class EsIndex implements Writeable {
+import static java.util.stream.Collectors.toMap;
 
-    private final String name;
-    private final Map<String, EsField> mapping;
-    private final Map<String, IndexMode> indexNameWithModes;
+public record EsIndex(String name, Map<String, EsField> mapping, Map<String, IndexMode> indexNameWithModes) implements Writeable {
+
+    public EsIndex {
+        assert name != null;
+        assert mapping != null;
+    }
 
     /**
      * Intended for tests. Returns an index with an empty index mode map.
@@ -32,56 +33,32 @@ public EsIndex(String name, Map<String, EsField> mapping) {
         this(name, mapping, Map.of());
     }
 
-    public EsIndex(String name, Map<String, EsField> mapping, Map<String, IndexMode> indexNameWithModes) {
-        assert name != null;
-        assert mapping != null;
-        this.name = name;
-        this.mapping = mapping;
-        this.indexNameWithModes = indexNameWithModes;
-    }
-
-    public EsIndex(StreamInput in) throws IOException {
-        this(in.readString(), in.readImmutableMap(StreamInput::readString, EsField::readFrom), readIndexNameWithModes(in));
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(name());
-        out.writeMap(mapping(), (o, x) -> x.writeTo(out));
-        writeIndexNameWithModes(indexNameWithModes, out);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Map<String, IndexMode> readIndexNameWithModes(StreamInput in) throws IOException {
+    public static EsIndex readFrom(StreamInput in) throws IOException {
+        String name = in.readString();
+        Map<String, EsField> mapping = in.readImmutableMap(StreamInput::readString, EsField::readFrom);
+        Map<String, IndexMode> indexNameWithModes;
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-            return in.readMap(IndexMode::readFrom);
+            indexNameWithModes = in.readMap(IndexMode::readFrom);
         } else {
+            @SuppressWarnings("unchecked")
             Set<String> indices = (Set<String>) in.readGenericValue();
             assert indices != null;
-            return indices.stream().collect(Collectors.toMap(e -> e, e -> IndexMode.STANDARD));
+            indexNameWithModes = indices.stream().collect(toMap(e -> e, e -> IndexMode.STANDARD));
         }
+        return new EsIndex(name, mapping, indexNameWithModes);
     }
 
-    private static void writeIndexNameWithModes(Map<String, IndexMode> concreteIndices, StreamOutput out) throws IOException {
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeString(name());
+        out.writeMap(mapping(), (o, x) -> x.writeTo(out));
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-            out.writeMap(concreteIndices, (o, v) -> IndexMode.writeTo(v, out));
+            out.writeMap(indexNameWithModes, (o, v) -> IndexMode.writeTo(v, out));
         } else {
-            out.writeGenericValue(concreteIndices.keySet());
+            out.writeGenericValue(indexNameWithModes.keySet());
         }
     }
 
-    public String name() {
-        return name;
-    }
-
-    public Map<String, EsField> mapping() {
-        return mapping;
-    }
-
-    public Map<String, IndexMode> indexNameWithModes() {
-        return indexNameWithModes;
-    }
-
     public Set<String> concreteIndices() {
         return indexNameWithModes.keySet();
     }
@@ -90,25 +67,4 @@ public Set<String> concreteIndices() {
     public String toString() {
         return name;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, mapping, indexNameWithModes);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-
-        EsIndex other = (EsIndex) obj;
-        return Objects.equals(name, other.name)
-            && Objects.equals(mapping, other.mapping)
-            && Objects.equals(indexNameWithModes, other.indexNameWithModes);
-    }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Enrich.java

@@ -116,7 +116,7 @@ private static Enrich readFrom(StreamInput in) throws IOException {
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
             concreteIndices = in.readMap(StreamInput::readString, StreamInput::readString);
         } else {
-            EsIndex esIndex = new EsIndex(in);
+            EsIndex esIndex = EsIndex.readFrom(in);
             if (esIndex.concreteIndices().size() > 1) {
                 throw new IllegalStateException("expected a single enrich index; got " + esIndex);
             }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/EsRelation.java

@@ -58,7 +58,7 @@ public EsRelation(Source source, EsIndex index, List<Attribute> attributes, Inde
 
     private static EsRelation readFrom(StreamInput in) throws IOException {
         Source source = Source.readFrom((PlanStreamInput) in);
-        EsIndex esIndex = new EsIndex(in);
+        EsIndex esIndex = EsIndex.readFrom(in);
         List<Attribute> attributes = in.readNamedWriteableCollectionAsList(Attribute.class);
         if (supportingEsSourceOptions(in.getTransportVersion())) {
             // We don't do anything with these strings

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java

@@ -87,7 +87,7 @@ private static EnrichExec readFrom(StreamInput in) throws IOException {
             concreteIndices = in.readMap(StreamInput::readString, StreamInput::readString);
         } else {
             mode = Enrich.Mode.ANY;
-            EsIndex esIndex = new EsIndex(in);
+            EsIndex esIndex = EsIndex.readFrom(in);
             if (esIndex.concreteIndices().size() != 1) {
                 throw new IllegalStateException("expected a single concrete enrich index; got " + esIndex.concreteIndices());
             }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EsQueryExec.java

@@ -138,7 +138,7 @@ public EsQueryExec(
      */
     public static EsQueryExec deserialize(StreamInput in) throws IOException {
         var source = Source.readFrom((PlanStreamInput) in);
-        var index = new EsIndex(in);
+        var index = EsIndex.readFrom(in);
         var indexMode = EsRelation.readIndexMode(in);
         var attrs = in.readNamedWriteableCollectionAsList(Attribute.class);
         var query = in.readOptionalNamedWriteable(QueryBuilder.class);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EsSourceExec.java

@@ -51,7 +51,7 @@ public EsSourceExec(Source source, EsIndex index, List<Attribute> attributes, Qu
     private EsSourceExec(StreamInput in) throws IOException {
         this(
             Source.readFrom((PlanStreamInput) in),
-            new EsIndex(in),
+            EsIndex.readFrom(in),
             in.readNamedWriteableCollectionAsList(Attribute.class),
             in.readOptionalNamedWriteable(QueryBuilder.class),
             EsRelation.readIndexMode(in)

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/index/EsIndexSerializationTests.java

@@ -56,7 +56,7 @@ private static Map<String, IndexMode> randomConcreteIndices() {
 
     @Override
     protected Writeable.Reader<EsIndex> instanceReader() {
-        return a -> new EsIndex(new PlanStreamInput(a, a.namedWriteableRegistry(), null));
+        return a -> EsIndex.readFrom(new PlanStreamInput(a, a.namedWriteableRegistry(), null));
     }
 
     @Override

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/tree/EsqlNodeSubclassTests.java

@@ -40,6 +40,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pow;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Concat;
 import org.elasticsearch.xpack.esql.expression.predicate.fulltext.FullTextPredicate;
+import org.elasticsearch.xpack.esql.index.EsIndex;
 import org.elasticsearch.xpack.esql.plan.logical.Dissect;
 import org.elasticsearch.xpack.esql.plan.logical.Grok;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
@@ -87,6 +88,7 @@
 import static java.util.Collections.emptyList;
 import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomConfiguration;
 import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT;
+import static org.elasticsearch.xpack.esql.index.EsIndexSerializationTests.randomEsIndex;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -491,6 +493,9 @@ public void accept(Page page) {
         if (argClass == Configuration.class) {
             return randomConfiguration();
         }
+        if (argClass == EsIndex.class) {
+            return randomEsIndex();
+        }
         if (argClass == JoinConfig.class) {
             return new JoinConfig(
                 JoinTypes.LEFT,