Remove SlimeFormat::encode() on InputStream, 2. try

3 files changed, 0 insertions, 24 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
index 5abbd136690..f30c3e66aab 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
@@ -49,13 +49,6 @@ public final class JsonFormat implements SlimeFormat {
         new Encoder(value, os, indent).encode();
     }
 
-    @Override
-    @Deprecated(since = "7", forRemoval = true)
-    @SuppressWarnings("removal")
-    public void decode(InputStream is, Slime slime) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     /** Returns the given slime data as UTF-8-encoded JSON */
     public static byte[] toJsonBytes(Slime slime) {
         try {
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
index 86003f519bc..92512db3da7 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeFormat.java
@@ -2,7 +2,6 @@
 package com.yahoo.slime;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
@@ -18,14 +17,4 @@ public interface SlimeFormat {
      */
     void encode(OutputStream os, Slime slime) throws IOException;
 
-    /**
-     * Decode an input stream into the provided slime object
-     *
-     * @param is The input stream to read from.
-     * @param slime The slime object to decode into.
-     * @deprecated use e.g. {@link JsonDecoder} instead
-     */
-    @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 9465f081990..1d8c39a7778 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonFormatTestCase.java
@@ -226,12 +226,6 @@ public class JsonFormatTestCase {
         assertEquals(str, a.asString());
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    @SuppressWarnings("removal")
-    public void testThatDecodeIsNotImplemented()  {
-        new JsonFormat(true).decode(null, null);
-    }
-
     private void verifyEncoding(Slime slime, String expected) {
         verifyEncoding(slime, expected, true);
     }