Remove SourceBasedValueFetcher

Author: martijnvg

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

@@ -173,7 +173,7 @@ protected Object parseSourceValue(Object value) {
             };
         }
 
-        public SourceBasedValueFetcher valueFetcher(Set<String> sourcePaths, T nullValue, String format, IndexSettings indexSettings) {
+        public ValueFetcher valueFetcher(Set<String> sourcePaths, T nullValue, String format, IndexSettings indexSettings) {
             Function<List<T>, List<Object>> formatter = getFormatter(format != null ? format : GeometryFormatterFactory.GEOJSON);
             return new ArraySourceValueFetcher(sourcePaths, nullValueAsSource(nullValue), indexSettings.getIgnoredSourceFormat()) {
                 @Override

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

@@ -28,7 +28,7 @@
  * array values in parsing. Field types should use this class if their corresponding
  * mapper returns true for {@link FieldMapper#parsesArrayValue()}.
  */
-public abstract class ArraySourceValueFetcher implements SourceBasedValueFetcher {
+public abstract class ArraySourceValueFetcher implements ValueFetcher {
     private final Set<String> sourcePaths;
     private final @Nullable Object nullValue;
     private final IgnoredSourceFormat ignoredSourceFormat;

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

@@ -95,7 +95,7 @@ private abstract static class SourceBlockLoader implements BlockLoader {
         protected final ValueFetcher fetcher;
         private final LeafIteratorLookup lookup;
 
-        private SourceBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        private SourceBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             this.fetcher = fetcher;
             this.lookup = lookup;
         }
@@ -143,7 +143,7 @@ public final String toString() {
      * Load {@code boolean}s from {@code _source}.
      */
     public static class BooleansBlockLoader extends SourceBlockLoader {
-        public BooleansBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public BooleansBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -183,7 +183,7 @@ public String toString() {
      * Load {@link BytesRef}s from {@code _source}.
      */
     public static class BytesRefsBlockLoader extends SourceBlockLoader {
-        public BytesRefsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public BytesRefsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -204,7 +204,7 @@ protected String name() {
     }
 
     public static class GeometriesBlockLoader extends SourceBlockLoader {
-        public GeometriesBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public GeometriesBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -267,7 +267,7 @@ public String toString() {
      * Load {@code double}s from {@code _source}.
      */
     public static class DoublesBlockLoader extends SourceBlockLoader {
-        public DoublesBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public DoublesBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -309,7 +309,7 @@ public String toString() {
     public static class DenseVectorBlockLoader extends SourceBlockLoader {
         private final int dimensions;
 
-        public DenseVectorBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup, int dimensions) {
+        public DenseVectorBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup, int dimensions) {
             super(fetcher, lookup);
             this.dimensions = dimensions;
         }
@@ -350,7 +350,7 @@ public String toString() {
      * Load {@code int}s from {@code _source}.
      */
     public static class IntsBlockLoader extends SourceBlockLoader {
-        public IntsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public IntsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -390,7 +390,7 @@ public String toString() {
      * Load {@code long}s from {@code _source}.
      */
     public static class LongsBlockLoader extends SourceBlockLoader {
-        public LongsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public LongsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -430,7 +430,7 @@ public String toString() {
      * Load {@code ip}s from {@code _source}.
      */
     public static class IpsBlockLoader extends SourceBlockLoader {
-        public IpsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public IpsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 

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

@@ -30,7 +30,7 @@
  *
  * Field types that handle arrays directly should instead use {@link ArraySourceValueFetcher}.
  */
-public abstract class SourceValueFetcher implements SourceBasedValueFetcher {
+public abstract class SourceValueFetcher implements ValueFetcher {
     private final Set<String> sourcePaths;
     private final @Nullable Object nullValue;
     private final IgnoredSourceFormat ignoredSourceFormat;