From 5177b2b6dafcedb5ddfc9793ba9cfafa01f6e34f Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 12 Jun 2019 15:17:33 -0700 Subject: [PATCH] rename method so as not to conflict with Processor --- .../java/org/archive/modules/warc/DnsResponseRecordBuilder.java | 2 +- .../modules/warc/FtpControlConversationRecordBuilder.java | 2 +- .../java/org/archive/modules/warc/FtpResponseRecordBuilder.java | 2 +- .../java/org/archive/modules/warc/HttpRequestRecordBuilder.java | 2 +- .../org/archive/modules/warc/HttpResponseRecordBuilder.java | 2 +- .../java/org/archive/modules/warc/MetadataRecordBuilder.java | 2 +- .../java/org/archive/modules/warc/RevisitRecordBuilder.java | 2 +- .../main/java/org/archive/modules/warc/WARCRecordBuilder.java | 2 +- .../org/archive/modules/warc/WhoisResponseRecordBuilder.java | 2 +- .../org/archive/modules/writer/WARCWriterChainProcessor.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/src/main/java/org/archive/modules/warc/DnsResponseRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/DnsResponseRecordBuilder.java index c8394215..f982a6aa 100644 --- a/modules/src/main/java/org/archive/modules/warc/DnsResponseRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/DnsResponseRecordBuilder.java @@ -15,7 +15,7 @@ import org.archive.util.ArchiveUtils; public class DnsResponseRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return "dns".equals(curi.getUURI().getScheme().toLowerCase()); } diff --git a/modules/src/main/java/org/archive/modules/warc/FtpControlConversationRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/FtpControlConversationRecordBuilder.java index e5481080..de8c978a 100644 --- a/modules/src/main/java/org/archive/modules/warc/FtpControlConversationRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/FtpControlConversationRecordBuilder.java @@ -17,7 +17,7 @@ import org.archive.util.anvl.ANVLRecord; public class FtpControlConversationRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return "ftp".equals(curi.getUURI().getScheme().toLowerCase()); } diff --git a/modules/src/main/java/org/archive/modules/warc/FtpResponseRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/FtpResponseRecordBuilder.java index f3068569..ddd9444b 100644 --- a/modules/src/main/java/org/archive/modules/warc/FtpResponseRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/FtpResponseRecordBuilder.java @@ -16,7 +16,7 @@ import org.archive.util.ArchiveUtils; public class FtpResponseRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return !curi.isRevisit() && "ftp".equals(curi.getUURI().getScheme().toLowerCase()); } diff --git a/modules/src/main/java/org/archive/modules/warc/HttpRequestRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/HttpRequestRecordBuilder.java index f2f55e54..cd51e21d 100644 --- a/modules/src/main/java/org/archive/modules/warc/HttpRequestRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/HttpRequestRecordBuilder.java @@ -15,7 +15,7 @@ import org.archive.util.ArchiveUtils; public class HttpRequestRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return curi.getUURI().getScheme().toLowerCase().startsWith("http"); } diff --git a/modules/src/main/java/org/archive/modules/warc/HttpResponseRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/HttpResponseRecordBuilder.java index 06a1b732..4b54ea26 100644 --- a/modules/src/main/java/org/archive/modules/warc/HttpResponseRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/HttpResponseRecordBuilder.java @@ -25,7 +25,7 @@ import org.archive.util.ArchiveUtils; public class HttpResponseRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return !curi.isRevisit() && curi.getUURI().getScheme().toLowerCase().startsWith("http"); } diff --git a/modules/src/main/java/org/archive/modules/warc/MetadataRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/MetadataRecordBuilder.java index 9158810f..c167740f 100644 --- a/modules/src/main/java/org/archive/modules/warc/MetadataRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/MetadataRecordBuilder.java @@ -22,7 +22,7 @@ public class MetadataRecordBuilder extends BaseWARCRecordBuilder { * If you don't want metadata records, take this class out of the chain. */ @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { String scheme = curi.getUURI().getScheme().toLowerCase(); return scheme.startsWith("http") || "ftp".equals(scheme); } diff --git a/modules/src/main/java/org/archive/modules/warc/RevisitRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/RevisitRecordBuilder.java index aaaaac55..6234dd5f 100644 --- a/modules/src/main/java/org/archive/modules/warc/RevisitRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/RevisitRecordBuilder.java @@ -21,7 +21,7 @@ import org.archive.util.ArchiveUtils; public class RevisitRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { String scheme = curi.getUURI().getScheme().toLowerCase(); return curi.isRevisit() && (scheme.startsWith("http") || scheme.equals("ftp")); diff --git a/modules/src/main/java/org/archive/modules/warc/WARCRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/WARCRecordBuilder.java index ecd02db4..afd19bbe 100644 --- a/modules/src/main/java/org/archive/modules/warc/WARCRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/WARCRecordBuilder.java @@ -8,7 +8,7 @@ import org.archive.modules.CrawlURI; public interface WARCRecordBuilder { - boolean shouldProcess(CrawlURI curi); + boolean shouldBuildRecord(CrawlURI curi); WARCRecordInfo buildRecord(CrawlURI curi, URI concurrentTo) throws IOException; diff --git a/modules/src/main/java/org/archive/modules/warc/WhoisResponseRecordBuilder.java b/modules/src/main/java/org/archive/modules/warc/WhoisResponseRecordBuilder.java index 8ddbb9d1..3726f500 100644 --- a/modules/src/main/java/org/archive/modules/warc/WhoisResponseRecordBuilder.java +++ b/modules/src/main/java/org/archive/modules/warc/WhoisResponseRecordBuilder.java @@ -15,7 +15,7 @@ import org.archive.util.ArchiveUtils; public class WhoisResponseRecordBuilder extends BaseWARCRecordBuilder { @Override - public boolean shouldProcess(CrawlURI curi) { + public boolean shouldBuildRecord(CrawlURI curi) { return "whois".equals(curi.getUURI().getScheme().toLowerCase()); } diff --git a/modules/src/main/java/org/archive/modules/writer/WARCWriterChainProcessor.java b/modules/src/main/java/org/archive/modules/writer/WARCWriterChainProcessor.java index 6c04c06b..895f7260 100644 --- a/modules/src/main/java/org/archive/modules/writer/WARCWriterChainProcessor.java +++ b/modules/src/main/java/org/archive/modules/writer/WARCWriterChainProcessor.java @@ -128,7 +128,7 @@ public class WARCWriterChainProcessor extends BaseWARCWriterProcessor implements protected void writeRecords(CrawlURI curi, WARCWriter writer) throws IOException { URI concurrentTo = null; for (WARCRecordBuilder recordBuilder: getChain()) { - if (recordBuilder.shouldProcess(curi)) { + if (recordBuilder.shouldBuildRecord(curi)) { WARCRecordInfo record = recordBuilder.buildRecord(curi, concurrentTo); if (record != null) { writer.writeRecord(record);