diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java index fde35d9e8d0..e4e4248454b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java @@ -43,14 +43,8 @@ public interface FieldDataType { public static final LongFieldDataType LONG = new LongFieldDataType(); public static final FloatFieldDataType FLOAT = new FloatFieldDataType(); public static final DoubleFieldDataType DOUBLE = new DoubleFieldDataType(); - - public static boolean isNumeric(FieldDataType type) { - return type == INT || type == LONG || type == FLOAT || type == DOUBLE; - } } - Class fieldDataClass(); - FieldComparatorSource newFieldComparatorSource(FieldDataCache cache); T load(IndexReader reader, String fieldName) throws IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java index 39551247b30..7abd9f9ae3a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class DoubleFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return DoubleFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java index 9bce9aaf757..240bbe6a187 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class FloatFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return FloatFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java index cb3493c8dc8..9902ac92ec7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class IntFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return IntFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java index 9814a058d03..d57fb2afee6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class LongFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return LongFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java index 15769b45e6a..1c8bcd1ba1e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class ShortFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return ShortFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java index 1ddbb3e9048..529808dad02 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java @@ -32,10 +32,6 @@ import java.io.IOException; */ public class StringFieldDataType implements FieldDataType { - @Override public Class fieldDataClass() { - return StringFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldDataType.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldDataType.java index 28451ad29d7..b2cabc6a441 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldDataType.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldDataType.java @@ -35,10 +35,6 @@ public class GeoPointFieldDataType implements FieldDataType { public static final GeoPointFieldDataType TYPE = new GeoPointFieldDataType(); - @Override public Class fieldDataClass() { - return GeoPointFieldData.class; - } - @Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) { return new FieldComparatorSource() { @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {