Suppress deprecation warnings

4 files changed, 6 insertions, 1 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java b/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
index d72d720468c..b4d3a886b10 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigFileFormat.java
@@ -192,6 +192,8 @@ public class ConfigFileFormat implements SlimeFormat, ObjectTraverser {
     }
 
     @Override
+    @Deprecated(since = "7", forRemoval = true)
+    @SuppressWarnings("removal")
     public void decode(InputStream is, Slime slime) throws IOException {
         throw new UnsupportedOperationException("decode is not supported");
     }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
index 3772aafa044..5532ccbda9c 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
@@ -40,6 +40,8 @@ public final class JsonFormat implements SlimeFormat {
     }
 
     @Override
+    @Deprecated(since = "7", forRemoval = true)
+    @SuppressWarnings("removal")
     public void decode(InputStream is, Slime slime) {
         throw new UnsupportedOperationException("Not implemented");
     }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
index 64f71625dc1..86003f519bc 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
@@ -25,7 +25,7 @@ public interface SlimeFormat {
      * @param slime The slime object to decode into.
      * @deprecated use e.g. {@link JsonDecoder} instead
      */
-    @Deprecated(forRemoval = true, since = "7")
+    @Deprecated(since = "7", forRemoval = true)
     void decode(InputStream is, Slime slime) throws IOException;
 
 }
diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java
index 763f8cb221c..e06b9826385 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java
@@ -227,6 +227,7 @@ public class JsonFormatTestCase {
     }
 
     @Test(expected = UnsupportedOperationException.class)
+    @SuppressWarnings("removal")
     public void testThatDecodeIsNotImplemented()  {
         new JsonFormat(true).decode(null, null);
     }