Remove on Vespa 8

5 files changed, 2 insertions, 36 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 0c6437fd754..f92992c28ca 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -6653,7 +6653,6 @@
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.search.Query, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.language.process.Embedder)",
       "public void <init>(com.yahoo.search.Query, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, java.util.Map)",
       "public void setParentQuery(com.yahoo.search.Query)",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
@@ -6851,12 +6850,10 @@
       "public"
     ],
     "methods": [
-      "public void <init>()",
       "public void <init>(com.yahoo.search.query.Ranking)",
       "public void put(java.lang.String, double)",
       "public void put(java.lang.String, com.yahoo.tensor.Tensor)",
       "public void put(java.lang.String, java.lang.String)",
-      "public java.lang.String get(java.lang.String)",
       "public java.lang.Object getObject(java.lang.String)",
       "public java.util.OptionalDouble getDouble(java.lang.String)",
       "public java.util.Optional getTensor(java.lang.String)",
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 7d1a62310a3..4cced8d7923 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -36,11 +36,6 @@ public class QueryProperties extends Properties {
     private final CompiledQueryProfileRegistry profileRegistry;
     private final Map<String, Embedder> embedders;
 
-    @Deprecated  // TODO: Remove on Vespa 8
-    public QueryProperties(Query query, CompiledQueryProfileRegistry profileRegistry, Embedder embedder) {
-        this(query, profileRegistry, Map.of(Embedder.defaultEmbedderId, embedder));
-    }
-
     public QueryProperties(Query query, CompiledQueryProfileRegistry profileRegistry, Map<String, Embedder> embedders) {
         this.query = query;
         this.profileRegistry = profileRegistry;
@@ -379,7 +374,7 @@ public class QueryProperties extends Properties {
             try {
                 query.getRanking().getFeatures().put(key, Double.parseDouble(valueString));
             }
-            catch (IllegalArgumentException e) { // TODO: Throw instead on Vespa 8
+            catch (IllegalArgumentException e) {
                 query.getRanking().getFeatures().put(key, valueString);
             }
         }
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java
index 4207080b3e5..6ea371f12a3 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java
@@ -24,8 +24,7 @@ public class QueryPropertyAliases extends PropertyAliases {
     @Override
     protected CompoundName unalias(CompoundName nameOrAlias) {
         if (nameOrAlias.first().equalsIgnoreCase("rankfeature")
-            || nameOrAlias.first().equalsIgnoreCase("input")
-            || nameOrAlias.first().equalsIgnoreCase("featureoverride")) { // deprecated: TODO Remove on Vespa 8
+            || nameOrAlias.first().equalsIgnoreCase("input")) {
             if (nameOrAlias.size() > 1) // only alias the prefix
                 return nameOrAlias.rest().prepend("ranking", "features");
             else
diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java b/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
index 4e92c3696fd..26d2c877f64 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
@@ -27,12 +27,6 @@ public class RankFeatures implements Cloneable {
     private final Ranking parent;
     private final Map<String, Object> features;
 
-    /** @deprecated pass the parent */
-    @Deprecated // TODO: Remove on Vespa 8
-    public RankFeatures() {
-        this(new Ranking(new Query()));
-    }
-
     public RankFeatures(Ranking parent) {
         this(parent, new LinkedHashMap<>());
     }
@@ -69,18 +63,6 @@ public class RankFeatures implements Cloneable {
         features.put(name, value);
     }
 
-    /**
-     * Returns a rank feature as a string by full name or null if not set
-     *
-     * @deprecated use getTensor (or getDouble) instead
-     */
-    @Deprecated // TODO: Remove on Vespa 8
-    public String get(String name) {
-        Object value = features.get(name);
-        if (value == null) return null;
-        return value.toString();
-    }
-
     /** Returns this value as either a Double, Tensor or String. Returns null if the value is not set. */
     public Object getObject(String name) {
         return features.get(name);
diff --git a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
index 09dbfb8e5c8..7a9080f46db 100644
--- a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
@@ -80,13 +80,6 @@ public class RankingTestCase {
         q.getRanking().setSorting((String)null);
     }
 
-    /** Tests deprecated naming */
-    @Test
-    public void testFeatureOverride() {
-        Query query = new Query("?query=abc&featureoverride.something=2");
-        assertEquals(2, query.getRanking().getFeatures().getDouble("something").getAsDouble(), 0.0000001);
-    }
-
     @Test
     public void testStructuredRankProperty() {
         Query query = new Query("?query=abc&rankproperty.distanceToPath(gps_position).path=(0,0,10,0,10,5,20,5)");