1 files changed, 1 insertions, 31 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 28d426cec06..8d73f6795d4 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -77,7 +77,6 @@ public class FastHit extends Hit {
     // Note: This constructor is only used for tests, production use is always of the empty constructor
     public FastHit(String uri, double relevance, String source) {
         setId(uri);
-        super.setField("uri", uri); // TODO: Remove on Vespa 7
         setRelevance(new Relevance(relevance));
         setSource(source);
         types().add("summary");
@@ -97,13 +96,6 @@ public class FastHit extends Hit {
         URI uri = super.getId();
         if (uri != null) return uri;
 
-        // TODO: Remove on Vespa 7, this should be one of the last vestiges of URL field magic
-        Object uriField = getField("uri");
-        if (uriField != null) {
-            setId(uriField.toString());
-            return super.getId();
-        }
-
         // Fallback to index:[source]/[partid]/[id]
         if (indexUri != null) return indexUri;
         StringBuilder sb = new StringBuilder(64);
@@ -315,21 +307,6 @@ public class FastHit extends Hit {
         return super.hasFields();
     }
 
-    /**
-     * Changes the key under which a value is found. This is useful because it allows keys to be changed
-     * without accessing the value (which may be lazily created).
-     *
-     * @deprecated do not use
-     */
-    @Deprecated // OK
-    @Override
-    @SuppressWarnings("deprecation")
-    public void changeFieldKey(String oldKey, String newKey) {
-        Object value = removeField(oldKey);
-        if (value != null)
-            setField(newKey, value);
-    }
-
     private Object getSummaryValue(String name) {
         if (removedFields != null && removedFields.contains(name))
             return null;
@@ -357,13 +334,6 @@ public class FastHit extends Hit {
         }
     }
 
-    /** @deprecated do not use */
-    // TODO: Make private on Vespa 7
-    @Deprecated // OK
-    public static String asHexString(GlobalId gid) {
-        return asHexString(new StringBuilder(), gid).toString();
-    }
-
     private static StringBuilder asHexString(StringBuilder sb, GlobalId gid) {
         byte[] rawGid = gid.getRawId();
         for (byte b : rawGid) {
@@ -539,7 +509,7 @@ public class FastHit extends Hit {
             DocsumField fieldType = type.getField(name);
             if (fieldType == null) return null;
             Inspector fieldValue = data.field(name);
-            if ( ! fieldValue.valid() && ! fieldType.getEmulConfig().forceFillEmptyFields()) return null;
+            if ( ! fieldValue.valid()) return null;
             return fieldType.convert(fieldValue);
         }