diff options
Diffstat (limited to 'container-search')
4 files changed, 7 insertions, 9 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 1cc397d2ed3..1ec90e23074 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -8181,9 +8181,7 @@ "public com.yahoo.search.searchchain.Execution$Context context()", "public com.yahoo.search.statistics.TimeTracker timer()" ], - "fields": [ - "public static final java.lang.String ATTRIBUTEPREFETCH" - ] + "fields": [] }, "com.yahoo.search.searchchain.ExecutionFactory": { "superClass": "com.yahoo.component.AbstractComponent", diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java index 6c5eef1a84b..3ec25dfe3a8 100644 --- a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java +++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java @@ -178,8 +178,7 @@ public class JSONString implements Inspectable { public abstract void closeTag(StringBuilder renderTarget, int nestingLevel, String closing); /** Returns a value from an object, or null if not found */ - @Deprecated // TODO: Remove on Vespa 8 - protected static Object get(String field, JSONObject source) { + static Object get(String field, JSONObject source) { try { return source.get(field); } diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index 5cde0b2a087..0a85c636213 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -41,10 +41,6 @@ import java.util.concurrent.Executors; */ public class Execution extends com.yahoo.processing.execution.Execution { - /** @deprecated - applications should define their own summary class instead */ - @Deprecated(since = "7", forRemoval = true) - public static final String ATTRIBUTEPREFETCH = "attributeprefetch"; - /** * The execution context is the search chain's current view of the indexes, * search chain registrys, etc. Searcher instances may set values here to diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java index 0a4dcb2eec1..570b1d006de 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java @@ -56,7 +56,9 @@ import com.yahoo.text.Utf8; import com.yahoo.yolean.Exceptions; import com.yahoo.yolean.trace.TraceNode; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -82,6 +84,9 @@ public class JsonRendererTestCase { private static final ObjectMapper jsonMapper = new ObjectMapper(); + @Rule + public Timeout globalTimeout = Timeout.seconds(300); + private final JsonRenderer originalRenderer; private JsonRenderer renderer; |