Merge branch 'main' into add_signature_to_headers

Author: jfreden

server/src/main/java/org/elasticsearch/index/mapper/IndexType.java

@@ -9,10 +9,13 @@
 
 package org.elasticsearch.index.mapper;
 
+import java.util.Objects;
+
 /**
  * What type of index structure is available for this field
  */
-public class IndexType {
+// NB This is a class not a record because it has a private constructor
+public final class IndexType {
 
     /**
      * An IndexType with no index structures or doc values
@@ -109,16 +112,10 @@ public boolean supportsSortShortcuts() {
      * @return an inverted-index based IndexType
      */
     public static IndexType terms(boolean isIndexed, boolean hasDocValues) {
-        if (isIndexed && hasDocValues) {
-            return new IndexType(true, false, false, false, true, false);
-        }
-        if (isIndexed) {
-            return new IndexType(true, false, false, false, false, false);
-        }
-        if (hasDocValues) {
-            return new IndexType(false, false, false, false, true, false);
+        if (isIndexed == false && hasDocValues == false) {
+            return NONE;
         }
-        return NONE;
+        return new IndexType(isIndexed, false, false, false, hasDocValues, false);
     }
 
     /**
@@ -132,16 +129,10 @@ public static IndexType skippers() {
      * @return a point-based IndexType
      */
     public static IndexType points(boolean isIndexed, boolean hasDocValues) {
-        if (isIndexed && hasDocValues) {
-            return new IndexType(false, true, true, false, true, false);
-        }
-        if (isIndexed) {
-            return new IndexType(false, true, true, false, false, false);
-        }
-        if (hasDocValues) {
-            return new IndexType(false, false, false, false, true, false);
+        if (isIndexed == false && hasDocValues == false) {
+            return IndexType.NONE;
         }
-        return NONE;
+        return new IndexType(false, isIndexed, isIndexed, false, hasDocValues, false);
     }
 
     /**
@@ -164,4 +155,40 @@ public static IndexType docValuesOnly() {
     public static IndexType vectors() {
         return new IndexType(false, false, false, true, false, false);
     }
+
+    @Override
+    public String toString() {
+        return "IndexType{"
+            + "hasTerms="
+            + hasTerms
+            + ", hasPoints="
+            + hasPoints
+            + ", hasPointsMetadata="
+            + hasPointsMetadata
+            + ", hasVectors="
+            + hasVectors
+            + ", hasDocValues="
+            + hasDocValues
+            + ", hasDocValuesSkipper="
+            + hasDocValuesSkipper
+            + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof IndexType indexType) {
+            return hasTerms == indexType.hasTerms
+                && hasPoints == indexType.hasPoints
+                && hasPointsMetadata == indexType.hasPointsMetadata
+                && hasVectors == indexType.hasVectors
+                && hasDocValues == indexType.hasDocValues
+                && hasDocValuesSkipper == indexType.hasDocValuesSkipper;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(hasTerms, hasPoints, hasPointsMetadata, hasVectors, hasDocValues, hasDocValuesSkipper);
+    }
 }