Undo AutoClosable hack introduced for JDK6 compatibility

This basically reverts commit f7e0924 (and commit 74c6dd0).

Signed-off-by: Sven Strickroth <[email protected]>

Author: csware

src/main/java/org/owasp/html/AutoCloseableHtmlStreamRenderer.java

@@ -1,18 +1,13 @@
 package org.owasp.html;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.util.List;
 
 /**
  * An event receiver that delegates to an underlying receiver and which may
  * be overridden to do additional work.
  */
 public abstract class HtmlStreamEventReceiverWrapper
-implements HtmlStreamEventReceiver,
-// Not AutoCloseable for JDK 6 compatibility but will close AutoCloseable
-// underlying streams when closed.
-    Closeable {
+implements HtmlStreamEventReceiver, AutoCloseable {
 
   protected final HtmlStreamEventReceiver underlying;
 
@@ -43,7 +38,9 @@ public void text(String text) {
     this.underlying.text(text);
   }
 
-  public void close() throws IOException {
-    AutoCloseableHtmlStreamRenderer.closeIfAnyCloseable(underlying);
+  public void close() throws Exception {
+    if (underlying instanceof AutoCloseable) {
+      ((AutoCloseable) underlying).close();
+    }
   }
 }

src/main/java/org/owasp/html/HtmlStreamEventReceiverWrapper.java

@@ -74,8 +74,8 @@ public static HtmlStreamRenderer create(
     if (output instanceof Closeable) {
       return new CloseableHtmlStreamRenderer(
           output, ioExHandler, badHtmlHandler);
-    } else if (AutoCloseableHtmlStreamRenderer.isAutoCloseable(output)) {
-      return AutoCloseableHtmlStreamRenderer.createAutoCloseableHtmlStreamRenderer(
+    } else if (output instanceof AutoCloseable) {
+        return new AutoCloseableHtmlStreamRenderer(
           output, ioExHandler, badHtmlHandler);
     } else {
       return new HtmlStreamRenderer(output, ioExHandler, badHtmlHandler);
@@ -96,7 +96,7 @@ public static HtmlStreamRenderer create(
     return create(output, Handler.PROPAGATE, badHtmlHandler);
   }
 
-  protected HtmlStreamRenderer(
+  private HtmlStreamRenderer(
       Appendable output, Handler<? super IOException> ioExHandler,
       Handler<? super String> badHtmlHandler) {
     this.output = output;
@@ -424,6 +424,25 @@ public void close() throws IOException {
     }
   }
 
+  static class AutoCloseableHtmlStreamRenderer extends HtmlStreamRenderer
+    implements AutoCloseable {
+    private final AutoCloseable closeable;
+
+    @SuppressWarnings("synthetic-access")
+    AutoCloseableHtmlStreamRenderer(
+        @WillCloseWhenClosed
+        Appendable output, Handler<? super IOException> errorHandler,
+        Handler<? super String> badHtmlHandler) {
+      super(output, errorHandler, badHtmlHandler);
+      this.closeable = (AutoCloseable) output;
+    }
+
+    public void close() throws Exception {
+      if (isDocumentOpen()) { closeDocument(); }
+      closeable.close();
+    }
+  }
+
   private static final long TAG_ENDS = 0L
       | (1L << '\t')
       | (1L << '\n')

src/main/java/org/owasp/html/HtmlStreamRenderer.java

@@ -186,7 +186,7 @@ public Appendable append(char c) throws IOException {
 
       };
 
-      HtmlStreamEventReceiver receiver = new HtmlStreamRenderer(
+      HtmlStreamEventReceiver receiver = HtmlStreamRenderer.create(
           throwingOut, ioHandler, badHtmlHandler);
       HtmlSanitizer.Policy policy = factory.apply(
           receiver, listener, context);