Runtime fields: rename fielddata and mapped field type classes (#62483)

With this commit we rename all of the fielddata, doc_values and mapped field type classes for runtime fields to not start with the Script prefix but rather their runtime type (e.g. Boolean) and only then Script

Author: javanna

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptBinaryFieldData.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/BinaryScriptFieldData.java

@@ -18,10 +18,10 @@
 import org.elasticsearch.search.sort.BucketedSort;
 import org.elasticsearch.search.sort.SortOrder;
 
-public abstract class ScriptBinaryFieldData implements IndexFieldData<ScriptBinaryFieldData.ScriptBinaryLeafFieldData> {
+public abstract class BinaryScriptFieldData implements IndexFieldData<BinaryScriptFieldData.BinaryScriptLeafFieldData> {
     private final String fieldName;
 
-    protected ScriptBinaryFieldData(String fieldName) {
+    protected BinaryScriptFieldData(String fieldName) {
         this.fieldName = fieldName;
     }
 
@@ -31,7 +31,7 @@ public String getFieldName() {
     }
 
     @Override
-    public ScriptBinaryLeafFieldData load(LeafReaderContext context) {
+    public BinaryScriptLeafFieldData load(LeafReaderContext context) {
         try {
             return loadDirect(context);
         } catch (Exception e) {
@@ -59,7 +59,7 @@ public BucketedSort newBucketedSort(
         throw new IllegalArgumentException("only supported on numeric fields");
     }
 
-    public abstract class ScriptBinaryLeafFieldData implements LeafFieldData {
+    public abstract class BinaryScriptLeafFieldData implements LeafFieldData {
         @Override
         public long ramBytesUsed() {
             return 0;

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptBooleanDocValues.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/BooleanScriptDocValues.java

@@ -11,11 +11,11 @@
 
 import java.io.IOException;
 
-public final class ScriptBooleanDocValues extends AbstractSortedNumericDocValues {
+public final class BooleanScriptDocValues extends AbstractSortedNumericDocValues {
     private final BooleanFieldScript script;
     private int cursor;
 
-    ScriptBooleanDocValues(BooleanFieldScript script) {
+    BooleanScriptDocValues(BooleanFieldScript script) {
         this.script = script;
     }
 

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptBooleanFieldData.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/BooleanScriptFieldData.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public final class ScriptBooleanFieldData extends IndexNumericFieldData {
+public final class BooleanScriptFieldData extends IndexNumericFieldData {
 
     public static class Builder implements IndexFieldData.Builder {
         private final String name;
@@ -33,15 +33,15 @@ public Builder(String name, BooleanFieldScript.LeafFactory leafFactory) {
         }
 
         @Override
-        public ScriptBooleanFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new ScriptBooleanFieldData(name, leafFactory);
+        public BooleanScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
+            return new BooleanScriptFieldData(name, leafFactory);
         }
     }
 
     private final String fieldName;
     private final BooleanFieldScript.LeafFactory leafFactory;
 
-    private ScriptBooleanFieldData(String fieldName, BooleanFieldScript.LeafFactory leafFactory) {
+    private BooleanScriptFieldData(String fieldName, BooleanFieldScript.LeafFactory leafFactory) {
         this.fieldName = fieldName;
         this.leafFactory = leafFactory;
     }
@@ -57,7 +57,7 @@ public ValuesSourceType getValuesSourceType() {
     }
 
     @Override
-    public ScriptBooleanLeafFieldData load(LeafReaderContext context) {
+    public BooleanScriptLeafFieldData load(LeafReaderContext context) {
         try {
             return loadDirect(context);
         } catch (Exception e) {
@@ -66,8 +66,8 @@ public ScriptBooleanLeafFieldData load(LeafReaderContext context) {
     }
 
     @Override
-    public ScriptBooleanLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
-        return new ScriptBooleanLeafFieldData(new ScriptBooleanDocValues(leafFactory.newInstance(context)));
+    public BooleanScriptLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
+        return new BooleanScriptLeafFieldData(new BooleanScriptDocValues(leafFactory.newInstance(context)));
     }
 
     @Override
@@ -80,17 +80,17 @@ protected boolean sortRequiresCustomComparator() {
         return true;
     }
 
-    public static class ScriptBooleanLeafFieldData extends LeafLongFieldData {
-        private final ScriptBooleanDocValues scriptBooleanDocValues;
+    public static class BooleanScriptLeafFieldData extends LeafLongFieldData {
+        private final BooleanScriptDocValues booleanScriptDocValues;
 
-        ScriptBooleanLeafFieldData(ScriptBooleanDocValues scriptBooleanDocValues) {
+        BooleanScriptLeafFieldData(BooleanScriptDocValues booleanScriptDocValues) {
             super(0, NumericType.BOOLEAN);
-            this.scriptBooleanDocValues = scriptBooleanDocValues;
+            this.booleanScriptDocValues = booleanScriptDocValues;
         }
 
         @Override
         public SortedNumericDocValues getLongValues() {
-            return scriptBooleanDocValues;
+            return booleanScriptDocValues;
         }
 
         @Override

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptDateFieldData.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/DateScriptFieldData.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public final class ScriptDateFieldData extends IndexNumericFieldData {
+public final class DateScriptFieldData extends IndexNumericFieldData {
 
     public static class Builder implements IndexFieldData.Builder {
         private final String name;
@@ -33,15 +33,15 @@ public Builder(String name, DateFieldScript.LeafFactory leafFactory) {
         }
 
         @Override
-        public ScriptDateFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new ScriptDateFieldData(name, leafFactory);
+        public DateScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
+            return new DateScriptFieldData(name, leafFactory);
         }
     }
 
     private final String fieldName;
     private final DateFieldScript.LeafFactory leafFactory;
 
-    private ScriptDateFieldData(String fieldName, DateFieldScript.LeafFactory leafFactory) {
+    private DateScriptFieldData(String fieldName, DateFieldScript.LeafFactory leafFactory) {
         this.fieldName = fieldName;
         this.leafFactory = leafFactory;
     }
@@ -57,7 +57,7 @@ public ValuesSourceType getValuesSourceType() {
     }
 
     @Override
-    public ScriptDateLeafFieldData load(LeafReaderContext context) {
+    public DateScriptLeafFieldData load(LeafReaderContext context) {
         try {
             return loadDirect(context);
         } catch (Exception e) {
@@ -66,8 +66,8 @@ public ScriptDateLeafFieldData load(LeafReaderContext context) {
     }
 
     @Override
-    public ScriptDateLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
-        return new ScriptDateLeafFieldData(new ScriptLongDocValues(leafFactory.newInstance(context)));
+    public DateScriptLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
+        return new DateScriptLeafFieldData(new LongScriptDocValues(leafFactory.newInstance(context)));
     }
 
     @Override
@@ -80,17 +80,17 @@ protected boolean sortRequiresCustomComparator() {
         return true;
     }
 
-    public static class ScriptDateLeafFieldData extends LeafLongFieldData {
-        private final ScriptLongDocValues scriptLongDocValues;
+    public static class DateScriptLeafFieldData extends LeafLongFieldData {
+        private final LongScriptDocValues longScriptDocValues;
 
-        ScriptDateLeafFieldData(ScriptLongDocValues scriptLongDocValues) {
+        DateScriptLeafFieldData(LongScriptDocValues longScriptDocValues) {
             super(0, NumericType.DATE);
-            this.scriptLongDocValues = scriptLongDocValues;
+            this.longScriptDocValues = longScriptDocValues;
         }
 
         @Override
         public SortedNumericDocValues getLongValues() {
-            return scriptLongDocValues;
+            return longScriptDocValues;
         }
     }
 }

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptDoubleDocValues.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/DoubleScriptDocValues.java

@@ -12,11 +12,11 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-public final class ScriptDoubleDocValues extends SortedNumericDoubleValues {
+public final class DoubleScriptDocValues extends SortedNumericDoubleValues {
     private final DoubleFieldScript script;
     private int cursor;
 
-    ScriptDoubleDocValues(DoubleFieldScript script) {
+    DoubleScriptDocValues(DoubleFieldScript script) {
         this.script = script;
     }
 

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptDoubleFieldData.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/DoubleScriptFieldData.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public final class ScriptDoubleFieldData extends IndexNumericFieldData {
+public final class DoubleScriptFieldData extends IndexNumericFieldData {
 
     public static class Builder implements IndexFieldData.Builder {
         private final String name;
@@ -33,15 +33,15 @@ public Builder(String name, DoubleFieldScript.LeafFactory leafFactory) {
         }
 
         @Override
-        public ScriptDoubleFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new ScriptDoubleFieldData(name, leafFactory);
+        public DoubleScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
+            return new DoubleScriptFieldData(name, leafFactory);
         }
     }
 
     private final String fieldName;
     DoubleFieldScript.LeafFactory leafFactory;
 
-    private ScriptDoubleFieldData(String fieldName, DoubleFieldScript.LeafFactory leafFactory) {
+    private DoubleScriptFieldData(String fieldName, DoubleFieldScript.LeafFactory leafFactory) {
         this.fieldName = fieldName;
         this.leafFactory = leafFactory;
     }
@@ -57,7 +57,7 @@ public ValuesSourceType getValuesSourceType() {
     }
 
     @Override
-    public ScriptDoubleLeafFieldData load(LeafReaderContext context) {
+    public DoubleScriptLeafFieldData load(LeafReaderContext context) {
         try {
             return loadDirect(context);
         } catch (Exception e) {
@@ -66,8 +66,8 @@ public ScriptDoubleLeafFieldData load(LeafReaderContext context) {
     }
 
     @Override
-    public ScriptDoubleLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
-        return new ScriptDoubleLeafFieldData(new ScriptDoubleDocValues(leafFactory.newInstance(context)));
+    public DoubleScriptLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
+        return new DoubleScriptLeafFieldData(new DoubleScriptDocValues(leafFactory.newInstance(context)));
     }
 
     @Override
@@ -80,17 +80,17 @@ protected boolean sortRequiresCustomComparator() {
         return true;
     }
 
-    public static class ScriptDoubleLeafFieldData extends LeafDoubleFieldData {
-        private final ScriptDoubleDocValues scriptDoubleDocValues;
+    public static class DoubleScriptLeafFieldData extends LeafDoubleFieldData {
+        private final DoubleScriptDocValues doubleScriptDocValues;
 
-        ScriptDoubleLeafFieldData(ScriptDoubleDocValues scriptDoubleDocValues) {
+        DoubleScriptLeafFieldData(DoubleScriptDocValues doubleScriptDocValues) {
             super(0);
-            this.scriptDoubleDocValues = scriptDoubleDocValues;
+            this.doubleScriptDocValues = doubleScriptDocValues;
         }
 
         @Override
         public SortedNumericDoubleValues getDoubleValues() {
-            return scriptDoubleDocValues;
+            return doubleScriptDocValues;
         }
 
         @Override

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptIpDocValues.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/IpScriptDocValues.java

@@ -10,14 +10,13 @@
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.xpack.runtimefields.mapper.IpFieldScript;
 
-import java.io.IOException;
 import java.util.Arrays;
 
-public final class ScriptIpDocValues extends SortedBinaryDocValues {
+public final class IpScriptDocValues extends SortedBinaryDocValues {
     private final IpFieldScript script;
     private int cursor;
 
-    ScriptIpDocValues(IpFieldScript script) {
+    IpScriptDocValues(IpFieldScript script) {
         this.script = script;
     }
 
@@ -33,7 +32,7 @@ public boolean advanceExact(int docId) {
     }
 
     @Override
-    public BytesRef nextValue() throws IOException {
+    public BytesRef nextValue() {
         return script.values()[cursor++];
     }
 

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptIpFieldData.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/IpScriptFieldData.java

@@ -25,7 +25,7 @@
 
 import java.net.InetAddress;
 
-public class ScriptIpFieldData extends ScriptBinaryFieldData {
+public class IpScriptFieldData extends BinaryScriptFieldData {
     public static class Builder implements IndexFieldData.Builder {
         private final String name;
         private final IpFieldScript.LeafFactory leafFactory;
@@ -36,30 +36,30 @@ public Builder(String name, IpFieldScript.LeafFactory leafFactory) {
         }
 
         @Override
-        public ScriptIpFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new ScriptIpFieldData(name, leafFactory);
+        public IpScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
+            return new IpScriptFieldData(name, leafFactory);
         }
     }
 
     private final IpFieldScript.LeafFactory leafFactory;
 
-    private ScriptIpFieldData(String fieldName, IpFieldScript.LeafFactory leafFactory) {
+    private IpScriptFieldData(String fieldName, IpFieldScript.LeafFactory leafFactory) {
         super(fieldName);
         this.leafFactory = leafFactory;
     }
 
     @Override
-    public ScriptBinaryLeafFieldData loadDirect(LeafReaderContext context) throws Exception {
+    public BinaryScriptLeafFieldData loadDirect(LeafReaderContext context) throws Exception {
         IpFieldScript script = leafFactory.newInstance(context);
-        return new ScriptBinaryLeafFieldData() {
+        return new BinaryScriptLeafFieldData() {
             @Override
             public ScriptDocValues<String> getScriptValues() {
                 return new IpScriptDocValues(getBytesValues());
             }
 
             @Override
             public SortedBinaryDocValues getBytesValues() {
-                return new ScriptIpDocValues(script);
+                return new org.elasticsearch.xpack.runtimefields.fielddata.IpScriptDocValues(script);
             }
         };
     }

x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/ScriptLongDocValues.java renamed to x-pack/plugin/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/fielddata/LongScriptDocValues.java

@@ -9,14 +9,13 @@
 import org.elasticsearch.index.fielddata.AbstractSortedNumericDocValues;
 import org.elasticsearch.xpack.runtimefields.mapper.AbstractLongFieldScript;
 
-import java.io.IOException;
 import java.util.Arrays;
 
-public final class ScriptLongDocValues extends AbstractSortedNumericDocValues {
+public final class LongScriptDocValues extends AbstractSortedNumericDocValues {
     private final AbstractLongFieldScript script;
     private int cursor;
 
-    ScriptLongDocValues(AbstractLongFieldScript script) {
+    LongScriptDocValues(AbstractLongFieldScript script) {
         this.script = script;
     }
 
@@ -32,7 +31,7 @@ public boolean advanceExact(int docId) {
     }
 
     @Override
-    public long nextValue() throws IOException {
+    public long nextValue() {
         return script.values()[cursor++];
     }