Minor improvements on the tests.

Author: laxika

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

@@ -24,6 +24,16 @@ public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNu
         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) {
+        try {
+            return streamOf(new AvailableInputStream(new BufferedInputStream(url.openStream())),
+                    WarcReader.DEFAULT_CHARSET, true, List.of(requiredRecordTypes));
+        } catch (IOException e) {
+            throw new WarcNetworkException("Unable to open WARC location: " + url + "!", e);
+        }
+    }
+
     public static <T extends WarcContentBlock> Stream<WarcRecord<T>> streamOf(@NotNull @NonNull final URL url,
             @NotNull @NonNull final List<WarcRecordType> requiredRecordTypes) {
         try {

java-warc/src/test/java/com/github/bottomlessarchive/warc/test/TestFileWarcReader.java

@@ -6,15 +6,14 @@
 import com.github.bottomlessarchive.warc.service.content.response.domain.ResponseContentBlock;
 import com.github.bottomlessarchive.warc.service.record.domain.WarcRecord;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.util.Optional;
 
 public class TestFileWarcReader {
 
     public static void main(final String... arg) throws Exception {
         final WarcReader warcReader = new WarcReader(new FileInputStream(
-            new File("C:\\warc-test\\CC-MAIN-20180716232549-20180717012549-00001.warc.gz")));
+                "C:\\warc-test\\CC-MAIN-20180716232549-20180717012549-00001.warc.gz"));
 
         boolean hasNext = true;
         while (hasNext) {
@@ -23,8 +22,7 @@ public static void main(final String... arg) throws Exception {
 
                 optionalWarcRecord
                     .filter(WarcRecord::isResponse)
-                    .map(warcRecord -> ((ResponseContentBlock) warcRecord.getWarcContentBlock())
-                        .getPayloadAsString())
+                    .map(warcRecord -> ((ResponseContentBlock) warcRecord.getContentBlock()).getPayloadAsString())
                     .ifPresent(System.out::println);
 
                 hasNext = optionalWarcRecord.isPresent();

java-warc/src/test/java/com/github/bottomlessarchive/warc/test/TestUrlWarcReader.java

@@ -2,7 +2,8 @@
 
 import com.github.bottomlessarchive.warc.service.WarcRecordStreamFactory;
 import com.github.bottomlessarchive.warc.service.content.response.domain.ResponseContentBlock;
-import com.github.bottomlessarchive.warc.service.record.domain.WarcRecord;
+import com.github.bottomlessarchive.warc.service.record.domain.WarcRecordType;
+
 import java.net.URL;
 
 public class TestUrlWarcReader {
@@ -11,9 +12,8 @@ public static void main(final String... arg) throws Exception {
         final URL warcUrl = new URL(
             "https://commoncrawl.s3.amazonaws.com/crawl-data/CC-MAIN-2018-43/segments/1539583508988.18/warc/CC-MAIN-20181015080248-20181015101748-00000.warc.gz");
 
-        WarcRecordStreamFactory.streamOf(warcUrl)
-            .filter(WarcRecord::isResponse)
-            .map(entry -> ((ResponseContentBlock) entry.getWarcContentBlock()).getPayloadAsString())
+        WarcRecordStreamFactory.streamOf(warcUrl, WarcRecordType.RESPONSE)
+            .map(entry -> ((ResponseContentBlock) entry.getContentBlock()).getPayloadAsString())
             .forEach(System.out::println);
     }
 }