#12 - Added string based factory methods.

Author: laxika

java-warc-reactive/src/main/java/com/github/bottomlessarchive/warc/service/WarcRecordFluxFactory.java

@@ -22,6 +22,20 @@ public class WarcRecordFluxFactory {
     private WarcRecordFluxFactory() {
     }
 
+    public static <T extends WarcContentBlock> Flux<WarcRecord<T>> buildWarcRecordFlux(@NotNull @NonNull final String warcLocation) {
+        return Flux.fromStream(() -> WarcRecordStreamFactory.streamOf(warcLocation, EVERY_WARC_RECORD_TYPE));
+    }
+
+    public static <T extends WarcContentBlock> Flux<WarcRecord<T>> buildWarcRecordFlux(@NotNull @NonNull final String warcLocation,
+                                                                                       @NotNull @NonNull final WarcRecordType... requiredRecordTypes) {
+        return Flux.fromStream(() -> WarcRecordStreamFactory.streamOf(warcLocation, requiredRecordTypes));
+    }
+
+    public static <T extends WarcContentBlock> Flux<WarcRecord<T>> buildWarcRecordFlux(@NotNull @NonNull final String warcLocation,
+                                                                                       @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+        return Flux.fromStream(() -> WarcRecordStreamFactory.streamOf(warcLocation, requiredRecordTypes));
+    }
+
     public static <T extends WarcContentBlock> Flux<WarcRecord<T>> buildWarcRecordFlux(@NotNull @NonNull final URI warcLocation) {
         return Flux.fromStream(() -> WarcRecordStreamFactory.streamOf(warcLocation, EVERY_WARC_RECORD_TYPE));
     }

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

@@ -2,6 +2,8 @@
 
 import com.github.bottomlessarchive.warc.service.content.domain.WarcContentBlock;
 import com.github.bottomlessarchive.warc.service.record.domain.WarcRecord;
+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -20,15 +22,23 @@ public class WarcRecordIteratorFactory {
     private WarcRecordIteratorFactory() {
     }
 
-    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(final URI uri) {
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final String location) {
+        try {
+            return iteratorOf(new URL(location));
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + location + "!", e);
+        }
+    }
+
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final URI uri) {
         try {
             return iteratorOf(uri.toURL());
         } catch (MalformedURLException e) {
             throw new WarcNetworkException("Unable to parse WARC location: " + uri + "!", e);
         }
     }
 
-    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(final URL url) {
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final URL url) {
         try {
             return iteratorOf(new AvailableInputStream(new BufferedInputStream(url.openStream(), ONE_MEGABYTE_IN_BYTE)),
                     WarcReader.DEFAULT_CHARSET, true);
@@ -37,15 +47,17 @@ public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(fi
         }
     }
 
-    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(final InputStream inputStream) {
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final InputStream inputStream) {
         return iteratorOf(inputStream, WarcReader.DEFAULT_CHARSET);
     }
 
-    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(final InputStream inputStream, final Charset charset) {
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final InputStream inputStream,
+                                                                                  @NotNull @NonNull final Charset charset) {
         return iteratorOf(new BufferedInputStream(inputStream, ONE_MEGABYTE_IN_BYTE), charset, true);
     }
 
-    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(final InputStream inputStream, final Charset charset,
+    public static <T extends WarcContentBlock> Iterator<WarcRecord<T>> iteratorOf(@NotNull @NonNull final InputStream inputStream,
+                                                                                  @NotNull @NonNull final Charset charset,
                                                                                   final boolean compressed) {
         final WarcReader warcReader = new WarcReader(inputStream, charset, compressed);
 

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

@@ -25,6 +25,32 @@ public class WarcRecordStreamFactory {
     private WarcRecordStreamFactory() {
     }
 
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final String location) {
+        try {
+            return WarcRecordStreamFactory.streamOf(new URL(location), EVERY_WARC_RECORD_TYPE);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + location + "!", e);
+        }
+    }
+
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final String location,
+                                                                              @NotNull @NonNull final WarcRecordType... requiredRecordTypes) {
+        try {
+            return streamOf(new URL(location), requiredRecordTypes);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + location + "!", e);
+        }
+    }
+
+    public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final String location,
+                                                                              @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
+        try {
+            return streamOf(new URL(location), requiredRecordTypes);
+        } catch (MalformedURLException e) {
+            throw new WarcNetworkException("Unable to parse WARC location: " + location + "!", e);
+        }
+    }
+
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URI uri) {
         try {
             return WarcRecordStreamFactory.streamOf(uri.toURL(), EVERY_WARC_RECORD_TYPE);