From 2b7f0a47e70c144995b241cdb13a530a58f2bdad Mon Sep 17 00:00:00 2001
From: jimczi <jimczi@apache.org>
Date: Thu, 31 Jan 2019 13:48:54 +0100
Subject: [PATCH] Remove AtomiFieldData#getLegacyFieldValues

This function is unused now that we format the docvalue fields with the default
formatter on the field (#30831)
---
 .../index/fielddata/AtomicFieldData.java      |  7 ----
 .../fielddata/plain/AtomicLongFieldData.java  | 33 -------------------
 2 files changed, 40 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
index c4f310073c488..20c9c3c70c10c 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
@@ -32,13 +32,6 @@ public interface AtomicFieldData extends Accountable, Releasable {
      */
     ScriptDocValues<?> getScriptValues();
 
-    /**
-     * Returns field values for use by returned hits.
-     */
-    default ScriptDocValues<?> getLegacyFieldValues() {
-        return getScriptValues();
-    }
-
     /**
      * Return a String representation of the values.
      */
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
index 66b25c21c8051..9e0f3ab073619 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
@@ -25,11 +25,6 @@
 import org.elasticsearch.index.fielddata.ScriptDocValues;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
-import org.elasticsearch.script.JodaCompatibleZonedDateTime;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
-import java.io.IOException;
 
 /**
  * Specialization of {@link AtomicNumericFieldData} for integers.
@@ -52,34 +47,6 @@ public long ramBytesUsed() {
         return ramBytesUsed;
     }
 
-    @Override
-    public final ScriptDocValues<?> getLegacyFieldValues() {
-        switch (numericType) {
-            case DATE:
-                final ScriptDocValues.Dates realDV = new ScriptDocValues.Dates(getLongValues());
-                return new ScriptDocValues<DateTime>() {
-
-                    @Override
-                    public int size() {
-                        return realDV.size();
-                    }
-
-                    @Override
-                    public DateTime get(int index) {
-                        JodaCompatibleZonedDateTime dt = realDV.get(index);
-                        return new DateTime(dt.toInstant().toEpochMilli(), DateTimeZone.UTC);
-                    }
-
-                    @Override
-                    public void setNextDocId(int docId) throws IOException {
-                        realDV.setNextDocId(docId);
-                    }
-                };
-            default:
-                return getScriptValues();
-        }
-    }
-
     @Override
     public final ScriptDocValues<?> getScriptValues() {
         switch (numericType) {