NUTCH-2352 Logging with generic class name, closes #172
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/2b93a66f Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/2b93a66f Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/2b93a66f Branch: refs/heads/master Commit: 2b93a66f0472e93223c69053d5482dcbef26de6d Parents: f351790 Author: kamaci <[email protected]> Authored: Wed Jan 18 23:00:06 2017 +0200 Committer: Sebastian Nagel <[email protected]> Committed: Thu Jan 19 21:28:15 2017 +0100 ---------------------------------------------------------------------- .../nutch/crawl/AbstractFetchSchedule.java | 4 ++- .../nutch/crawl/AdaptiveFetchSchedule.java | 6 +++-- src/java/org/apache/nutch/crawl/CrawlDb.java | 4 ++- .../org/apache/nutch/crawl/CrawlDbFilter.java | 4 ++- .../org/apache/nutch/crawl/CrawlDbMerger.java | 3 ++- .../org/apache/nutch/crawl/CrawlDbReader.java | 4 ++- .../org/apache/nutch/crawl/CrawlDbReducer.java | 5 ++-- .../apache/nutch/crawl/DeduplicationJob.java | 5 ++-- .../nutch/crawl/FetchScheduleFactory.java | 6 +++-- src/java/org/apache/nutch/crawl/Generator.java | 4 ++- src/java/org/apache/nutch/crawl/Injector.java | 4 ++- src/java/org/apache/nutch/crawl/LinkDb.java | 4 ++- .../org/apache/nutch/crawl/LinkDbFilter.java | 4 ++- .../org/apache/nutch/crawl/LinkDbMerger.java | 4 ++- .../org/apache/nutch/crawl/LinkDbReader.java | 4 ++- .../nutch/crawl/MimeAdaptiveFetchSchedule.java | 5 ++-- .../apache/nutch/crawl/SignatureFactory.java | 4 ++- .../org/apache/nutch/crawl/URLPartitioner.java | 3 ++- .../org/apache/nutch/fetcher/FetchItem.java | 4 ++- .../apache/nutch/fetcher/FetchItemQueue.java | 6 +++-- .../apache/nutch/fetcher/FetchItemQueues.java | 6 +++-- src/java/org/apache/nutch/fetcher/Fetcher.java | 4 ++- .../org/apache/nutch/fetcher/FetcherThread.java | 6 +++-- .../nutch/fetcher/FetcherThreadPublisher.java | 5 +++- .../org/apache/nutch/fetcher/QueueFeeder.java | 5 ++-- .../org/apache/nutch/hostdb/ReadHostDb.java | 4 ++- .../org/apache/nutch/hostdb/ResolverThread.java | 4 ++- .../org/apache/nutch/hostdb/UpdateHostDb.java | 4 ++- .../apache/nutch/hostdb/UpdateHostDbMapper.java | 6 +++-- .../nutch/hostdb/UpdateHostDbReducer.java | 4 ++- .../org/apache/nutch/indexer/CleaningJob.java | 4 ++- .../org/apache/nutch/indexer/IndexWriters.java | 4 ++- .../apache/nutch/indexer/IndexerMapReduce.java | 5 ++-- .../apache/nutch/indexer/IndexingFilters.java | 6 +++-- .../nutch/indexer/IndexingFiltersChecker.java | 5 ++-- .../org/apache/nutch/indexer/IndexingJob.java | 4 ++- .../apache/nutch/net/URLExemptionFilters.java | 5 +++- .../org/apache/nutch/net/URLNormalizers.java | 5 ++-- .../apache/nutch/parse/OutlinkExtractor.java | 3 ++- .../apache/nutch/parse/ParseOutputFormat.java | 3 ++- .../apache/nutch/parse/ParsePluginsReader.java | 5 ++-- .../org/apache/nutch/parse/ParseResult.java | 4 ++- .../org/apache/nutch/parse/ParseSegment.java | 4 ++- src/java/org/apache/nutch/parse/ParseUtil.java | 4 ++- .../org/apache/nutch/parse/ParserChecker.java | 4 ++- .../org/apache/nutch/parse/ParserFactory.java | 4 ++- .../apache/nutch/plugin/PluginDescriptor.java | 5 ++-- .../apache/nutch/plugin/PluginRepository.java | 5 ++-- .../apache/nutch/protocol/ProtocolFactory.java | 5 ++-- .../apache/nutch/protocol/RobotRulesParser.java | 5 ++-- .../apache/nutch/publisher/NutchPublishers.java | 5 +++- .../nutch/scoring/webgraph/LinkDumper.java | 4 ++- .../apache/nutch/scoring/webgraph/LinkRank.java | 4 ++- .../nutch/scoring/webgraph/NodeDumper.java | 4 ++- .../nutch/scoring/webgraph/ScoreUpdater.java | 4 ++- .../apache/nutch/scoring/webgraph/WebGraph.java | 4 ++- .../apache/nutch/segment/SegmentChecker.java | 5 ++-- .../nutch/segment/SegmentMergeFilters.java | 3 ++- .../org/apache/nutch/segment/SegmentMerger.java | 3 ++- .../org/apache/nutch/segment/SegmentReader.java | 4 ++- .../org/apache/nutch/service/NutchReader.java | 6 +++-- .../org/apache/nutch/service/NutchServer.java | 4 ++- .../apache/nutch/service/impl/JobWorker.java | 4 ++- .../nutch/service/resources/AdminResource.java | 3 ++- .../nutch/service/resources/SeedResource.java | 7 ++--- .../nutch/tools/AbstractCommonCrawlFormat.java | 4 ++- .../nutch/tools/CommonCrawlDataDumper.java | 3 ++- src/java/org/apache/nutch/tools/DmozParser.java | 4 ++- src/java/org/apache/nutch/tools/FileDumper.java | 5 ++-- .../org/apache/nutch/tools/FreeGenerator.java | 3 ++- .../org/apache/nutch/tools/ResolveUrls.java | 4 ++- .../apache/nutch/tools/arc/ArcRecordReader.java | 5 ++-- .../nutch/tools/arc/ArcSegmentCreator.java | 5 ++-- .../apache/nutch/tools/warc/WARCExporter.java | 4 ++- .../apache/nutch/util/CrawlCompletionStats.java | 3 ++- .../org/apache/nutch/util/DeflateUtils.java | 4 ++- src/java/org/apache/nutch/util/DomUtil.java | 4 ++- .../org/apache/nutch/util/DumpFileUtil.java | 5 ++-- .../org/apache/nutch/util/EncodingDetector.java | 5 ++-- src/java/org/apache/nutch/util/GZIPUtils.java | 4 ++- src/java/org/apache/nutch/util/JexlUtil.java | 4 ++- src/java/org/apache/nutch/util/MimeUtil.java | 5 ++-- src/java/org/apache/nutch/util/ObjectCache.java | 4 ++- .../nutch/util/ProtocolStatusStatistics.java | 3 ++- .../nutch/util/domain/DomainStatistics.java | 3 ++- .../nutch/util/domain/DomainSuffixes.java | 3 ++- .../nutch/util/domain/DomainSuffixesReader.java | 3 ++- .../nutch/webui/client/impl/CrawlingCycle.java | 6 +++-- .../client/impl/RemoteCommandExecutor.java | 6 +++-- .../webui/service/impl/CrawlServiceImpl.java | 6 +++-- .../webui/service/impl/NutchServiceImpl.java | 7 ++--- .../creativecommons/nutch/CCIndexingFilter.java | 5 ++-- .../creativecommons/nutch/CCParseFilter.java | 4 ++- .../org/apache/nutch/parse/feed/FeedParser.java | 4 ++- .../apache/nutch/parse/feed/TestFeedParser.java | 5 ++-- .../indexer/anchor/AnchorIndexingFilter.java | 5 ++-- .../indexer/basic/BasicIndexingFilter.java | 5 ++-- .../indexer/geoip/GeoIPIndexingFilter.java | 3 ++- .../indexer/links/LinksIndexingFilter.java | 7 +++-- .../nutch/indexer/more/MoreIndexingFilter.java | 5 ++-- .../cloudsearch/CloudSearchIndexWriter.java | 5 ++-- .../indexwriter/dummy/DummyIndexWriter.java | 5 ++-- .../indexwriter/elastic/ElasticIndexWriter.java | 4 ++- .../nutch/indexwriter/solr/SolrIndexWriter.java | 5 ++-- .../indexwriter/solr/SolrMappingReader.java | 4 ++- .../nutch/indexwriter/solr/SolrUtils.java | 6 +++-- .../nutch/analysis/lang/HTMLLanguageParser.java | 5 ++-- .../protocol/htmlunit/HtmlUnitWebDriver.java | 4 ++- .../nutch/protocol/http/api/HttpBase.java | 27 +++++++++++--------- .../protocol/http/api/HttpRobotRulesParser.java | 5 ++-- .../nutch/urlfilter/api/RegexURLFilterBase.java | 5 ++-- .../urlfilter/api/RegexURLFilterBaseTest.java | 5 ++-- .../nutch/protocol/selenium/HttpWebClient.java | 4 ++- .../nutch/microformats/reltag/RelTagParser.java | 4 ++- .../indexer/filter/MimeTypeIndexingFilter.java | 3 ++- .../org/apache/nutch/parse/ext/ExtParser.java | 5 ++-- .../org/apache/nutch/parse/html/HtmlParser.java | 5 ++-- .../apache/nutch/parse/html/TestHtmlParser.java | 5 ++-- .../apache/nutch/parse/js/JSParseFilter.java | 4 ++- .../org/apache/nutch/parse/swf/SWFParser.java | 5 ++-- .../org/apache/nutch/parse/tika/TikaParser.java | 4 ++- .../org/apache/nutch/tika/TestFeedParser.java | 6 +++-- .../org/apache/nutch/parse/zip/ZipParser.java | 4 ++- .../nutch/parse/zip/ZipTextExtractor.java | 5 ++-- .../naivebayes/NaiveBayesParseFilter.java | 3 ++- .../parsefilter/regex/RegexParseFilter.java | 6 +++-- .../org/apache/nutch/protocol/file/File.java | 4 ++- .../java/org/apache/nutch/protocol/ftp/Ftp.java | 4 ++- .../nutch/protocol/ftp/FtpRobotRulesParser.java | 5 ++-- .../apache/nutch/protocol/htmlunit/Http.java | 4 ++- .../org/apache/nutch/protocol/http/Http.java | 4 ++- .../DummySSLProtocolSocketFactory.java | 3 ++- .../httpclient/DummyX509TrustManager.java | 3 ++- .../apache/nutch/protocol/httpclient/Http.java | 4 ++- .../httpclient/HttpAuthenticationFactory.java | 5 ++-- .../httpclient/HttpBasicAuthentication.java | 5 ++-- .../httpclient/HttpFormAuthentication.java | 27 ++++++++++---------- .../protocol/interactiveselenium/Http.java | 4 ++- .../DefalultMultiInteractionHandler.java | 4 ++- .../DefaultClickAllAjaxLinksHandler.java | 3 ++- .../apache/nutch/protocol/selenium/Http.java | 4 ++- .../rabbitmq/RabbitMQPublisherImpl.java | 5 +++- .../nutch/scoring/opic/OPICScoringFilter.java | 5 ++-- .../similarity/cosine/CosineSimilarity.java | 7 ++--- .../nutch/scoring/similarity/cosine/Model.java | 6 +++-- .../nutch/collection/CollectionManager.java | 4 ++- .../SubcollectionIndexingFilter.java | 6 +++-- .../nutch/indexer/tld/TLDIndexingFilter.java | 5 ++-- .../nutch/urlfilter/domain/DomainURLFilter.java | 3 ++- .../DomainBlacklistURLFilter.java | 3 ++- .../ignoreexempt/ExemptionUrlFilter.java | 5 ++-- .../nutch/urlfilter/prefix/PrefixURLFilter.java | 3 ++- .../nutch/urlfilter/suffix/SuffixURLFilter.java | 3 ++- .../indexer/urlmeta/URLMetaIndexingFilter.java | 4 ++- .../scoring/urlmeta/URLMetaScoringFilter.java | 3 ++- .../urlnormalizer/ajax/AjaxURLNormalizer.java | 4 ++- .../urlnormalizer/basic/BasicURLNormalizer.java | 5 ++-- .../urlnormalizer/host/HostURLNormalizer.java | 3 ++- .../protocol/ProtocolURLNormalizer.java | 4 ++- .../querystring/QuerystringURLNormalizer.java | 3 ++- .../urlnormalizer/regex/RegexURLNormalizer.java | 3 ++- .../regex/TestRegexURLNormalizer.java | 3 ++- .../urlnormalizer/slash/SlashURLNormalizer.java | 4 ++- .../nutch/crawl/ContinuousCrawlTestUtil.java | 3 ++- .../org/apache/nutch/crawl/CrawlDBTestUtil.java | 3 ++- .../nutch/crawl/CrawlDbUpdateTestDriver.java | 3 ++- .../apache/nutch/crawl/CrawlDbUpdateUtil.java | 3 ++- .../nutch/crawl/TODOTestCrawlDbStates.java | 4 ++- .../apache/nutch/crawl/TestCrawlDbMerger.java | 18 +++++++------ .../apache/nutch/crawl/TestCrawlDbStates.java | 3 ++- .../apache/nutch/crawl/TestLinkDbMerger.java | 18 +++++++------ .../nutch/indexer/TestIndexerMapReduce.java | 4 ++- .../segment/TestSegmentMergerCrawlDatums.java | 3 ++- .../apache/nutch/service/TestNutchServer.java | 4 ++- .../nutch/tools/proxy/LogDebugHandler.java | 3 ++- .../apache/nutch/tools/proxy/ProxyTestbed.java | 4 ++- .../nutch/tools/proxy/SegmentHandler.java | 3 ++- 177 files changed, 556 insertions(+), 280 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java index c259419..0e4eafa 100755 --- a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java +++ b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java @@ -24,6 +24,8 @@ import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; import org.apache.nutch.crawl.CrawlDatum; +import java.lang.invoke.MethodHandles; + /** * This class provides common methods for implementations of * <code>FetchSchedule</code>. @@ -33,7 +35,7 @@ import org.apache.nutch.crawl.CrawlDatum; public abstract class AbstractFetchSchedule extends Configured implements FetchSchedule { private static final Logger LOG = LoggerFactory - .getLogger(AbstractFetchSchedule.class); + .getLogger(MethodHandles.lookup().lookupClass()); protected int defaultInterval; protected int maxInterval; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java b/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java index a4119ff..73655a0 100755 --- a/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java +++ b/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java @@ -27,6 +27,8 @@ import org.apache.nutch.util.NutchConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; + /** * This class implements an adaptive re-fetch algorithm. This works as follows: * <ul> @@ -63,8 +65,8 @@ import org.slf4j.LoggerFactory; public class AdaptiveFetchSchedule extends AbstractFetchSchedule { // Loggg - public static final Logger LOG = LoggerFactory - .getLogger(AbstractFetchSchedule.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected float INC_RATE; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDb.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/CrawlDb.java b/src/java/org/apache/nutch/crawl/CrawlDb.java index 1537cdc..08461b7 100644 --- a/src/java/org/apache/nutch/crawl/CrawlDb.java +++ b/src/java/org/apache/nutch/crawl/CrawlDb.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.*; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.*; @@ -44,7 +45,8 @@ import org.apache.nutch.util.TimingUtil; * accordingly. */ public class CrawlDb extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(CrawlDb.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String CRAWLDB_ADDITIONS_ALLOWED = "db.update.additions.allowed"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/CrawlDbFilter.java b/src/java/org/apache/nutch/crawl/CrawlDbFilter.java index de4c37b..0b9cac3 100644 --- a/src/java/org/apache/nutch/crawl/CrawlDbFilter.java +++ b/src/java/org/apache/nutch/crawl/CrawlDbFilter.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.IOException; +import java.lang.invoke.MethodHandles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +56,8 @@ public class CrawlDbFilter implements private String scope; - public static final Logger LOG = LoggerFactory.getLogger(CrawlDbFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public void configure(JobConf job) { urlFiltering = job.getBoolean(URL_FILTERING, false); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbMerger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/CrawlDbMerger.java b/src/java/org/apache/nutch/crawl/CrawlDbMerger.java index cd775d8..9e3de81 100644 --- a/src/java/org/apache/nutch/crawl/CrawlDbMerger.java +++ b/src/java/org/apache/nutch/crawl/CrawlDbMerger.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; @@ -57,7 +58,7 @@ import org.apache.nutch.util.TimingUtil; */ public class CrawlDbMerger extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(CrawlDbMerger.class); + .getLogger(MethodHandles.lookup().lookupClass()); public static class Merger extends MapReduceBase implements Reducer<Text, CrawlDatum, Text, CrawlDatum> { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/CrawlDbReader.java b/src/java/org/apache/nutch/crawl/CrawlDbReader.java index 5db5f95..d93b971 100644 --- a/src/java/org/apache/nutch/crawl/CrawlDbReader.java +++ b/src/java/org/apache/nutch/crawl/CrawlDbReader.java @@ -21,6 +21,7 @@ import java.io.DataOutputStream; import java.io.File; import java.io.IOException; import java.io.Closeable; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.Date; import java.util.HashMap; @@ -82,7 +83,8 @@ import org.apache.commons.lang.time.DateUtils; */ public class CrawlDbReader extends Configured implements Closeable, Tool { - public static final Logger LOG = LoggerFactory.getLogger(CrawlDbReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private MapFile.Reader[] readers = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbReducer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/CrawlDbReducer.java b/src/java/org/apache/nutch/crawl/CrawlDbReducer.java index 1ae73b8..76a7bc9 100644 --- a/src/java/org/apache/nutch/crawl/CrawlDbReducer.java +++ b/src/java/org/apache/nutch/crawl/CrawlDbReducer.java @@ -17,6 +17,7 @@ package org.apache.nutch.crawl; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -37,8 +38,8 @@ import org.apache.nutch.scoring.ScoringFilters; /** Merge new page entries with existing entries. */ public class CrawlDbReducer implements Reducer<Text, CrawlDatum, Text, CrawlDatum> { - public static final Logger LOG = LoggerFactory - .getLogger(CrawlDbReducer.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private int retryMax; private CrawlDatum result = new CrawlDatum(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/DeduplicationJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/DeduplicationJob.java b/src/java/org/apache/nutch/crawl/DeduplicationJob.java index c439570..b908e41 100644 --- a/src/java/org/apache/nutch/crawl/DeduplicationJob.java +++ b/src/java/org/apache/nutch/crawl/DeduplicationJob.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.invoke.MethodHandles; import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.HashMap; @@ -67,8 +68,8 @@ import org.slf4j.LoggerFactory; ***/ public class DeduplicationJob extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(DeduplicationJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final static Text urlKey = new Text("_URLTEMPKEY_"); private final static String DEDUPLICATION_GROUP_MODE = "deduplication.group.mode"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java index 7a84524..09a2fd8 100755 --- a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java +++ b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java @@ -22,11 +22,13 @@ import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.util.ObjectCache; +import java.lang.invoke.MethodHandles; + /** Creates and caches a {@link FetchSchedule} implementation. */ public class FetchScheduleFactory { - public static final Logger LOG = LoggerFactory - .getLogger(FetchScheduleFactory.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private FetchScheduleFactory() { } // no public ctor http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/Generator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/Generator.java b/src/java/org/apache/nutch/crawl/Generator.java index 9a82089..971e1ff 100644 --- a/src/java/org/apache/nutch/crawl/Generator.java +++ b/src/java/org/apache/nutch/crawl/Generator.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.*; +import java.lang.invoke.MethodHandles; import java.net.*; import java.util.*; import java.text.*; @@ -59,7 +60,8 @@ import org.apache.nutch.util.URLUtil; **/ public class Generator extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(Generator.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String GENERATE_UPDATE_CRAWLDB = "generate.update.crawldb"; public static final String GENERATOR_MIN_SCORE = "generate.min.score"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/Injector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/Injector.java b/src/java/org/apache/nutch/crawl/Injector.java index 6575782..0d12ab1 100644 --- a/src/java/org/apache/nutch/crawl/Injector.java +++ b/src/java/org/apache/nutch/crawl/Injector.java @@ -50,6 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; @@ -82,7 +83,8 @@ import java.util.Random; * </p> **/ public class Injector extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(Injector.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** metadata key reserved for setting a custom score for a specific URL */ public static String nutchScoreMDName = "nutch.score"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDb.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/LinkDb.java b/src/java/org/apache/nutch/crawl/LinkDb.java index 908a8e9..f1be66f 100644 --- a/src/java/org/apache/nutch/crawl/LinkDb.java +++ b/src/java/org/apache/nutch/crawl/LinkDb.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.*; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.*; import java.net.*; @@ -46,7 +47,8 @@ import org.apache.nutch.util.TimingUtil; public class LinkDb extends NutchTool implements Tool, Mapper<Text, ParseData, Text, Inlinks> { - public static final Logger LOG = LoggerFactory.getLogger(LinkDb.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String IGNORE_INTERNAL_LINKS = "linkdb.ignore.internal.links"; public static final String IGNORE_EXTERNAL_LINKS = "linkdb.ignore.external.links"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/LinkDbFilter.java b/src/java/org/apache/nutch/crawl/LinkDbFilter.java index 1ff9b05..d2bb457 100644 --- a/src/java/org/apache/nutch/crawl/LinkDbFilter.java +++ b/src/java/org/apache/nutch/crawl/LinkDbFilter.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Iterator; import org.slf4j.Logger; @@ -53,7 +54,8 @@ public class LinkDbFilter implements Mapper<Text, Inlinks, Text, Inlinks> { private String scope; - public static final Logger LOG = LoggerFactory.getLogger(LinkDbFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Text newKey = new Text(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbMerger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/LinkDbMerger.java b/src/java/org/apache/nutch/crawl/LinkDbMerger.java index 39923ac..21a1c6f 100644 --- a/src/java/org/apache/nutch/crawl/LinkDbMerger.java +++ b/src/java/org/apache/nutch/crawl/LinkDbMerger.java @@ -17,6 +17,7 @@ package org.apache.nutch.crawl; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; @@ -69,7 +70,8 @@ import org.apache.nutch.util.TimingUtil; */ public class LinkDbMerger extends Configured implements Tool, Reducer<Text, Inlinks, Text, Inlinks> { - private static final Logger LOG = LoggerFactory.getLogger(LinkDbMerger.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private int maxInlinks; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/LinkDbReader.java b/src/java/org/apache/nutch/crawl/LinkDbReader.java index 2e50e9a..170f2e0 100644 --- a/src/java/org/apache/nutch/crawl/LinkDbReader.java +++ b/src/java/org/apache/nutch/crawl/LinkDbReader.java @@ -19,6 +19,7 @@ package org.apache.nutch.crawl; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -44,7 +45,8 @@ import java.io.Closeable; /** . */ public class LinkDbReader extends Configured implements Tool, Closeable { - public static final Logger LOG = LoggerFactory.getLogger(LinkDbReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Partitioner<WritableComparable, Writable> PARTITIONER = new HashPartitioner<WritableComparable, Writable>(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java b/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java index 4fe5cef..96452ae 100644 --- a/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java +++ b/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java @@ -20,6 +20,7 @@ package org.apache.nutch.crawl; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import org.apache.commons.lang.StringUtils; @@ -51,8 +52,8 @@ import org.slf4j.LoggerFactory; */ public class MimeAdaptiveFetchSchedule extends AdaptiveFetchSchedule { // Loggg - public static final Logger LOG = LoggerFactory - .getLogger(MimeAdaptiveFetchSchedule.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); // Conf directives public static final String SCHEDULE_INC_RATE = "db.fetch.schedule.adaptive.inc_rate"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/SignatureFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/SignatureFactory.java b/src/java/org/apache/nutch/crawl/SignatureFactory.java index 16d8cc0..1966ca2 100644 --- a/src/java/org/apache/nutch/crawl/SignatureFactory.java +++ b/src/java/org/apache/nutch/crawl/SignatureFactory.java @@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.util.ObjectCache; +import java.lang.invoke.MethodHandles; + /** * Factory class, which instantiates a Signature implementation according to the * current Configuration configuration. This newly created instance is cached in @@ -34,7 +36,7 @@ import org.apache.nutch.util.ObjectCache; */ public class SignatureFactory { private static final Logger LOG = LoggerFactory - .getLogger(SignatureFactory.class); + .getLogger(MethodHandles.lookup().lookupClass()); private SignatureFactory() { } // no public ctor http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/URLPartitioner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/crawl/URLPartitioner.java b/src/java/org/apache/nutch/crawl/URLPartitioner.java index 4675f83..fcf5f70 100644 --- a/src/java/org/apache/nutch/crawl/URLPartitioner.java +++ b/src/java/org/apache/nutch/crawl/URLPartitioner.java @@ -17,6 +17,7 @@ package org.apache.nutch.crawl; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.URL; import java.net.MalformedURLException; @@ -35,7 +36,7 @@ import org.apache.nutch.util.URLUtil; */ public class URLPartitioner implements Partitioner<Text, Writable> { private static final Logger LOG = LoggerFactory - .getLogger(URLPartitioner.class); + .getLogger(MethodHandles.lookup().lookupClass()); public static final String PARTITION_MODE_KEY = "partition.url.mode"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItem.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/FetchItem.java b/src/java/org/apache/nutch/fetcher/FetchItem.java index 3ad4970..538fc5f 100644 --- a/src/java/org/apache/nutch/fetcher/FetchItem.java +++ b/src/java/org/apache/nutch/fetcher/FetchItem.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.fetcher; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; @@ -31,7 +32,8 @@ import org.slf4j.Logger; */ public class FetchItem { - private static final Logger LOG = LoggerFactory.getLogger(FetchItem.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); int outlinkDepth = 0; String queueID; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItemQueue.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/FetchItemQueue.java b/src/java/org/apache/nutch/fetcher/FetchItemQueue.java index 182c063..435996b 100644 --- a/src/java/org/apache/nutch/fetcher/FetchItemQueue.java +++ b/src/java/org/apache/nutch/fetcher/FetchItemQueue.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.fetcher; +import java.lang.invoke.MethodHandles; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -32,8 +33,9 @@ import org.slf4j.LoggerFactory; * progress and elapsed time between requests. */ public class FetchItemQueue { - - private static final Logger LOG = LoggerFactory.getLogger(FetchItemQueues.class); + + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); List<FetchItem> queue = Collections .synchronizedList(new LinkedList<FetchItem>()); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItemQueues.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/FetchItemQueues.java b/src/java/org/apache/nutch/fetcher/FetchItemQueues.java index 4473ff0..86549cc 100644 --- a/src/java/org/apache/nutch/fetcher/FetchItemQueues.java +++ b/src/java/org/apache/nutch/fetcher/FetchItemQueues.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.fetcher; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -33,8 +34,9 @@ import org.slf4j.LoggerFactory; */ public class FetchItemQueues { - private static final Logger LOG = LoggerFactory.getLogger(FetchItemQueues.class); - + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); + public static final String DEFAULT_ID = "default"; Map<String, FetchItemQueue> queues = new HashMap<String, FetchItemQueue>(); AtomicInteger totalSize = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/Fetcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/Fetcher.java b/src/java/org/apache/nutch/fetcher/Fetcher.java index 17f5a93..56a7d1c 100644 --- a/src/java/org/apache/nutch/fetcher/Fetcher.java +++ b/src/java/org/apache/nutch/fetcher/Fetcher.java @@ -18,6 +18,7 @@ package org.apache.nutch.fetcher; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -86,7 +87,8 @@ MapRunnable<Text, CrawlDatum, Text, NutchWritable> { public static final String PROTOCOL_REDIR = "protocol"; - public static final Logger LOG = LoggerFactory.getLogger(Fetcher.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static class InputFormat extends SequenceFileInputFormat<Text, CrawlDatum> { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetcherThread.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/FetcherThread.java b/src/java/org/apache/nutch/fetcher/FetcherThread.java index 5a1425d..544ec2f 100644 --- a/src/java/org/apache/nutch/fetcher/FetcherThread.java +++ b/src/java/org/apache/nutch/fetcher/FetcherThread.java @@ -17,6 +17,7 @@ package org.apache.nutch.fetcher; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -72,8 +73,9 @@ import crawlercommons.robots.BaseRobotRules; * This class picks items from queues and fetches the pages. */ public class FetcherThread extends Thread { - - private static final Logger LOG = LoggerFactory.getLogger(FetcherThread.class); + + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; private URLFilters urlFilters; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java b/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java index 2832017..8dd2011 100644 --- a/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java +++ b/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java @@ -21,6 +21,8 @@ import org.apache.nutch.publisher.NutchPublishers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; + /** * This class handles the publishing of the events to the queue implementation. * @@ -28,7 +30,8 @@ import org.slf4j.LoggerFactory; public class FetcherThreadPublisher { private static NutchPublishers publisher; - private static final Logger LOG = LoggerFactory.getLogger(FetcherThreadPublisher.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Configure all registered publishers http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/QueueFeeder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/fetcher/QueueFeeder.java b/src/java/org/apache/nutch/fetcher/QueueFeeder.java index 79652e7..c2b39c7 100644 --- a/src/java/org/apache/nutch/fetcher/QueueFeeder.java +++ b/src/java/org/apache/nutch/fetcher/QueueFeeder.java @@ -17,6 +17,7 @@ package org.apache.nutch.fetcher; import java.io.IOException; +import java.lang.invoke.MethodHandles; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.RecordReader; @@ -29,9 +30,9 @@ import org.slf4j.LoggerFactory; * are consumed by FetcherThread-s. */ public class QueueFeeder extends Thread { - - private static final Logger LOG = LoggerFactory.getLogger(QueueFeeder.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private RecordReader<Text, CrawlDatum> reader; private FetchItemQueues queues; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/ReadHostDb.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/hostdb/ReadHostDb.java b/src/java/org/apache/nutch/hostdb/ReadHostDb.java index 240e109..ab3ec0c 100644 --- a/src/java/org/apache/nutch/hostdb/ReadHostDb.java +++ b/src/java/org/apache/nutch/hostdb/ReadHostDb.java @@ -17,6 +17,7 @@ package org.apache.nutch.hostdb; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Map; @@ -56,7 +57,8 @@ import org.apache.commons.jexl2.MapContext; */ public class ReadHostDb extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(ReadHostDb.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String HOSTDB_DUMP_HOSTNAMES = "hostdb.dump.hostnames"; public static final String HOSTDB_DUMP_HOMEPAGES = "hostdb.dump.homepages"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/ResolverThread.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/hostdb/ResolverThread.java b/src/java/org/apache/nutch/hostdb/ResolverThread.java index e7c7978..7d05230 100644 --- a/src/java/org/apache/nutch/hostdb/ResolverThread.java +++ b/src/java/org/apache/nutch/hostdb/ResolverThread.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.hostdb; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.UnknownHostException; @@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory; */ public class ResolverThread implements Runnable { - public static final Logger LOG = LoggerFactory.getLogger(ResolverThread.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected String host = null; protected HostDatum datum = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDb.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDb.java b/src/java/org/apache/nutch/hostdb/UpdateHostDb.java index 3ba3c81..519b51b 100644 --- a/src/java/org/apache/nutch/hostdb/UpdateHostDb.java +++ b/src/java/org/apache/nutch/hostdb/UpdateHostDb.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.hostdb; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Random; @@ -61,7 +62,8 @@ import org.slf4j.LoggerFactory; */ public class UpdateHostDb extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDb.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String LOCK_NAME = ".locked"; public static final String HOSTDB_PURGE_FAILED_HOSTS_THRESHOLD = "hostdb.purge.failed.hosts.threshold"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java b/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java index 5844b04..593bd15 100644 --- a/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java +++ b/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java @@ -17,6 +17,7 @@ package org.apache.nutch.hostdb; import java.io.IOException; +import java.lang.invoke.MethodHandles; import org.apache.hadoop.io.FloatWritable; @@ -46,8 +47,9 @@ import org.slf4j.LoggerFactory; */ public class UpdateHostDbMapper implements Mapper<Text, Writable, Text, NutchWritable> { - - public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDbMapper.class); + + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected Text host = new Text(); protected HostDatum hostDatum = null; protected CrawlDatum crawlDatum = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java b/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java index 33dd18b..4577212 100644 --- a/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java +++ b/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java @@ -17,6 +17,7 @@ package org.apache.nutch.hostdb; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Date; import java.util.Iterator; import java.util.concurrent.BlockingQueue; @@ -51,7 +52,8 @@ import org.slf4j.LoggerFactory; public class UpdateHostDbReducer implements Reducer<Text, NutchWritable, Text, HostDatum> { - public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDbReducer.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected ResolverThread resolverThread = null; protected Integer numResolverThreads = 10; protected static Integer purgeFailedHostsThreshold = -1; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/CleaningJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/CleaningJob.java b/src/java/org/apache/nutch/indexer/CleaningJob.java index c16003a..6b3dc80 100644 --- a/src/java/org/apache/nutch/indexer/CleaningJob.java +++ b/src/java/org/apache/nutch/indexer/CleaningJob.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Iterator; @@ -50,7 +51,8 @@ import org.slf4j.LoggerFactory; */ public class CleaningJob implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(CleaningJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; @Override http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexWriters.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/IndexWriters.java b/src/java/org/apache/nutch/indexer/IndexWriters.java index 681812b..d83b905 100644 --- a/src/java/org/apache/nutch/indexer/IndexWriters.java +++ b/src/java/org/apache/nutch/indexer/IndexWriters.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import org.apache.hadoop.conf.Configuration; @@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory; /** Creates and caches {@link IndexWriter} implementing plugins. */ public class IndexWriters { - public final static Logger LOG = LoggerFactory.getLogger(IndexWriters.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private IndexWriter[] indexWriters; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexerMapReduce.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/IndexerMapReduce.java b/src/java/org/apache/nutch/indexer/IndexerMapReduce.java index 5025525..5097215 100644 --- a/src/java/org/apache/nutch/indexer/IndexerMapReduce.java +++ b/src/java/org/apache/nutch/indexer/IndexerMapReduce.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.Iterator; @@ -57,8 +58,8 @@ public class IndexerMapReduce extends Configured implements Mapper<Text, Writable, Text, NutchWritable>, Reducer<Text, NutchWritable, Text, NutchIndexAction> { - public static final Logger LOG = LoggerFactory - .getLogger(IndexerMapReduce.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String INDEXER_PARAMS = "indexer.additional.params"; public static final String INDEXER_DELETE = "indexer.delete"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingFilters.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/IndexingFilters.java b/src/java/org/apache/nutch/indexer/IndexingFilters.java index 334fcad..439658b 100644 --- a/src/java/org/apache/nutch/indexer/IndexingFilters.java +++ b/src/java/org/apache/nutch/indexer/IndexingFilters.java @@ -28,13 +28,15 @@ import org.apache.nutch.crawl.CrawlDatum; import org.apache.nutch.crawl.Inlinks; import org.apache.hadoop.io.Text; +import java.lang.invoke.MethodHandles; + /** Creates and caches {@link IndexingFilter} implementing plugins. */ public class IndexingFilters { public static final String INDEXINGFILTER_ORDER = "indexingfilter.order"; - public final static Logger LOG = LoggerFactory - .getLogger(IndexingFilters.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private IndexingFilter[] indexingFilters; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java index 2e1b9c2..2c6a1eb 100644 --- a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java +++ b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java @@ -20,6 +20,7 @@ package org.apache.nutch.indexer; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.lang.invoke.MethodHandles; import java.net.ServerSocket; import java.net.Socket; import java.net.InetSocketAddress; @@ -74,8 +75,8 @@ public class IndexingFiltersChecker extends Configured implements Tool { protected HashMap<String, String> metadata = new HashMap<String, String>(); protected int tcpPort = -1; - public static final Logger LOG = LoggerFactory - .getLogger(IndexingFiltersChecker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public IndexingFiltersChecker() { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/indexer/IndexingJob.java b/src/java/org/apache/nutch/indexer/IndexingJob.java index 342ea4a..53ab186 100644 --- a/src/java/org/apache/nutch/indexer/IndexingJob.java +++ b/src/java/org/apache/nutch/indexer/IndexingJob.java @@ -18,6 +18,7 @@ package org.apache.nutch.indexer; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -56,7 +57,8 @@ import org.slf4j.LoggerFactory; public class IndexingJob extends NutchTool implements Tool { - public static Logger LOG = LoggerFactory.getLogger(IndexingJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public IndexingJob() { super(null); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/net/URLExemptionFilters.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/net/URLExemptionFilters.java b/src/java/org/apache/nutch/net/URLExemptionFilters.java index d362f2e..93a8aee 100644 --- a/src/java/org/apache/nutch/net/URLExemptionFilters.java +++ b/src/java/org/apache/nutch/net/URLExemptionFilters.java @@ -24,10 +24,13 @@ import org.apache.nutch.plugin.PluginRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; + /** Creates and caches {@link URLExemptionFilter} implementing plugins. */ public class URLExemptionFilters { - private static final Logger LOG = LoggerFactory.getLogger(URLExemptionFilters.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private URLExemptionFilter[] filters; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/net/URLNormalizers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/net/URLNormalizers.java b/src/java/org/apache/nutch/net/URLNormalizers.java index 7a34353..c990148 100644 --- a/src/java/org/apache/nutch/net/URLNormalizers.java +++ b/src/java/org/apache/nutch/net/URLNormalizers.java @@ -17,6 +17,7 @@ package org.apache.nutch.net; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Arrays; @@ -117,8 +118,8 @@ public final class URLNormalizers { /** Scope used when indexing URLs. */ public static final String SCOPE_INDEXER = "indexer"; - public static final Logger LOG = LoggerFactory - .getLogger(URLNormalizers.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /* Empty extension list for caching purposes. */ private final List<Extension> EMPTY_EXTENSION_LIST = Collections http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/OutlinkExtractor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/OutlinkExtractor.java b/src/java/org/apache/nutch/parse/OutlinkExtractor.java index d1773f8..b4214b5 100644 --- a/src/java/org/apache/nutch/parse/OutlinkExtractor.java +++ b/src/java/org/apache/nutch/parse/OutlinkExtractor.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; @@ -49,7 +50,7 @@ import org.apache.oro.text.regex.Perl5Matcher; */ public class OutlinkExtractor { private static final Logger LOG = LoggerFactory - .getLogger(OutlinkExtractor.class); + .getLogger(MethodHandles.lookup().lookupClass()); /** * Regex pattern to get URLs within a plain text. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParseOutputFormat.java b/src/java/org/apache/nutch/parse/ParseOutputFormat.java index 51b32fc..1ab7e3b 100644 --- a/src/java/org/apache/nutch/parse/ParseOutputFormat.java +++ b/src/java/org/apache/nutch/parse/ParseOutputFormat.java @@ -37,6 +37,7 @@ import org.apache.nutch.metadata.Nutch; import org.apache.nutch.net.*; import java.io.*; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -48,7 +49,7 @@ import org.apache.hadoop.util.Progressable; /* Parse content in a segment. */ public class ParseOutputFormat implements OutputFormat<Text, Parse> { private static final Logger LOG = LoggerFactory - .getLogger(ParseOutputFormat.class); + .getLogger(MethodHandles.lookup().lookupClass()); private URLFilters filters; private URLExemptionFilters exemptionFilters; private URLNormalizers normalizers; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParsePluginsReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParsePluginsReader.java b/src/java/org/apache/nutch/parse/ParsePluginsReader.java index daf96e0..c3b0101 100644 --- a/src/java/org/apache/nutch/parse/ParsePluginsReader.java +++ b/src/java/org/apache/nutch/parse/ParsePluginsReader.java @@ -18,6 +18,7 @@ package org.apache.nutch.parse; // JDK imports import java.io.InputStream; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; @@ -52,8 +53,8 @@ import org.apache.nutch.util.NutchConfiguration; class ParsePluginsReader { /* our log stream */ - public static final Logger LOG = LoggerFactory - .getLogger(ParsePluginsReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** The property name of the parse-plugins location */ private static final String PP_FILE_PROP = "parse.plugin.file"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseResult.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParseResult.java b/src/java/org/apache/nutch/parse/ParseResult.java index 92d8871..9c25da4 100644 --- a/src/java/org/apache/nutch/parse/ParseResult.java +++ b/src/java/org/apache/nutch/parse/ParseResult.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -42,7 +43,8 @@ public class ParseResult implements Iterable<Map.Entry<Text, Parse>> { private Map<Text, Parse> parseMap; private String originalUrl; - public static final Logger LOG = LoggerFactory.getLogger(ParseResult.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Create a container for parse results. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseSegment.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParseSegment.java b/src/java/org/apache/nutch/parse/ParseSegment.java index 1a0da90..f6c857a 100644 --- a/src/java/org/apache/nutch/parse/ParseSegment.java +++ b/src/java/org/apache/nutch/parse/ParseSegment.java @@ -37,6 +37,7 @@ import org.apache.nutch.util.*; import org.apache.hadoop.fs.Path; import java.io.*; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; @@ -46,7 +47,8 @@ public class ParseSegment extends NutchTool implements Tool, Mapper<WritableComparable<?>, Content, Text, ParseImpl>, Reducer<Text, Writable, Text, Writable> { - public static final Logger LOG = LoggerFactory.getLogger(ParseSegment.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String SKIP_TRUNCATED = "parser.skip.truncated"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParseUtil.java b/src/java/org/apache/nutch/parse/ParseUtil.java index 39024dc..bd7380d 100644 --- a/src/java/org/apache/nutch/parse/ParseUtil.java +++ b/src/java/org/apache/nutch/parse/ParseUtil.java @@ -18,6 +18,7 @@ package org.apache.nutch.parse; // Commons Logging imports +import java.lang.invoke.MethodHandles; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -42,7 +43,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; public class ParseUtil { /* our log stream */ - public static final Logger LOG = LoggerFactory.getLogger(ParseUtil.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private ParserFactory parserFactory; /** Parser timeout set to 30 sec by default. Set -1 to deactivate **/ private int maxParseTime = 30; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParserChecker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java index 7e5b146..098891b 100644 --- a/src/java/org/apache/nutch/parse/ParserChecker.java +++ b/src/java/org/apache/nutch/parse/ParserChecker.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -69,7 +70,8 @@ import org.apache.nutch.util.StringUtil; public class ParserChecker implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(ParserChecker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; public ParserChecker() { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParserFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/parse/ParserFactory.java b/src/java/org/apache/nutch/parse/ParserFactory.java index 0982de4..f333dd4 100644 --- a/src/java/org/apache/nutch/parse/ParserFactory.java +++ b/src/java/org/apache/nutch/parse/ParserFactory.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse; // JDK imports +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -41,7 +42,8 @@ import org.apache.nutch.util.ObjectCache; /** Creates and caches {@link Parser} plugins. */ public final class ParserFactory { - public static final Logger LOG = LoggerFactory.getLogger(ParserFactory.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** Wildcard for default plugins. */ public static final String DEFAULT_PLUGIN = "*"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/plugin/PluginDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/plugin/PluginDescriptor.java b/src/java/org/apache/nutch/plugin/PluginDescriptor.java index 0a43745..ac2e20b 100644 --- a/src/java/org/apache/nutch/plugin/PluginDescriptor.java +++ b/src/java/org/apache/nutch/plugin/PluginDescriptor.java @@ -18,6 +18,7 @@ package org.apache.nutch.plugin; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.net.URI; @@ -51,8 +52,8 @@ public class PluginDescriptor { private ArrayList<URL> fNotExportedLibs = new ArrayList<URL>(); private ArrayList<Extension> fExtensions = new ArrayList<Extension>(); private PluginClassLoader fClassLoader; - public static final Logger LOG = LoggerFactory - .getLogger(PluginDescriptor.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration fConf; /** http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/plugin/PluginRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/plugin/PluginRepository.java b/src/java/org/apache/nutch/plugin/PluginRepository.java index 3e19345..d43bf2f 100644 --- a/src/java/org/apache/nutch/plugin/PluginRepository.java +++ b/src/java/org/apache/nutch/plugin/PluginRepository.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.plugin; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -58,8 +59,8 @@ public class PluginRepository { private Configuration conf; - public static final Logger LOG = LoggerFactory - .getLogger(PluginRepository.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * @throws PluginRuntimeException http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/protocol/ProtocolFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/protocol/ProtocolFactory.java b/src/java/org/apache/nutch/protocol/ProtocolFactory.java index 8a92d60..8da0158 100644 --- a/src/java/org/apache/nutch/protocol/ProtocolFactory.java +++ b/src/java/org/apache/nutch/protocol/ProtocolFactory.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.net.MalformedURLException; @@ -37,8 +38,8 @@ import org.apache.hadoop.conf.Configuration; */ public class ProtocolFactory { - public static final Logger LOG = LoggerFactory - .getLogger(ProtocolFactory.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private ExtensionPoint extensionPoint; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/protocol/RobotRulesParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/protocol/RobotRulesParser.java b/src/java/org/apache/nutch/protocol/RobotRulesParser.java index d7eba92..c71191a 100644 --- a/src/java/org/apache/nutch/protocol/RobotRulesParser.java +++ b/src/java/org/apache/nutch/protocol/RobotRulesParser.java @@ -23,6 +23,7 @@ import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.LineNumberReader; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.HashSet; @@ -60,8 +61,8 @@ import crawlercommons.robots.SimpleRobotRulesParser; */ public abstract class RobotRulesParser implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(RobotRulesParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected static final Hashtable<String, BaseRobotRules> CACHE = new Hashtable<String, BaseRobotRules>(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/publisher/NutchPublishers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/publisher/NutchPublishers.java b/src/java/org/apache/nutch/publisher/NutchPublishers.java index b79c217..83b5234 100644 --- a/src/java/org/apache/nutch/publisher/NutchPublishers.java +++ b/src/java/org/apache/nutch/publisher/NutchPublishers.java @@ -23,9 +23,12 @@ import org.apache.nutch.plugin.PluginRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; + public class NutchPublishers extends Configured implements NutchPublisher{ - private static final Logger LOG = LoggerFactory.getLogger(NutchPublishers.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private NutchPublisher[] publishers; private Configuration conf; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java b/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java index 1569c4d..13f2299 100644 --- a/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java +++ b/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java @@ -19,6 +19,7 @@ package org.apache.nutch.scoring.webgraph; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; @@ -72,7 +73,8 @@ import org.apache.nutch.util.TimingUtil; */ public class LinkDumper extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(LinkDumper.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String DUMP_DIR = "linkdump"; /** http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java b/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java index bd22828..2e80256 100644 --- a/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java +++ b/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java @@ -19,6 +19,7 @@ package org.apache.nutch.scoring.webgraph; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashSet; @@ -69,7 +70,8 @@ import org.apache.nutch.util.URLUtil; public class LinkRank extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(LinkRank.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String NUM_NODES = "_num_nodes_"; /** http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java b/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java index 4a57c29..32ee1e7 100644 --- a/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java +++ b/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java @@ -17,6 +17,7 @@ package org.apache.nutch.scoring.webgraph; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Iterator; @@ -65,7 +66,8 @@ import org.apache.nutch.util.URLUtil; */ public class NodeDumper extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(NodeDumper.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static enum DumpType { INLINKS, OUTLINKS, SCORES http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java b/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java index 19704eb..3c86cf6 100644 --- a/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java +++ b/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java @@ -17,6 +17,7 @@ package org.apache.nutch.scoring.webgraph; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Iterator; import java.util.Random; @@ -65,7 +66,8 @@ public class ScoreUpdater extends Configured implements Tool, Mapper<Text, Writable, Text, ObjectWritable>, Reducer<Text, ObjectWritable, Text, CrawlDatum> { - public static final Logger LOG = LoggerFactory.getLogger(ScoreUpdater.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private JobConf conf; private float clearScore = 0.0f; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java b/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java index e2c3d8b..f40adf7 100644 --- a/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java +++ b/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java @@ -17,6 +17,7 @@ package org.apache.nutch.scoring.webgraph; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashSet; @@ -95,7 +96,8 @@ import org.apache.nutch.util.URLUtil; */ public class WebGraph extends Configured implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(WebGraph.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String LOCK_NAME = ".locked"; public static final String INLINK_DIR = "inlinks"; public static final String OUTLINK_DIR = "outlinks/current"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentChecker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/segment/SegmentChecker.java b/src/java/org/apache/nutch/segment/SegmentChecker.java index ec601f4..8f7e8b0 100644 --- a/src/java/org/apache/nutch/segment/SegmentChecker.java +++ b/src/java/org/apache/nutch/segment/SegmentChecker.java @@ -17,6 +17,7 @@ package org.apache.nutch.segment; import java.io.IOException; +import java.lang.invoke.MethodHandles; import org.apache.nutch.crawl.CrawlDatum; import org.apache.nutch.parse.ParseText; @@ -35,8 +36,8 @@ import org.slf4j.LoggerFactory; */ public class SegmentChecker { - public static final Logger LOG = LoggerFactory - .getLogger(SegmentChecker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Check if the segment is indexable. May add new check methods here. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentMergeFilters.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/segment/SegmentMergeFilters.java b/src/java/org/apache/nutch/segment/SegmentMergeFilters.java index 7aa2de3..78b9f76 100644 --- a/src/java/org/apache/nutch/segment/SegmentMergeFilters.java +++ b/src/java/org/apache/nutch/segment/SegmentMergeFilters.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.segment; +import java.lang.invoke.MethodHandles; import java.util.Collection; import org.slf4j.Logger; @@ -40,7 +41,7 @@ import org.apache.nutch.protocol.Content; */ public class SegmentMergeFilters { private static final Logger LOG = LoggerFactory - .getLogger(SegmentMergeFilters.class); + .getLogger(MethodHandles.lookup().lookupClass()); private SegmentMergeFilter[] filters; public SegmentMergeFilters(Configuration conf) { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentMerger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/segment/SegmentMerger.java b/src/java/org/apache/nutch/segment/SegmentMerger.java index ef12f52..792431f 100644 --- a/src/java/org/apache/nutch/segment/SegmentMerger.java +++ b/src/java/org/apache/nutch/segment/SegmentMerger.java @@ -18,6 +18,7 @@ package org.apache.nutch.segment; import java.io.Closeable; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -127,7 +128,7 @@ public class SegmentMerger extends Configured implements Tool, Mapper<Text, MetaWrapper, Text, MetaWrapper>, Reducer<Text, MetaWrapper, Text, MetaWrapper> { private static final Logger LOG = LoggerFactory - .getLogger(SegmentMerger.class); + .getLogger(MethodHandles.lookup().lookupClass()); private static final String SEGMENT_PART_KEY = "part"; private static final String SEGMENT_SLICE_KEY = "slice"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/segment/SegmentReader.java b/src/java/org/apache/nutch/segment/SegmentReader.java index 9ea20be..15a5498 100644 --- a/src/java/org/apache/nutch/segment/SegmentReader.java +++ b/src/java/org/apache/nutch/segment/SegmentReader.java @@ -24,6 +24,7 @@ import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.PrintWriter; import java.io.Writer; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -74,7 +75,8 @@ import org.apache.nutch.util.NutchJob; public class SegmentReader extends Configured implements Tool, Reducer<Text, NutchWritable, Text, Text> { - public static final Logger LOG = LoggerFactory.getLogger(SegmentReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); long recNo = 0L; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/NutchReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/service/NutchReader.java b/src/java/org/apache/nutch/service/NutchReader.java index 00bb78f..ecc8705 100644 --- a/src/java/org/apache/nutch/service/NutchReader.java +++ b/src/java/org/apache/nutch/service/NutchReader.java @@ -17,6 +17,7 @@ package org.apache.nutch.service; import java.io.FileNotFoundException; +import java.lang.invoke.MethodHandles; import java.util.List; import org.apache.hadoop.conf.Configuration; @@ -26,8 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public interface NutchReader { - - public static final Logger LOG = LoggerFactory.getLogger(NutchReader.class); + + static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final Configuration conf = NutchConfiguration.create(); public List read(String path) throws FileNotFoundException; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/NutchServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/service/NutchServer.java b/src/java/org/apache/nutch/service/NutchServer.java index 6d531e0..8c76d40 100644 --- a/src/java/org/apache/nutch/service/NutchServer.java +++ b/src/java/org/apache/nutch/service/NutchServer.java @@ -17,6 +17,7 @@ package org.apache.nutch.service; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -58,7 +59,8 @@ import com.google.common.collect.Queues; public class NutchServer { - private static final Logger LOG = LoggerFactory.getLogger(NutchServer.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String LOCALHOST = "localhost"; private static final Integer DEFAULT_PORT = 8081; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/impl/JobWorker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/service/impl/JobWorker.java b/src/java/org/apache/nutch/service/impl/JobWorker.java index 04821e7..6f3b09a 100644 --- a/src/java/org/apache/nutch/service/impl/JobWorker.java +++ b/src/java/org/apache/nutch/service/impl/JobWorker.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.service.impl; +import java.lang.invoke.MethodHandles; import java.text.MessageFormat; import org.apache.hadoop.conf.Configuration; @@ -32,7 +33,8 @@ public class JobWorker implements Runnable{ private JobInfo jobInfo; private JobConfig jobConfig; - private static final Logger LOG = LoggerFactory.getLogger(JobWorker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private NutchTool tool; /** http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/resources/AdminResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/service/resources/AdminResource.java b/src/java/org/apache/nutch/service/resources/AdminResource.java index 3f0189e..1b01b67 100644 --- a/src/java/org/apache/nutch/service/resources/AdminResource.java +++ b/src/java/org/apache/nutch/service/resources/AdminResource.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.service.resources; +import java.lang.invoke.MethodHandles; import java.util.Date; import javax.ws.rs.GET; @@ -32,7 +33,7 @@ public class AdminResource extends AbstractResource{ private final int DELAY_SEC = 1; private static final Logger LOG = LoggerFactory - .getLogger(AdminResource.class); + .getLogger(MethodHandles.lookup().lookupClass()); /** * To get the status of the Nutch Server http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/resources/SeedResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/service/resources/SeedResource.java b/src/java/org/apache/nutch/service/resources/SeedResource.java index 61a0526..e8a5be3 100644 --- a/src/java/org/apache/nutch/service/resources/SeedResource.java +++ b/src/java/org/apache/nutch/service/resources/SeedResource.java @@ -17,6 +17,7 @@ package org.apache.nutch.service.resources; import java.io.OutputStream; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.Map; @@ -41,8 +42,8 @@ import org.slf4j.LoggerFactory; @Path("/seed") public class SeedResource extends AbstractResource { - private static final Logger log = LoggerFactory - .getLogger(AdminResource.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Gets the list of seedFiles already created @@ -84,7 +85,7 @@ public class SeedResource extends AbstractResource { setSeedList(seedList.getName(), seedList); return Response.ok().entity(seedFilePath).build(); } catch (Exception e) { - log.warn("Error while creating seed : {}", e.getMessage()); + LOG.warn("Error while creating seed : {}", e.getMessage()); } return Response.serverError().build(); } http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java b/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java index 1b425c4..b99a40f 100644 --- a/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java +++ b/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java @@ -19,6 +19,7 @@ package org.apache.nutch.tools; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.URLEncoder; import java.net.UnknownHostException; @@ -43,7 +44,8 @@ import com.ibm.icu.text.SimpleDateFormat; * */ public abstract class AbstractCommonCrawlFormat implements CommonCrawlFormat { - protected static final Logger LOG = LoggerFactory.getLogger(AbstractCommonCrawlFormat.class.getName()); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected String url; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java b/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java index b4fc0a7..fd52614 100644 --- a/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java +++ b/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java @@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.text.ParseException; @@ -181,7 +182,7 @@ import com.ibm.icu.text.SimpleDateFormat; public class CommonCrawlDataDumper extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(CommonCrawlDataDumper.class.getName()); + .getLogger(MethodHandles.lookup().lookupClass()); private static final int MAX_INLINKS = 5000; private CommonCrawlConfig config = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/DmozParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/DmozParser.java b/src/java/org/apache/nutch/tools/DmozParser.java index 54ec543..d96082b 100644 --- a/src/java/org/apache/nutch/tools/DmozParser.java +++ b/src/java/org/apache/nutch/tools/DmozParser.java @@ -18,6 +18,7 @@ package org.apache.nutch.tools; import java.io.*; +import java.lang.invoke.MethodHandles; import java.util.*; import java.util.regex.*; @@ -37,7 +38,8 @@ import org.apache.nutch.util.NutchConfiguration; /** Utility that converts DMOZ RDF into a flat file of URLs to be injected. */ public class DmozParser { - public static final Logger LOG = LoggerFactory.getLogger(DmozParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); long pages = 0; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/FileDumper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/FileDumper.java b/src/java/org/apache/nutch/tools/FileDumper.java index b7c1805..655ed8e 100644 --- a/src/java/org/apache/nutch/tools/FileDumper.java +++ b/src/java/org/apache/nutch/tools/FileDumper.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileFilter; import java.io.FileOutputStream; import java.io.ByteArrayInputStream; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -112,8 +113,8 @@ import org.slf4j.LoggerFactory; */ public class FileDumper { - private static final Logger LOG = LoggerFactory.getLogger(FileDumper.class - .getName()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Dumps the reverse engineered raw content from the provided segment http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/FreeGenerator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/FreeGenerator.java b/src/java/org/apache/nutch/tools/FreeGenerator.java index 138372f..a004a79 100644 --- a/src/java/org/apache/nutch/tools/FreeGenerator.java +++ b/src/java/org/apache/nutch/tools/FreeGenerator.java @@ -18,6 +18,7 @@ package org.apache.nutch.tools; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Iterator; @@ -60,7 +61,7 @@ import org.apache.nutch.util.TimingUtil; */ public class FreeGenerator extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(FreeGenerator.class); + .getLogger(MethodHandles.lookup().lookupClass()); private static final String FILTER_KEY = "free.generator.filter"; private static final String NORMALIZE_KEY = "free.generator.normalize"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/ResolveUrls.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/ResolveUrls.java b/src/java/org/apache/nutch/tools/ResolveUrls.java index 2b1c63b..a7b2930 100644 --- a/src/java/org/apache/nutch/tools/ResolveUrls.java +++ b/src/java/org/apache/nutch/tools/ResolveUrls.java @@ -19,6 +19,7 @@ package org.apache.nutch.tools; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -46,7 +47,8 @@ import org.apache.nutch.util.URLUtil; */ public class ResolveUrls { - public static final Logger LOG = LoggerFactory.getLogger(ResolveUrls.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private String urlsFile = null; private int numThreads = 100; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java index e9ff58d..03f1f37 100644 --- a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java +++ b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java @@ -18,6 +18,7 @@ package org.apache.nutch.tools.arc; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.zip.GZIPInputStream; import org.slf4j.Logger; @@ -54,8 +55,8 @@ import org.apache.hadoop.util.StringUtils; */ public class ArcRecordReader implements RecordReader<Text, BytesWritable> { - public static final Logger LOG = LoggerFactory - .getLogger(ArcRecordReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected Configuration conf; protected long splitStart = 0;
