switch from AutoCloseable to Closeable for java 6.

UnsafeFunc0 now extends Callable.

Author: abersnaze

rxjava-contrib/rxjava-string/src/main/java/rx/observables/StringObservable.java

@@ -37,6 +37,7 @@
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
 import java.util.Arrays;
+import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -55,7 +56,7 @@ public static Observable<byte[]> from(final InputStream i) {
         return from(i, 8 * 1024);
     }
 
-    private static class CloseableResource<S extends AutoCloseable> implements Subscription {
+    private static class CloseableResource<S extends Closeable> implements Subscription {
         private final AtomicBoolean unsubscribed = new AtomicBoolean();
         private S closable;
 
@@ -86,8 +87,8 @@ public boolean isUnsubscribed() {
      *
      * @param <R>
      */
-    public static interface UnsafeFunc0<R> {
-        public R call() throws Throwable;
+    public static interface UnsafeFunc0<R> extends Callable<R> {
+        public R call() throws Exception;
     }
 
     /**
@@ -103,7 +104,7 @@ public static interface UnsafeFunc0<R> {
      *            Converts the {@link Closeable} resource into a {@link Observable} with {@link #from(InputStream)} or {@link #from(Reader)}
      * @return
      */
-    public static <R, S extends AutoCloseable> Observable<R> using(final UnsafeFunc0<S> resourceFactory,
+    public static <R, S extends Closeable> Observable<R> using(final UnsafeFunc0<S> resourceFactory,
             final Func1<S, Observable<R>> observableFactory) {
         return Observable.using(new Func0<CloseableResource<S>>() {
             @Override

rxjava-contrib/rxjava-string/src/test/java/rx/observables/StringObservableTest.java

@@ -55,6 +55,7 @@
 import java.nio.charset.MalformedInputException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class StringObservableTest {
@@ -303,7 +304,7 @@ public void testUsingCloseOnComplete() throws IOException {
 
         using(new UnsafeFunc0<Reader>() {
             @Override
-            public Reader call() throws Throwable {
+            public Reader call() throws Exception {
                 return reader;
             }
         }, new Func1<Reader, Observable<String>>() {
@@ -338,7 +339,7 @@ public void close() throws IOException {
 
         using(new UnsafeFunc0<Reader>() {
             @Override
-            public Reader call() throws Throwable {
+            public Reader call() throws Exception {
                 return reader;
             }
         }, new Func1<Reader, Observable<String>>() {
@@ -362,7 +363,7 @@ public void testUsingCloseOnUnsubscribe() throws IOException {
 
         using(new UnsafeFunc0<Reader>() {
             @Override
-            public Reader call() throws Throwable {
+            public Reader call() throws Exception {
                 return reader;
             }
         }, new Func1<Reader, Observable<String>>() {