diff options
6 files changed, 2 insertions, 25 deletions
diff --git a/hosted-zone-api/abi-spec.json b/hosted-zone-api/abi-spec.json index 11375d97972..826f731b4e0 100644 --- a/hosted-zone-api/abi-spec.json +++ b/hosted-zone-api/abi-spec.json @@ -73,7 +73,6 @@ ], "methods": [ "public void <init>(ai.vespa.cloud.ApplicationId, ai.vespa.cloud.Zone, ai.vespa.cloud.Cluster, ai.vespa.cloud.Node)", - "public void <init>(ai.vespa.cloud.Zone, ai.vespa.cloud.Cluster, ai.vespa.cloud.Node)", "public ai.vespa.cloud.ApplicationId application()", "public ai.vespa.cloud.Zone zone()", "public ai.vespa.cloud.Cluster cluster()", @@ -106,7 +105,6 @@ ], "methods": [ "public void <init>(ai.vespa.cloud.ApplicationId, ai.vespa.cloud.Zone)", - "public void <init>(ai.vespa.cloud.Zone)", "public ai.vespa.cloud.ApplicationId application()", "public ai.vespa.cloud.Zone zone()", "public static ai.vespa.cloud.ZoneInfo defaultInfo()" diff --git a/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java b/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java index 3789c49fe82..752e78b580f 100644 --- a/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java +++ b/hosted-zone-api/src/main/java/ai/vespa/cloud/SystemInfo.java @@ -23,12 +23,6 @@ public class SystemInfo { this.node = Objects.requireNonNull(node, "Node cannot be null"); } - /** @deprecated pass an application id */ - @Deprecated // Remove on Vespa 8 - public SystemInfo(Zone zone, Cluster cluster, Node node) { - this(new ApplicationId("default", "default", "default"), zone, cluster, node); - } - /** Returns the application this is running as a part of */ public ApplicationId application() { return application; } diff --git a/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java b/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java index e4b69caa940..f29b921115e 100644 --- a/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java +++ b/hosted-zone-api/src/main/java/ai/vespa/cloud/ZoneInfo.java @@ -25,12 +25,6 @@ public class ZoneInfo { this.zone = Objects.requireNonNull(zone, "Zone cannot be null!"); } - /** @deprecated pass an application id */ - @Deprecated // Remove on Vespa 8 - public ZoneInfo(Zone zone) { - this(new ApplicationId("default", "default", "default"), zone); - } - /** Returns the application this is running as part of */ public ApplicationId application() { return application; } diff --git a/linguistics/abi-spec.json b/linguistics/abi-spec.json index c3e489b8dd9..0961c87cbd8 100644 --- a/linguistics/abi-spec.json +++ b/linguistics/abi-spec.json @@ -734,8 +734,7 @@ "abstract" ], "methods": [ - "public abstract java.lang.Iterable tokenize(java.lang.String, com.yahoo.language.Language, com.yahoo.language.process.StemMode, boolean)", - "public java.lang.String getReplacementTerm(java.lang.String)" + "public abstract java.lang.Iterable tokenize(java.lang.String, com.yahoo.language.Language, com.yahoo.language.process.StemMode, boolean)" ], "fields": [] }, diff --git a/linguistics/src/main/java/com/yahoo/language/process/Tokenizer.java b/linguistics/src/main/java/com/yahoo/language/process/Tokenizer.java index 0edf96e009b..8125f6e504a 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/Tokenizer.java +++ b/linguistics/src/main/java/com/yahoo/language/process/Tokenizer.java @@ -22,12 +22,4 @@ public interface Tokenizer { */ Iterable<Token> tokenize(String input, Language language, StemMode stemMode, boolean removeAccents); - /** - * Not used. - * - * @deprecated replacements are already applied in tokens returned by tokenize - */ - @Deprecated // Remove on Vespa 8 - default String getReplacementTerm(String tokenString) { return tokenString; } - } diff --git a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java index 0c9af994c3d..ec99f99b930 100644 --- a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java +++ b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java @@ -17,7 +17,7 @@ import com.yahoo.log.LogMessage; * * @author Bjorn Borud */ -@SuppressWarnings({"deprecation","removal"}) // TODO Vespa 8: remove (com.yahoo.log.event) +@SuppressWarnings("deprecation") public class VerifyLogfile { public static void main (String[] args) throws IOException { |