JSONTokener implemented java.io.Closeable

stleary · Mar 4, 2023 · e1eabc9 · e1eabc9
1 parent 45bcba5
commit e1eabc9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
@@ -1,11 +1,6 @@
 package org.json;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
 
 /*
 Public Domain.
@@ -18,7 +13,7 @@
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONTokener {
+public class JSONTokener implements Closeable {
     /** current read character position on the current line. */
     private long character;
     /** flag to indicate if the end of the input has been found. */
@@ -522,4 +517,11 @@ public String toString() {
         return " at " + this.index + " [character " + this.character + " line " +
                 this.line + "]";
     }
+
+    @Override
+    public void close() throws IOException {
+        if(reader!=null){
+            reader.close();
+        }
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONTokenerTest.java b/src/test/java/org/json/junit/JSONTokenerTest.java
@@ -313,4 +313,16 @@ public void testNextBackComboWithNewLines() {
         assertEquals(0, t2.next());
         assertFalse(t2.more());
    }
+
+   @Test
+   public void testAutoClose(){
+       Reader reader = new StringReader("some test string");
+       try {
+           JSONTokener tokener = new JSONTokener(reader);
+           tokener.close();
+           tokener.next();
+       } catch (Exception exception){
+           assertEquals("Stream closed", exception.getMessage());
+       }
+   }
 }