#9 - Added URI based stream factories to WarcRecordStreamFactory.

Author: laxika

java-warc/src/main/java/com/github/bottomlessarchive/warc/service/WarcRecordStreamFactory.java

@@ -9,6 +9,8 @@
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.*;
@@ -20,12 +22,38 @@ public class WarcRecordStreamFactory {
 
     private static final List<WarcRecordType> EVERY_WARC_RECORD_TYPE = Arrays.asList(WarcRecordType.values());
 
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URI uri) {
+        try {
+            return WarcRecordStreamFactory.streamOf(uri.toURL(), EVERY_WARC_RECORD_TYPE);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + uri + "!", e);
+        }
+    }
+
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URI uri,
+                                                                              @NotNull @NonNull final WarcRecordType... requiredRecordTypes) {
+        try {
+            return streamOf(uri.toURL(), requiredRecordTypes);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + uri + "!", e);
+        }
+    }
+
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URI uri,
+                                                                              @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+        try {
+            return streamOf(uri.toURL(), requiredRecordTypes);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + uri + "!", e);
+        }
+    }
+
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URL url) {
         return WarcRecordStreamFactory.streamOf(url, EVERY_WARC_RECORD_TYPE);
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URL url,
-            @NotNull @NonNull final WarcRecordType... requiredRecordTypes) {
+                                                                              @NotNull @NonNull final WarcRecordType... requiredRecordTypes) {
         try {
             return streamOf(new AvailableInputStream(new BufferedInputStream(url.openStream())),
                     WarcReader.DEFAULT_CHARSET, true, List.of(requiredRecordTypes));
@@ -35,7 +63,7 @@ public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNu
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URL url,
-            @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+                                                                              @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
         try {
             return streamOf(new AvailableInputStream(new BufferedInputStream(url.openStream())),
                     WarcReader.DEFAULT_CHARSET, true, requiredRecordTypes);
@@ -49,22 +77,22 @@ public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNu
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final InputStream warcFileLocation,
-            @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+                                                                              @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
         return streamOf(warcFileLocation, WarcReader.DEFAULT_CHARSET, requiredRecordTypes);
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final InputStream warcFileLocation,
-            @NotNull @NonNull final Charset charset) {
+                                                                              @NotNull @NonNull final Charset charset) {
         return streamOf(new BufferedInputStream(warcFileLocation), charset, true, EVERY_WARC_RECORD_TYPE);
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final InputStream warcFileLocation,
-            @NotNull @NonNull final Charset charset, @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+                                                                              @NotNull @NonNull final Charset charset, @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
         return streamOf(new BufferedInputStream(warcFileLocation), charset, true, requiredRecordTypes);
     }
 
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final InputStream inputStream,
-            @NotNull @NonNull final Charset charset, final boolean compressed) {
+                                                                              @NotNull @NonNull final Charset charset, final boolean compressed) {
         return streamOf(inputStream, charset, compressed, EVERY_WARC_RECORD_TYPE);
     }
 
@@ -75,7 +103,7 @@ public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(
             @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
         final WarcReader warcReader = new WarcReader(inputStream, charset, compressed);
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(
-                new SafeWarcRecordIterator(warcReader), Spliterator.ORDERED | Spliterator.NONNULL), false)
+                        new SafeWarcRecordIterator(warcReader), Spliterator.ORDERED | Spliterator.NONNULL), false)
                 .filter(warcRecord -> requiredRecordTypes.contains(warcRecord.getType()))
                 .map(warcRecord -> ((WarcRecord<T>) warcRecord));
     }