From c27d65b1f1cba36d0e7a977e978afd11a6a3ddc2 Mon Sep 17 00:00:00 2001 From: kamaci Date: Tue, 17 Jan 2017 23:14:39 +0200 Subject: [PATCH] NUTCH-2351 Logging with generic class name. --- .../org/apache/nutch/api/NutchServer.java | 4 ++- .../org/apache/nutch/api/impl/JobWorker.java | 4 ++- .../apache/nutch/api/impl/db/DbIterator.java | 4 ++- .../nutch/api/resources/AdminResource.java | 3 ++- .../nutch/api/resources/SeedResource.java | 6 +++-- .../nutch/api/security/SecurityUtils.java | 4 ++- .../nutch/crawl/AbstractFetchSchedule.java | 3 ++- .../apache/nutch/crawl/DbUpdateMapper.java | 3 ++- .../apache/nutch/crawl/DbUpdateReducer.java | 2 +- .../org/apache/nutch/crawl/DbUpdaterJob.java | 4 ++- .../nutch/crawl/FetchScheduleFactory.java | 6 +++-- .../org/apache/nutch/crawl/GeneratorJob.java | 4 ++- .../org/apache/nutch/crawl/InjectorJob.java | 6 +++-- .../apache/nutch/crawl/SignatureFactory.java | 3 ++- .../apache/nutch/crawl/URLPartitioner.java | 3 ++- .../apache/nutch/crawl/WebTableReader.java | 5 ++-- .../org/apache/nutch/fetcher/FetcherJob.java | 4 ++- .../apache/nutch/fetcher/FetcherReducer.java | 2 +- src/java/org/apache/nutch/host/HostDb.java | 8 +++--- .../org/apache/nutch/host/HostDbReader.java | 10 ++++--- .../apache/nutch/host/HostDbUpdateJob.java | 6 +++-- .../apache/nutch/host/HostInjectorJob.java | 5 ++-- .../org/apache/nutch/indexer/CleaningJob.java | 4 ++- .../nutch/indexer/IndexCleaningFilters.java | 5 ++-- .../org/apache/nutch/indexer/IndexUtil.java | 10 ++++--- .../apache/nutch/indexer/IndexWriters.java | 4 ++- .../apache/nutch/indexer/IndexingFilters.java | 5 ++-- .../nutch/indexer/IndexingFiltersChecker.java | 5 ++-- .../org/apache/nutch/indexer/IndexingJob.java | 4 ++- .../indexer/solr/SolrDeleteDuplicates.java | 5 ++-- .../apache/nutch/indexer/solr/SolrUtils.java | 4 ++- .../org/apache/nutch/net/URLNormalizers.java | 5 ++-- .../apache/nutch/parse/OutlinkExtractor.java | 3 ++- .../nutch/parse/ParsePluginsReader.java | 5 ++-- .../org/apache/nutch/parse/ParseUtil.java | 4 ++- .../org/apache/nutch/parse/ParserChecker.java | 4 ++- .../org/apache/nutch/parse/ParserFactory.java | 4 ++- .../org/apache/nutch/parse/ParserJob.java | 4 ++- .../apache/nutch/plugin/PluginDescriptor.java | 5 ++-- .../nutch/plugin/PluginManifestParser.java | 2 +- .../apache/nutch/plugin/PluginRepository.java | 5 ++-- .../nutch/protocol/ProtocolFactory.java | 5 ++-- .../nutch/protocol/RobotRulesParser.java | 5 ++-- .../org/apache/nutch/tools/Benchmark.java | 4 ++- .../org/apache/nutch/tools/DmozParser.java | 4 ++- .../org/apache/nutch/tools/ResolveUrls.java | 4 ++- .../nutch/tools/arc/ArcRecordReader.java | 5 ++-- .../nutch/tools/proxy/LogDebugHandler.java | 3 ++- .../nutch/tools/proxy/TestbedProxy.java | 5 +++- src/java/org/apache/nutch/util/Bytes.java | 4 ++- .../org/apache/nutch/util/DeflateUtils.java | 4 ++- src/java/org/apache/nutch/util/DomUtil.java | 4 ++- .../apache/nutch/util/EncodingDetector.java | 5 ++-- src/java/org/apache/nutch/util/GZIPUtils.java | 4 ++- src/java/org/apache/nutch/util/MimeUtil.java | 5 ++-- .../org/apache/nutch/util/ObjectCache.java | 4 ++- .../nutch/util/domain/DomainStatistics.java | 3 ++- .../nutch/util/domain/DomainSuffixes.java | 3 ++- .../util/domain/DomainSuffixesReader.java | 3 ++- .../webui/client/impl/CrawlingCycle.java | 6 +++-- .../client/impl/RemoteCommandExecutor.java | 6 +++-- .../webui/service/impl/CrawlServiceImpl.java | 6 +++-- .../webui/service/impl/NutchServiceImpl.java | 7 ++--- .../nutch/CCIndexingFilter.java | 5 ++-- .../creativecommons/nutch/CCParseFilter.java | 4 ++- .../apache/nutch/parse/feed/FeedParser.java | 5 ++-- .../nutch/parse/feed/TestFeedParser.java | 5 ++-- .../indexer/anchor/AnchorIndexingFilter.java | 5 ++-- .../indexer/basic/BasicIndexingFilter.java | 5 ++-- .../indexer/html/HtmlIndexingFilter.java | 5 ++-- .../indexer/more/MoreIndexingFilter.java | 5 ++-- .../elastic/ElasticIndexWriter.java | 4 ++- .../elastic2/ElasticIndexWriter.java | 4 ++- .../indexwriter/solr/SolrIndexWriter.java | 5 ++-- .../indexwriter/solr/SolrMappingReader.java | 4 ++- .../nutch/indexwriter/solr/SolrUtils.java | 4 ++- .../analysis/lang/HTMLLanguageParser.java | 5 ++-- .../nutch/protocol/http/api/HttpBase.java | 26 ++++++++++--------- .../http/api/HttpRobotRulesParser.java | 6 +++-- .../urlfilter/api/RegexURLFilterBase.java | 5 ++-- .../urlfilter/api/RegexURLFilterBaseTest.java | 5 ++-- .../microformats/reltag/RelTagParser.java | 4 ++- .../org/apache/nutch/parse/ext/ExtParser.java | 4 ++- .../apache/nutch/parse/html/HtmlParser.java | 5 ++-- .../nutch/parse/html/TestHtmlParser.java | 5 ++-- .../apache/nutch/parse/js/JSParseFilter.java | 4 ++- .../nutch/parse/metatags/MetaTagsParser.java | 9 ++++--- .../org/apache/nutch/parse/swf/SWFParser.java | 3 ++- .../tika/BoilerpipeExtractorRepository.java | 6 +++-- .../apache/nutch/parse/tika/TikaParser.java | 4 ++- .../nutch/parse/tika/DOMContentUtilsTest.java | 9 ++++--- .../org/apache/nutch/parse/zip/ZipParser.java | 4 ++- .../nutch/parse/zip/ZipTextExtractor.java | 8 +++--- .../org/apache/nutch/protocol/file/File.java | 4 ++- .../org/apache/nutch/protocol/ftp/Ftp.java | 4 ++- .../protocol/ftp/FtpRobotRulesParser.java | 5 ++-- .../org/apache/nutch/protocol/http/Http.java | 4 ++- .../DummySSLProtocolSocketFactory.java | 3 ++- .../nutch/protocol/httpclient/Http.java | 4 ++- .../httpclient/HttpAuthenticationFactory.java | 5 ++-- .../httpclient/HttpBasicAuthentication.java | 5 ++-- .../org/apache/nutch/protocol/sftp/Sftp.java | 26 ++++++++++--------- .../nutch/scoring/opic/OPICScoringFilter.java | 5 ++-- .../nutch/collection/CollectionManager.java | 4 ++- .../SubcollectionIndexingFilter.java | 5 ++-- .../nutch/indexer/tld/TLDIndexingFilter.java | 5 ++-- .../urlfilter/domain/DomainURLFilter.java | 3 ++- .../urlfilter/domain/TestDomainURLFilter.java | 5 ++-- .../urlfilter/prefix/PrefixURLFilter.java | 3 ++- .../urlfilter/suffix/SuffixURLFilter.java | 3 ++- .../basic/BasicURLNormalizer.java | 5 ++-- .../regex/RegexURLNormalizer.java | 3 ++- .../regex/TestRegexURLNormalizer.java | 3 ++- .../org/apache/nutch/fetcher/TestFetcher.java | 4 ++- 114 files changed, 365 insertions(+), 200 deletions(-) diff --git a/src/java/org/apache/nutch/api/NutchServer.java b/src/java/org/apache/nutch/api/NutchServer.java index 5118497f12..11c9542381 100644 --- a/src/java/org/apache/nutch/api/NutchServer.java +++ b/src/java/org/apache/nutch/api/NutchServer.java @@ -16,6 +16,7 @@ ******************************************************************************/ package org.apache.nutch.api; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.Set; import java.util.concurrent.BlockingQueue; @@ -67,7 +68,8 @@ public class NutchServer extends Application { public static final String NUTCH_SERVER = "NUTCH_SERVER"; - 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 String DEFAULT_LOG_LEVEL = "INFO"; diff --git a/src/java/org/apache/nutch/api/impl/JobWorker.java b/src/java/org/apache/nutch/api/impl/JobWorker.java index 8ac78cc905..43c9ec8135 100644 --- a/src/java/org/apache/nutch/api/impl/JobWorker.java +++ b/src/java/org/apache/nutch/api/impl/JobWorker.java @@ -16,6 +16,7 @@ ******************************************************************************/ package org.apache.nutch.api.impl; +import java.lang.invoke.MethodHandles; import java.text.MessageFormat; import java.util.Locale; @@ -30,7 +31,8 @@ import org.slf4j.LoggerFactory; public class JobWorker implements Runnable { - private static final Logger LOG = LoggerFactory.getLogger(JobWorker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private NutchTool tool; private JobInfo jobInfo; private JobConfig jobConfig; diff --git a/src/java/org/apache/nutch/api/impl/db/DbIterator.java b/src/java/org/apache/nutch/api/impl/db/DbIterator.java index e7fc0dd3ed..5fd21d227b 100644 --- a/src/java/org/apache/nutch/api/impl/db/DbIterator.java +++ b/src/java/org/apache/nutch/api/impl/db/DbIterator.java @@ -17,6 +17,7 @@ package org.apache.nutch.api.impl.db; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.Set; @@ -34,7 +35,8 @@ import com.google.common.collect.UnmodifiableIterator; public class DbIterator extends UnmodifiableIterator> { - private static final Logger LOG = LoggerFactory.getLogger(DbIterator.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Result result; private boolean hasNext; diff --git a/src/java/org/apache/nutch/api/resources/AdminResource.java b/src/java/org/apache/nutch/api/resources/AdminResource.java index bc195554a0..02dad44f98 100644 --- a/src/java/org/apache/nutch/api/resources/AdminResource.java +++ b/src/java/org/apache/nutch/api/resources/AdminResource.java @@ -16,6 +16,7 @@ ******************************************************************************/ package org.apache.nutch.api.resources; +import java.lang.invoke.MethodHandles; import java.text.MessageFormat; import java.util.Date; import java.util.Locale; @@ -43,7 +44,7 @@ public class AdminResource extends AbstractResource { private static final long DELAY_MILLIS = TimeUnit.SECONDS.toMillis(DELAY_SEC); private static final Logger LOG = LoggerFactory - .getLogger(AdminResource.class); + .getLogger(MethodHandles.lookup().lookupClass()); @Context SecurityContext securityContext; diff --git a/src/java/org/apache/nutch/api/resources/SeedResource.java b/src/java/org/apache/nutch/api/resources/SeedResource.java index accf097319..b228d65150 100644 --- a/src/java/org/apache/nutch/api/resources/SeedResource.java +++ b/src/java/org/apache/nutch/api/resources/SeedResource.java @@ -23,6 +23,7 @@ import java.io.OutputStreamWriter; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.Collection; @@ -47,7 +48,8 @@ @Path("/seed") public class SeedResource extends AbstractResource { - private static final Logger log = LoggerFactory.getLogger(SeedResource.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); @Context SecurityContext securityContext; @@ -106,7 +108,7 @@ private File createSeedFile() { } private RuntimeException handleException(Exception e) { - log.error("Cannot create seed file!", e); + LOG.error("Cannot create seed file!", e); return new WebApplicationException(status(Status.INTERNAL_SERVER_ERROR) .entity("Cannot create seed file!").build()); } diff --git a/src/java/org/apache/nutch/api/security/SecurityUtils.java b/src/java/org/apache/nutch/api/security/SecurityUtils.java index 8fd56f9424..3795202c36 100644 --- a/src/java/org/apache/nutch/api/security/SecurityUtils.java +++ b/src/java/org/apache/nutch/api/security/SecurityUtils.java @@ -28,6 +28,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; @@ -37,7 +38,8 @@ */ public final class SecurityUtils { - private static final Logger LOG = LoggerFactory.getLogger(SecurityUtils.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Private constructor to prevent instantiation diff --git a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java index 8070c7b376..aa6fd9b635 100755 --- a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java +++ b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java @@ -23,6 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Set; @@ -35,7 +36,7 @@ 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; diff --git a/src/java/org/apache/nutch/crawl/DbUpdateMapper.java b/src/java/org/apache/nutch/crawl/DbUpdateMapper.java index 6bab0d7627..be1cc309b5 100644 --- a/src/java/org/apache/nutch/crawl/DbUpdateMapper.java +++ b/src/java/org/apache/nutch/crawl/DbUpdateMapper.java @@ -37,7 +37,8 @@ public class DbUpdateMapper extends GoraMapper { - public static final Logger LOG = DbUpdaterJob.LOG; + + private static final Logger LOG = DbUpdaterJob.LOG; private ScoringFilters scoringFilters; diff --git a/src/java/org/apache/nutch/crawl/DbUpdateReducer.java b/src/java/org/apache/nutch/crawl/DbUpdateReducer.java index 2e94c53287..0e4bf5733e 100644 --- a/src/java/org/apache/nutch/crawl/DbUpdateReducer.java +++ b/src/java/org/apache/nutch/crawl/DbUpdateReducer.java @@ -44,7 +44,7 @@ public class DbUpdateReducer extends public static final String CRAWLDB_ADDITIONS_ALLOWED = "db.update.additions.allowed"; - public static final Logger LOG = DbUpdaterJob.LOG; + private static final Logger LOG = DbUpdaterJob.LOG; private int retryMax; private boolean additionsAllowed; diff --git a/src/java/org/apache/nutch/crawl/DbUpdaterJob.java b/src/java/org/apache/nutch/crawl/DbUpdaterJob.java index 3885b68b16..b784322fb6 100644 --- a/src/java/org/apache/nutch/crawl/DbUpdaterJob.java +++ b/src/java/org/apache/nutch/crawl/DbUpdaterJob.java @@ -16,6 +16,7 @@ ******************************************************************************/ package org.apache.nutch.crawl; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.HashSet; @@ -46,7 +47,8 @@ public class DbUpdaterJob extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(DbUpdaterJob.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Collection FIELDS = new HashSet(); diff --git a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java index 80e14b7a0a..0501494abd 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.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 diff --git a/src/java/org/apache/nutch/crawl/GeneratorJob.java b/src/java/org/apache/nutch/crawl/GeneratorJob.java index 162759066c..645153464b 100644 --- a/src/java/org/apache/nutch/crawl/GeneratorJob.java +++ b/src/java/org/apache/nutch/crawl/GeneratorJob.java @@ -19,6 +19,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.HashSet; import java.util.Map; @@ -74,7 +75,8 @@ public class GeneratorJob extends NutchTool implements Tool { FIELDS.add(WebPage.Field.MARKERS); } - public static final Logger LOG = LoggerFactory.getLogger(GeneratorJob.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static class SelectorEntry implements WritableComparable { diff --git a/src/java/org/apache/nutch/crawl/InjectorJob.java b/src/java/org/apache/nutch/crawl/InjectorJob.java index df91a738c3..1f9747f635 100644 --- a/src/java/org/apache/nutch/crawl/InjectorJob.java +++ b/src/java/org/apache/nutch/crawl/InjectorJob.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; @@ -62,8 +63,9 @@ **/ public class InjectorJob extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(InjectorJob.class); - + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); + private static final Set FIELDS = new HashSet(); static { diff --git a/src/java/org/apache/nutch/crawl/SignatureFactory.java b/src/java/org/apache/nutch/crawl/SignatureFactory.java index 8cf7471a26..7e969b4799 100644 --- a/src/java/org/apache/nutch/crawl/SignatureFactory.java +++ b/src/java/org/apache/nutch/crawl/SignatureFactory.java @@ -18,6 +18,7 @@ package org.apache.nutch.crawl; // Commons Logging imports +import java.lang.invoke.MethodHandles; import java.util.Collection; import org.slf4j.Logger; @@ -35,7 +36,7 @@ */ public class SignatureFactory { private static final Logger LOG = LoggerFactory - .getLogger(SignatureFactory.class); + .getLogger(MethodHandles.lookup().lookupClass()); private SignatureFactory() { } // no public ctor diff --git a/src/java/org/apache/nutch/crawl/URLPartitioner.java b/src/java/org/apache/nutch/crawl/URLPartitioner.java index 98c59bc3f2..b61cb098c0 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.MalformedURLException; import java.net.URL; @@ -41,7 +42,7 @@ */ public class URLPartitioner implements Configurable { private static final Logger LOG = LoggerFactory - .getLogger(URLPartitioner.class); + .getLogger(MethodHandles.lookup().lookupClass()); public static final String PARTITION_MODE_KEY = "partition.url.mode"; diff --git a/src/java/org/apache/nutch/crawl/WebTableReader.java b/src/java/org/apache/nutch/crawl/WebTableReader.java index 5e58641b8a..6aacd57238 100644 --- a/src/java/org/apache/nutch/crawl/WebTableReader.java +++ b/src/java/org/apache/nutch/crawl/WebTableReader.java @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.nio.ByteBuffer; import java.util.Arrays; @@ -59,8 +60,8 @@ public class WebTableReader extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(WebTableReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static class WebTableStatMapper extends GoraMapper { diff --git a/src/java/org/apache/nutch/fetcher/FetcherJob.java b/src/java/org/apache/nutch/fetcher/FetcherJob.java index 015c209da3..bd06121b2d 100644 --- a/src/java/org/apache/nutch/fetcher/FetcherJob.java +++ b/src/java/org/apache/nutch/fetcher/FetcherJob.java @@ -17,6 +17,7 @@ package org.apache.nutch.fetcher; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.HashSet; @@ -135,7 +136,8 @@ protected void map(String key, WebPage page, Context context) } } - public static final Logger LOG = LoggerFactory.getLogger(FetcherJob.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public FetcherJob() { diff --git a/src/java/org/apache/nutch/fetcher/FetcherReducer.java b/src/java/org/apache/nutch/fetcher/FetcherReducer.java index 68b982d947..364bf7e38a 100644 --- a/src/java/org/apache/nutch/fetcher/FetcherReducer.java +++ b/src/java/org/apache/nutch/fetcher/FetcherReducer.java @@ -49,7 +49,7 @@ public class FetcherReducer extends GoraReducer { - public static final Logger LOG = FetcherJob.LOG; + private static final Logger LOG = FetcherJob.LOG; private final AtomicInteger activeThreads = new AtomicInteger(0); private final AtomicInteger spinWaiting = new AtomicInteger(0); diff --git a/src/java/org/apache/nutch/host/HostDb.java b/src/java/org/apache/nutch/host/HostDb.java index 579fe8b143..4bfbd5a325 100644 --- a/src/java/org/apache/nutch/host/HostDb.java +++ b/src/java/org/apache/nutch/host/HostDb.java @@ -18,12 +18,11 @@ import java.io.Closeable; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.gora.store.DataStore; import org.apache.gora.util.GoraException; import org.apache.hadoop.conf.Configuration; @@ -35,12 +34,15 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A caching wrapper for the host datastore. */ public class HostDb implements Closeable { - public static final Log LOG = LogFactory.getLog(HostDb.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final class CacheHost { private final Host host; diff --git a/src/java/org/apache/nutch/host/HostDbReader.java b/src/java/org/apache/nutch/host/HostDbReader.java index 7ea14bc50a..df71aa81d9 100644 --- a/src/java/org/apache/nutch/host/HostDbReader.java +++ b/src/java/org/apache/nutch/host/HostDbReader.java @@ -17,9 +17,8 @@ package org.apache.nutch.host; import java.io.IOException; +import java.lang.invoke.MethodHandles; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.gora.query.Query; import org.apache.gora.query.Result; import org.apache.gora.store.DataStore; @@ -31,13 +30,16 @@ import org.apache.nutch.storage.StorageUtils; import org.apache.nutch.util.NutchConfiguration; import org.apache.nutch.util.TableUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Display entries from the hostDB. Allows to verify that the storage is OK. **/ public class HostDbReader extends Configured implements Tool { - public static final Log LOG = LogFactory.getLog(HostDbReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private void read(String key) throws ClassNotFoundException, IOException, Exception { @@ -85,7 +87,7 @@ public int run(String[] args) throws Exception { read(key); return 0; } catch (Exception e) { - LOG.fatal("HostDBReader: " + StringUtils.stringifyException(e)); + LOG.error("HostDBReader: " + StringUtils.stringifyException(e)); return -1; } } diff --git a/src/java/org/apache/nutch/host/HostDbUpdateJob.java b/src/java/org/apache/nutch/host/HostDbUpdateJob.java index 4c717b8b11..0bfec40c49 100644 --- a/src/java/org/apache/nutch/host/HostDbUpdateJob.java +++ b/src/java/org/apache/nutch/host/HostDbUpdateJob.java @@ -17,6 +17,7 @@ package org.apache.nutch.host; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.HashSet; @@ -46,8 +47,9 @@ public class HostDbUpdateJob implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(HostDbUpdateJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); + private static final Collection FIELDS = new HashSet(); private Configuration conf; diff --git a/src/java/org/apache/nutch/host/HostInjectorJob.java b/src/java/org/apache/nutch/host/HostInjectorJob.java index 83f247c1af..59a2e6477c 100644 --- a/src/java/org/apache/nutch/host/HostInjectorJob.java +++ b/src/java/org/apache/nutch/host/HostInjectorJob.java @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -55,8 +56,8 @@ public class HostInjectorJob implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(HostInjectorJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/java/org/apache/nutch/indexer/CleaningJob.java b/src/java/org/apache/nutch/indexer/CleaningJob.java index bea7333a83..70c3b246a7 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.util.Collection; import java.util.HashSet; import java.util.Map; @@ -44,7 +45,8 @@ public class CleaningJob extends NutchTool implements Tool { public static final String ARG_COMMIT = "commit"; - public static final Logger LOG = LoggerFactory.getLogger(CleaningJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; private static final Collection FIELDS = new HashSet(); diff --git a/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java b/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java index b3965493ae..38ddef7557 100644 --- a/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java +++ b/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -37,8 +38,8 @@ public class IndexCleaningFilters { public static final String IndexCleaningFilter_ORDER = "IndexCleaningFilterhbase.order"; - public final static Logger LOG = LoggerFactory - .getLogger(IndexCleaningFilters.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private IndexCleaningFilter[] indexcleaningFilters; diff --git a/src/java/org/apache/nutch/indexer/IndexUtil.java b/src/java/org/apache/nutch/indexer/IndexUtil.java index ddb6f0d650..7b98830f36 100644 --- a/src/java/org/apache/nutch/indexer/IndexUtil.java +++ b/src/java/org/apache/nutch/indexer/IndexUtil.java @@ -16,22 +16,24 @@ ******************************************************************************/ package org.apache.nutch.indexer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.scoring.ScoringFilterException; import org.apache.nutch.scoring.ScoringFilters; import org.apache.nutch.storage.WebPage; import org.apache.nutch.util.StringUtil; import org.apache.nutch.util.TableUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.lang.invoke.MethodHandles; /** * Utility to create an indexed document from a webpage. * */ public class IndexUtil { - private static final Log LOG = LogFactory.getLog(new Object() { - }.getClass().getEnclosingClass()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private IndexingFilters filters; private ScoringFilters scoringFilters; diff --git a/src/java/org/apache/nutch/indexer/IndexWriters.java b/src/java/org/apache/nutch/indexer/IndexWriters.java index 74d341667e..664d20d5d4 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; @@ -32,7 +33,8 @@ /** 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; diff --git a/src/java/org/apache/nutch/indexer/IndexingFilters.java b/src/java/org/apache/nutch/indexer/IndexingFilters.java index b192db0bb4..422b93ff7a 100644 --- a/src/java/org/apache/nutch/indexer/IndexingFilters.java +++ b/src/java/org/apache/nutch/indexer/IndexingFilters.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -37,8 +38,8 @@ 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; diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java index ec77607a40..8bae4053ac 100644 --- a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java +++ b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.util.List; @@ -54,8 +55,8 @@ public class IndexingFiltersChecker extends Configured implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(IndexingFiltersChecker.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public IndexingFiltersChecker() { diff --git a/src/java/org/apache/nutch/indexer/IndexingJob.java b/src/java/org/apache/nutch/indexer/IndexingJob.java index 8713910a78..bcac02b5fa 100644 --- a/src/java/org/apache/nutch/indexer/IndexingJob.java +++ b/src/java/org/apache/nutch/indexer/IndexingJob.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.HashSet; import java.util.Map; @@ -53,7 +54,8 @@ 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()); private static final Collection FIELDS = new HashSet(); diff --git a/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java b/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java index 25cfdca910..09e34fd601 100644 --- a/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java +++ b/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java @@ -19,6 +19,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Date; @@ -85,8 +86,8 @@ public class SolrDeleteDuplicates Reducer implements Tool { - public static final Logger LOG = LoggerFactory - .getLogger(SolrDeleteDuplicates.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String SOLR_GET_ALL_QUERY = SolrConstants.ID_FIELD + ":[* TO *]"; diff --git a/src/java/org/apache/nutch/indexer/solr/SolrUtils.java b/src/java/org/apache/nutch/indexer/solr/SolrUtils.java index 0f4654780d..ce8d35e59e 100644 --- a/src/java/org/apache/nutch/indexer/solr/SolrUtils.java +++ b/src/java/org/apache/nutch/indexer/solr/SolrUtils.java @@ -11,11 +11,13 @@ import org.apache.nutch.indexer.solr.SolrConstants; import org.apache.solr.client.solrj.impl.HttpSolrServer; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; public class SolrUtils { - public static Logger LOG = LoggerFactory.getLogger(SolrUtils.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static HttpSolrServer getHttpSolrServer(Configuration job) throws MalformedURLException { diff --git a/src/java/org/apache/nutch/net/URLNormalizers.java b/src/java/org/apache/nutch/net/URLNormalizers.java index 1fc1df849e..9091f365e1 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; @@ -115,8 +116,8 @@ public final class URLNormalizers { */ public static final String SCOPE_OUTLINK = "outlink"; - 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 EMPTY_EXTENSION_LIST = Collections.emptyList(); diff --git a/src/java/org/apache/nutch/parse/OutlinkExtractor.java b/src/java/org/apache/nutch/parse/OutlinkExtractor.java index d1773f8f15..b4214b5069 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 @@ */ 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. diff --git a/src/java/org/apache/nutch/parse/ParsePluginsReader.java b/src/java/org/apache/nutch/parse/ParsePluginsReader.java index b4c6f4e810..0cfbdba935 100644 --- a/src/java/org/apache/nutch/parse/ParsePluginsReader.java +++ b/src/java/org/apache/nutch/parse/ParsePluginsReader.java @@ -18,6 +18,7 @@ // 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 @@ public 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"; diff --git a/src/java/org/apache/nutch/parse/ParseUtil.java b/src/java/org/apache/nutch/parse/ParseUtil.java index a38fb0a59f..7c780c4289 100644 --- a/src/java/org/apache/nutch/parse/ParseUtil.java +++ b/src/java/org/apache/nutch/parse/ParseUtil.java @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.nio.ByteBuffer; @@ -69,7 +70,8 @@ public enum ChangeFrequency { ALWAYS, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY, NEVER } /* our log stream */ - public static final Logger LOG = LoggerFactory.getLogger(ParseUtil.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int DEFAULT_MAX_PARSE_TIME = 30; private static final int DEFAULT_OUTLINKS_MAX_TARGET_LENGTH = 3000; diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java index 4d5c572968..2b612a924f 100644 --- a/src/java/org/apache/nutch/parse/ParserChecker.java +++ b/src/java/org/apache/nutch/parse/ParserChecker.java @@ -31,6 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.Map; @@ -66,7 +67,8 @@ 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() { diff --git a/src/java/org/apache/nutch/parse/ParserFactory.java b/src/java/org/apache/nutch/parse/ParserFactory.java index 2c73677ac2..01113dec42 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.Collection; import java.util.HashSet; @@ -37,7 +38,8 @@ /** 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 = "*"; diff --git a/src/java/org/apache/nutch/parse/ParserJob.java b/src/java/org/apache/nutch/parse/ParserJob.java index 9762a00d70..941a31119f 100644 --- a/src/java/org/apache/nutch/parse/ParserJob.java +++ b/src/java/org/apache/nutch/parse/ParserJob.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.text.SimpleDateFormat; import java.util.Collection; @@ -54,7 +55,8 @@ public class ParserJob extends NutchTool implements Tool { - public static final Logger LOG = LoggerFactory.getLogger(ParserJob.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String RESUME_KEY = "parse.job.resume"; private static final String FORCE_KEY = "parse.job.force"; diff --git a/src/java/org/apache/nutch/plugin/PluginDescriptor.java b/src/java/org/apache/nutch/plugin/PluginDescriptor.java index d1196bab0a..06c221f87b 100644 --- a/src/java/org/apache/nutch/plugin/PluginDescriptor.java +++ b/src/java/org/apache/nutch/plugin/PluginDescriptor.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -50,8 +51,8 @@ public class PluginDescriptor { private ArrayList fNotExportedLibs = new ArrayList(); private ArrayList fExtensions = new ArrayList(); 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; /** diff --git a/src/java/org/apache/nutch/plugin/PluginManifestParser.java b/src/java/org/apache/nutch/plugin/PluginManifestParser.java index bd2a4900d5..69b59fe4ce 100644 --- a/src/java/org/apache/nutch/plugin/PluginManifestParser.java +++ b/src/java/org/apache/nutch/plugin/PluginManifestParser.java @@ -49,7 +49,7 @@ public class PluginManifestParser { private static final String ATTR_CLASS = "class"; private static final String ATTR_ID = "id"; - public static final Logger LOG = PluginRepository.LOG; + private static final Logger LOG = PluginRepository.LOG; private static final boolean WINDOWS = System.getProperty("os.name") .startsWith("Windows"); diff --git a/src/java/org/apache/nutch/plugin/PluginRepository.java b/src/java/org/apache/nutch/plugin/PluginRepository.java index 6486f63f53..c62963fc88 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.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -55,8 +56,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()); /** * Pluging repository constructor diff --git a/src/java/org/apache/nutch/protocol/ProtocolFactory.java b/src/java/org/apache/nutch/protocol/ProtocolFactory.java index c318df7178..d214945ea3 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.MalformedURLException; import java.net.URL; import java.util.Collection; @@ -41,8 +42,8 @@ */ public class ProtocolFactory { - public static final Logger LOG = LoggerFactory - .getLogger(ProtocolFactory.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final ExtensionPoint extensionPoint; diff --git a/src/java/org/apache/nutch/protocol/RobotRulesParser.java b/src/java/org/apache/nutch/protocol/RobotRulesParser.java index 867b71bba0..50ba06f653 100644 --- a/src/java/org/apache/nutch/protocol/RobotRulesParser.java +++ b/src/java/org/apache/nutch/protocol/RobotRulesParser.java @@ -22,6 +22,7 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Hashtable; @@ -48,8 +49,8 @@ */ public abstract class RobotRulesParser implements Configurable { - public static final Logger LOG = LoggerFactory - .getLogger(RobotRulesParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); protected static final Hashtable CACHE = new Hashtable(); diff --git a/src/java/org/apache/nutch/tools/Benchmark.java b/src/java/org/apache/nutch/tools/Benchmark.java index 68c1755638..b5ea7814aa 100644 --- a/src/java/org/apache/nutch/tools/Benchmark.java +++ b/src/java/org/apache/nutch/tools/Benchmark.java @@ -17,6 +17,7 @@ package org.apache.nutch.tools; import java.io.OutputStream; +import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -43,7 +44,8 @@ import org.apache.nutch.util.NutchJob; public class Benchmark extends Configured implements Tool { - private static final Logger LOG = LoggerFactory.getLogger(Benchmark.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static void main(String[] args) throws Exception { Configuration conf = NutchConfiguration.create(); diff --git a/src/java/org/apache/nutch/tools/DmozParser.java b/src/java/org/apache/nutch/tools/DmozParser.java index 03d2662372..cef1819c6f 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.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.*; @@ -43,7 +44,8 @@ /** 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; private static DataStore store = null; diff --git a/src/java/org/apache/nutch/tools/ResolveUrls.java b/src/java/org/apache/nutch/tools/ResolveUrls.java index 8c8bf97f73..2269e7cccd 100644 --- a/src/java/org/apache/nutch/tools/ResolveUrls.java +++ b/src/java/org/apache/nutch/tools/ResolveUrls.java @@ -19,6 +19,7 @@ import java.io.BufferedReader; import java.io.FileInputStream; import java.io.InputStreamReader; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.nio.charset.StandardCharsets; import java.util.concurrent.ExecutorService; @@ -47,7 +48,8 @@ */ 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; diff --git a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java index 7f36b52d81..08c65346da 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 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.zip.GZIPInputStream; @@ -56,8 +57,8 @@ */ public class ArcRecordReader implements RecordReader { - 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; diff --git a/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java b/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java index aabdd1bee1..640ed2b88d 100644 --- a/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java +++ b/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java @@ -34,6 +34,7 @@ */ import java.io.IOException; +import java.lang.invoke.MethodHandles; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -49,7 +50,7 @@ public class LogDebugHandler extends AbstractTestbedHandler implements Filter { private static final Logger LOG = LoggerFactory - .getLogger(LogDebugHandler.class); + .getLogger(MethodHandles.lookup().lookupClass()); @Override public void handle(Request req, HttpServletResponse res, String target, diff --git a/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java b/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java index cfa8d94207..a0c985a12b 100644 --- a/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java +++ b/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java @@ -45,8 +45,11 @@ import org.mortbay.jetty.servlet.ServletHandler; import org.mortbay.proxy.AsyncProxyServlet; +import java.lang.invoke.MethodHandles; + public class TestbedProxy { - private static final Logger LOG = LoggerFactory.getLogger(TestbedProxy.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * @param args diff --git a/src/java/org/apache/nutch/util/Bytes.java b/src/java/org/apache/nutch/util/Bytes.java index 043a89761d..0a2a1ed458 100644 --- a/src/java/org/apache/nutch/util/Bytes.java +++ b/src/java/org/apache/nutch/util/Bytes.java @@ -24,6 +24,7 @@ import java.io.DataOutput; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.invoke.MethodHandles; import java.math.BigInteger; import java.nio.ByteBuffer; import java.util.Comparator; @@ -43,7 +44,8 @@ */ public class Bytes { - private static final Logger LOG = LoggerFactory.getLogger(Bytes.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** When we encode strings, we always specify UTF8 encoding */ public static final String UTF8_ENCODING = "UTF-8"; diff --git a/src/java/org/apache/nutch/util/DeflateUtils.java b/src/java/org/apache/nutch/util/DeflateUtils.java index 2e2ed9c184..5ab9157ff5 100644 --- a/src/java/org/apache/nutch/util/DeflateUtils.java +++ b/src/java/org/apache/nutch/util/DeflateUtils.java @@ -19,6 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; import java.util.zip.DeflaterOutputStream; @@ -32,7 +33,8 @@ */ public class DeflateUtils { - private static final Logger LOG = LoggerFactory.getLogger(DeflateUtils.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int EXPECTED_COMPRESSION_RATIO = 5; private static final int BUF_SIZE = 4096; diff --git a/src/java/org/apache/nutch/util/DomUtil.java b/src/java/org/apache/nutch/util/DomUtil.java index 18635b614f..20d3ae6fe1 100644 --- a/src/java/org/apache/nutch/util/DomUtil.java +++ b/src/java/org/apache/nutch/util/DomUtil.java @@ -21,6 +21,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; +import java.lang.invoke.MethodHandles; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; @@ -40,7 +41,8 @@ public class DomUtil { - private final static Logger LOG = LoggerFactory.getLogger(DomUtil.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Returns parsed dom tree or null if any error diff --git a/src/java/org/apache/nutch/util/EncodingDetector.java b/src/java/org/apache/nutch/util/EncodingDetector.java index 25f8eefccd..edf2594fbd 100644 --- a/src/java/org/apache/nutch/util/EncodingDetector.java +++ b/src/java/org/apache/nutch/util/EncodingDetector.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; @@ -103,8 +104,8 @@ public boolean meetsThreshold() { } } - public static final Logger LOG = LoggerFactory - .getLogger(EncodingDetector.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final int NO_THRESHOLD = -1; diff --git a/src/java/org/apache/nutch/util/GZIPUtils.java b/src/java/org/apache/nutch/util/GZIPUtils.java index b9e52290b4..2e000d83b2 100644 --- a/src/java/org/apache/nutch/util/GZIPUtils.java +++ b/src/java/org/apache/nutch/util/GZIPUtils.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; @@ -32,7 +33,8 @@ */ public class GZIPUtils { - private static final Logger LOG = LoggerFactory.getLogger(GZIPUtils.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int EXPECTED_COMPRESSION_RATIO = 5; private static final int BUF_SIZE = 4096; diff --git a/src/java/org/apache/nutch/util/MimeUtil.java b/src/java/org/apache/nutch/util/MimeUtil.java index 241087c91a..ec4a398b82 100644 --- a/src/java/org/apache/nutch/util/MimeUtil.java +++ b/src/java/org/apache/nutch/util/MimeUtil.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.lang.invoke.MethodHandles; // Hadoop imports import org.apache.hadoop.conf.Configuration; @@ -66,8 +67,8 @@ public final class MimeUtil { private boolean mimeMagic; /* our log stream */ - private static final Logger LOG = LoggerFactory.getLogger(MimeUtil.class - .getName()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public MimeUtil(Configuration conf) { tika = new Tika(); diff --git a/src/java/org/apache/nutch/util/ObjectCache.java b/src/java/org/apache/nutch/util/ObjectCache.java index 2aa329250f..157e914691 100644 --- a/src/java/org/apache/nutch/util/ObjectCache.java +++ b/src/java/org/apache/nutch/util/ObjectCache.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.util; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.WeakHashMap; @@ -25,7 +26,8 @@ public class ObjectCache { - private static final Logger LOG = LoggerFactory.getLogger(ObjectCache.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final WeakHashMap CACHE = new WeakHashMap(); diff --git a/src/java/org/apache/nutch/util/domain/DomainStatistics.java b/src/java/org/apache/nutch/util/domain/DomainStatistics.java index 7313a03e01..179634b2fa 100644 --- a/src/java/org/apache/nutch/util/domain/DomainStatistics.java +++ b/src/java/org/apache/nutch/util/domain/DomainStatistics.java @@ -18,6 +18,7 @@ package org.apache.nutch.util.domain; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.text.SimpleDateFormat; import java.util.Locale; @@ -54,7 +55,7 @@ public class DomainStatistics extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(DomainStatistics.class); + .getLogger(MethodHandles.lookup().lookupClass()); private static final Text FETCHED_TEXT = new Text("FETCHED"); private static final Text NOT_FETCHED_TEXT = new Text("NOT_FETCHED"); diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixes.java b/src/java/org/apache/nutch/util/domain/DomainSuffixes.java index 286436e3c9..a26195c819 100644 --- a/src/java/org/apache/nutch/util/domain/DomainSuffixes.java +++ b/src/java/org/apache/nutch/util/domain/DomainSuffixes.java @@ -18,6 +18,7 @@ package org.apache.nutch.util.domain; import java.io.InputStream; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import org.slf4j.Logger; @@ -32,7 +33,7 @@ */ public class DomainSuffixes { private static final Logger LOG = LoggerFactory - .getLogger(DomainSuffixes.class); + .getLogger(MethodHandles.lookup().lookupClass()); private HashMap domains = new HashMap(); diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java b/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java index a2a60e2b7e..ae887363c5 100644 --- a/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java +++ b/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; +import java.lang.invoke.MethodHandles; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -44,7 +45,7 @@ class DomainSuffixesReader { private static final Logger LOG = LoggerFactory - .getLogger(DomainSuffixesReader.class); + .getLogger(MethodHandles.lookup().lookupClass()); void read(DomainSuffixes tldEntries, InputStream input) throws IOException { try { diff --git a/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java b/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java index 2482c06790..6a4f2f09bc 100644 --- a/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java +++ b/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.webui.client.impl; +import java.lang.invoke.MethodHandles; import java.util.List; import org.apache.commons.collections4.CollectionUtils; @@ -34,7 +35,8 @@ * */ public class CrawlingCycle { - private Logger log = LoggerFactory.getLogger(CrawlingCycle.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private CrawlingCycleListener listener; private RemoteCommandExecutor executor; @@ -58,7 +60,7 @@ public synchronized void executeCrawlCycle() { JobInfo jobInfo = executor.executeRemoteJob(command); command.setJobInfo(jobInfo); - log.info("Executed remote command data: {}", command); + LOG.info("Executed remote command data: {}", command); if (jobInfo.getState() == State.FAILED) { listener.onCrawlError(crawl, jobInfo.getMsg()); diff --git a/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java b/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java index e1eefc2e92..9e4d1a8e14 100644 --- a/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java +++ b/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkState; +import java.lang.invoke.MethodHandles; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -40,7 +41,8 @@ * */ public class RemoteCommandExecutor { - private Logger log = LoggerFactory.getLogger(RemoteCommandExecutor.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int DEFAULT_TIMEOUT_SEC = 60; private Duration requestDelay = new Duration(500); @@ -60,7 +62,7 @@ public JobInfo executeRemoteJob(RemoteCommand command) { .submit(new JobStateChecker(jobId)); return chekerFuture.get(getTimeout(command), TimeUnit.MILLISECONDS); } catch (Exception e) { - log.error("Remote command failed", e); + LOG.error("Remote command failed", e); JobInfo jobInfo = new JobInfo(); jobInfo.setState(State.FAILED); jobInfo.setMsg(ExceptionUtils.getStackTrace(e)); diff --git a/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java b/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java index 39dbae871b..aa3b19f604 100644 --- a/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java +++ b/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.webui.service.impl; +import java.lang.invoke.MethodHandles; import java.sql.SQLException; import java.util.List; @@ -41,7 +42,8 @@ @Service public class CrawlServiceImpl implements CrawlService, CrawlingCycleListener { - private Logger log = LoggerFactory.getLogger(CrawlServiceImpl.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); @Resource private Dao crawlDao; @@ -71,7 +73,7 @@ public void startCrawl(Long crawlId, NutchInstance instance) { } catch (Exception e) { crawl.setStatus(CrawlStatus.ERROR); saveCrawl(crawl); - log.error("exception occured", e); + LOG.error("exception occured", e); } } diff --git a/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java b/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java index db989cfb75..8e34866dfa 100644 --- a/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java +++ b/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.webui.service.impl; +import java.lang.invoke.MethodHandles; import java.net.ConnectException; import java.util.Collections; import java.util.Map; @@ -36,8 +37,8 @@ @Service public class NutchServiceImpl implements NutchService { - private static final Logger logger = LoggerFactory - .getLogger(NutchServiceImpl.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); @Resource private NutchClientFactory nutchClientFactory; @@ -59,7 +60,7 @@ public ConnectionStatus getConnectionStatus(Long instanceId) { return ConnectionStatus.DISCONNECTED; } - logger.error("Cannot connect to nutch server!", e); + LOG.error("Cannot connect to nutch server!", e); } return null; } diff --git a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java index 6a8e378904..d216078fed 100644 --- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java +++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java @@ -29,6 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.nio.ByteBuffer; @@ -38,8 +39,8 @@ /** Adds basic searchable fields to a document. */ public class CCIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory - .getLogger(CCIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** The name of the document field we use. */ public static String FIELD = "cc"; diff --git a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java index be427ef54b..fae6bb0781 100644 --- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java +++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import java.lang.invoke.MethodHandles; import java.io.StringReader; import java.net.MalformedURLException; import java.net.URL; @@ -41,7 +42,8 @@ /** Adds metadata identifying the Creative Commons license used, if any. */ public class CCParseFilter implements ParseFilter { - public static final Logger LOG = LoggerFactory.getLogger(CCParseFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** Walks DOM tree, looking for RDF in comments and licenses in anchors. */ public static class Walker { diff --git a/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java b/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java index 0751ddc1be..b3c05bbef0 100644 --- a/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java +++ b/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.feed; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.File; @@ -74,8 +75,8 @@ public class FeedParser implements Parser { public static final String TEXT_PLAIN_CONTENT_TYPE = "text/plain; " + CHARSET_UTF8; - public static final Logger LOG = LoggerFactory - .getLogger("org.apache.nutch.parse.feed"); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java b/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java index 61a5968294..92cbcc0693 100644 --- a/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java +++ b/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java @@ -18,6 +18,7 @@ package org.apache.nutch.parse.feed; // JDK imports +import java.lang.invoke.MethodHandles; import java.util.Iterator; import java.util.Map; @@ -57,8 +58,8 @@ public class TestFeedParser { private String[] sampleFiles = { "rsstest.rss" }; - public static final Logger LOG = LoggerFactory.getLogger(TestFeedParser.class - .getName()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Default Constructor. diff --git a/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java b/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java index 7e0e24688b..bb26385897 100644 --- a/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java +++ b/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexer.anchor; +import java.lang.invoke.MethodHandles; import org.apache.avro.util.Utf8; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.indexer.IndexingException; @@ -40,8 +41,8 @@ */ public class AnchorIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory - .getLogger(AnchorIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; private boolean deduplicate = false; diff --git a/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java b/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java index 617c681a5a..10bbf51e52 100644 --- a/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java +++ b/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer.basic; +import java.lang.invoke.MethodHandles; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.indexer.IndexingException; import org.apache.nutch.indexer.IndexingFilter; @@ -45,8 +46,8 @@ * policy, if available tstamp - add timestamp when fetched, for deduplication */ public class BasicIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory - .getLogger(BasicIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private int MAX_TITLE_LENGTH; private Configuration conf; diff --git a/src/plugin/index-html/src/java/org/apache/nutch/indexer/html/HtmlIndexingFilter.java b/src/plugin/index-html/src/java/org/apache/nutch/indexer/html/HtmlIndexingFilter.java index eb1454b6c8..03e73e63a1 100644 --- a/src/plugin/index-html/src/java/org/apache/nutch/indexer/html/HtmlIndexingFilter.java +++ b/src/plugin/index-html/src/java/org/apache/nutch/indexer/html/HtmlIndexingFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexer.html; +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -34,13 +35,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Add raw HTML content of a document to the index. */ public class HtmlIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory.getLogger(HtmlIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; /** diff --git a/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java b/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java index 9171b1cebb..230373d354 100644 --- a/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java +++ b/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java @@ -1,5 +1,6 @@ package org.apache.nutch.indexer.more; +import java.lang.invoke.MethodHandles; import java.text.ParseException; import java.util.Collection; import java.util.Date; @@ -43,8 +44,8 @@ */ public class MoreIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory - .getLogger(MoreIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** Get the MimeTypes resolver instance. */ private MimeUtil MIME; diff --git a/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java b/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java index acb1d17ad1..533dfff5da 100644 --- a/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java +++ b/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java @@ -19,6 +19,7 @@ import static org.elasticsearch.node.NodeBuilder.nodeBuilder; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.util.HashMap; @@ -48,7 +49,8 @@ /** */ public class ElasticIndexWriter implements IndexWriter { - public static Logger LOG = LoggerFactory.getLogger(ElasticIndexWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int DEFAULT_MAX_BULK_DOCS = 250; private static final int DEFAULT_MAX_BULK_LENGTH = 2500500; diff --git a/src/plugin/indexer-elastic2/src/java/org/apache/nutch/indexwriter/elastic2/ElasticIndexWriter.java b/src/plugin/indexer-elastic2/src/java/org/apache/nutch/indexwriter/elastic2/ElasticIndexWriter.java index 8b413d748e..cb3366d247 100644 --- a/src/plugin/indexer-elastic2/src/java/org/apache/nutch/indexwriter/elastic2/ElasticIndexWriter.java +++ b/src/plugin/indexer-elastic2/src/java/org/apache/nutch/indexwriter/elastic2/ElasticIndexWriter.java @@ -19,6 +19,7 @@ import static org.elasticsearch.node.NodeBuilder.nodeBuilder; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.util.HashMap; @@ -48,7 +49,8 @@ /** */ public class ElasticIndexWriter implements IndexWriter { - public static Logger LOG = LoggerFactory.getLogger(ElasticIndexWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int DEFAULT_MAX_BULK_DOCS = 250; private static final int DEFAULT_MAX_BULK_LENGTH = 2500500; diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java index 793c2c98a2..22700d4780 100644 --- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java +++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexwriter.solr; +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -34,8 +35,8 @@ public class SolrIndexWriter implements IndexWriter { - public static final Logger LOG = LoggerFactory - .getLogger(SolrIndexWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private HttpSolrServer solr; private SolrMappingReader solrMapping; diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java index 0aa9a56e63..2e266df1a1 100644 --- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java +++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexwriter.solr; +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -37,7 +38,8 @@ import org.xml.sax.SAXException; public class SolrMappingReader { - public static Logger LOG = LoggerFactory.getLogger(SolrMappingReader.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java index ead34c2f3a..e48408302a 100644 --- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java +++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java @@ -1,5 +1,6 @@ package org.apache.nutch.indexwriter.solr; +import java.lang.invoke.MethodHandles; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -14,7 +15,8 @@ public class SolrUtils { - public static Logger LOG = LoggerFactory.getLogger(SolrUtils.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static HttpSolrServer getHttpSolrServer(Configuration job) throws MalformedURLException { diff --git a/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java b/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java index 064cd8db2a..e18b012fd1 100644 --- a/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java +++ b/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java @@ -18,6 +18,7 @@ // JDK imports +import java.lang.invoke.MethodHandles; import org.apache.avro.util.Utf8; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.metadata.Metadata; @@ -48,8 +49,8 @@ */ public class HTMLLanguageParser implements ParseFilter { - public static final Logger LOG = LoggerFactory - .getLogger(HTMLLanguageParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Collection FIELDS = new HashSet(); diff --git a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java index 0a6121b355..c79feb2f07 100644 --- a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java +++ b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.http.api; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; @@ -88,10 +89,11 @@ public abstract class HttpBase implements Protocol { protected String accept = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"; /** The default logger */ - private final static Logger LOGGER = LoggerFactory.getLogger(HttpBase.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** The specified logger */ - private Logger logger = LOGGER; + private Logger logger = LOG; /** The nutch configuration */ private Configuration conf = null; @@ -387,8 +389,8 @@ private static String getAgentString(String agentName, String agentVersion, if ((agentName == null) || (agentName.trim().length() == 0)) { // TODO : NUTCH-258 - if (LOGGER.isErrorEnabled()) { - LOGGER.error("No User-Agent string set (http.agent.name)!"); + if (LOG.isErrorEnabled()) { + LOG.error("No User-Agent string set (http.agent.name)!"); } } @@ -439,8 +441,8 @@ protected void logConf() { public byte[] processGzipEncoded(byte[] compressed, URL url) throws IOException { - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("uncompressing...."); + if (LOG.isTraceEnabled()) { + LOG.trace("uncompressing...."); } byte[] content; @@ -453,8 +455,8 @@ public byte[] processGzipEncoded(byte[] compressed, URL url) if (content == null) throw new IOException("unzipBestEffort returned null"); - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("fetched " + compressed.length + if (LOG.isTraceEnabled()) { + LOG.trace("fetched " + compressed.length + " bytes of compressed content (expanded to " + content.length + " bytes) from " + url); } @@ -464,8 +466,8 @@ public byte[] processGzipEncoded(byte[] compressed, URL url) public byte[] processDeflateEncoded(byte[] compressed, URL url) throws IOException { - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("inflating...."); + if (LOG.isTraceEnabled()) { + LOG.trace("inflating...."); } byte[] content = DeflateUtils @@ -474,8 +476,8 @@ public byte[] processDeflateEncoded(byte[] compressed, URL url) if (content == null) throw new IOException("inflateBestEffort returned null"); - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("fetched " + compressed.length + if (LOG.isTraceEnabled()) { + LOG.trace("fetched " + compressed.length + " bytes of compressed content (expanded to " + content.length + " bytes) from " + url); } diff --git a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java index bd64d76502..2af6fa5779 100644 --- a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java +++ b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.http.api; +import java.lang.invoke.MethodHandles; import crawlercommons.robots.BaseRobotRules; import crawlercommons.robots.SimpleRobotRules; import org.apache.hadoop.conf.Configuration; @@ -37,8 +38,9 @@ */ public class HttpRobotRulesParser extends RobotRulesParser { - public static final Logger LOG = LoggerFactory - .getLogger(HttpRobotRulesParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); + protected boolean allowForbidden = false; HttpRobotRulesParser() { diff --git a/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java b/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java index a1475a71c7..ff96480f5c 100644 --- a/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java +++ b/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java @@ -17,6 +17,7 @@ package org.apache.nutch.urlfilter.api; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.File; import java.io.Reader; import java.io.FileReader; @@ -55,8 +56,8 @@ public abstract class RegexURLFilterBase implements URLFilter { /** My logger */ - private final static Logger LOG = LoggerFactory - .getLogger(RegexURLFilterBase.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** An array of applicable rules */ private List rules; diff --git a/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java b/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java index ae4660f9e6..f8acfa6d1d 100644 --- a/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java +++ b/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java @@ -17,6 +17,7 @@ package org.apache.nutch.urlfilter.api; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; @@ -51,8 +52,8 @@ public abstract class RegexURLFilterBaseTest { /** My logger */ - protected static final Logger LOG = LoggerFactory - .getLogger(RegexURLFilterBaseTest.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final static String SEPARATOR = System.getProperty("file.separator"); private final static String SAMPLES = System.getProperty("test.data", "."); diff --git a/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java b/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java index 00fa30d43d..58e8f72273 100644 --- a/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java +++ b/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.microformats.reltag; // JDK imports +import java.lang.invoke.MethodHandles; import java.net.URL; import java.net.URLDecoder; import java.nio.ByteBuffer; @@ -52,7 +53,8 @@ */ public class RelTagParser implements ParseFilter { - public static final Logger LOG = LoggerFactory.getLogger(RelTagParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public final static String REL_TAG = "Rel-Tag"; diff --git a/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java b/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java index 4264f6fcc4..cebb63ef97 100644 --- a/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java +++ b/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.ext; +import java.lang.invoke.MethodHandles; import org.apache.nutch.protocol.Content; import org.apache.nutch.parse.Parser; import org.apache.nutch.parse.Parse; @@ -48,7 +49,8 @@ public class ExtParser implements Parser { - public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.ext"); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); static final int BUFFER_SIZE = 4096; diff --git a/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java b/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java index 0527d5e0f2..9088081aff 100644 --- a/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java +++ b/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.html; +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.File; @@ -62,8 +63,8 @@ import org.xml.sax.SAXException; public class HtmlParser implements Parser { - public static final Logger LOG = LoggerFactory - .getLogger("org.apache.nutch.parse.html"); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); // I used 1000 bytes at first, but found that some documents have // meta tag well past the first 1000 bytes. diff --git a/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java b/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java index f3dd0f6617..9079f02207 100644 --- a/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java +++ b/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.html; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -36,8 +37,8 @@ public class TestHtmlParser { - public static final Logger LOG = LoggerFactory - .getLogger(TestHtmlParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String encodingTestKeywords = "français, español, русский язык, čeština, ελληνικά"; private static final String encodingTestBody = "
    \n
  • français\n
  • español\n
  • русский язык\n
  • čeština\n
  • ελληνικά\n
"; diff --git a/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java b/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java index a68584444e..5f8e4b18a9 100644 --- a/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java +++ b/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.parse.js; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.FileInputStream; import java.io.InputStream; @@ -64,7 +65,8 @@ * @author Andrzej Bialecki <ab@getopt.org> */ public class JSParseFilter implements ParseFilter, Parser { - public static final Logger LOG = LoggerFactory.getLogger(JSParseFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int MAX_TITLE_LEN = 80; diff --git a/src/plugin/parse-metatags/src/java/org/apache/nutch/parse/metatags/MetaTagsParser.java b/src/plugin/parse-metatags/src/java/org/apache/nutch/parse/metatags/MetaTagsParser.java index f61838cce0..6c51beb647 100644 --- a/src/plugin/parse-metatags/src/java/org/apache/nutch/parse/metatags/MetaTagsParser.java +++ b/src/plugin/parse-metatags/src/java/org/apache/nutch/parse/metatags/MetaTagsParser.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.parse.metatags; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Enumeration; @@ -30,8 +31,8 @@ import java.nio.charset.StandardCharsets; import org.apache.avro.util.Utf8; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.metadata.Metadata; import org.apache.nutch.parse.HTMLMetaTags; @@ -49,8 +50,8 @@ */ public class MetaTagsParser implements ParseFilter { - private static final Log LOG = LogFactory.getLog(MetaTagsParser.class - .getName()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java b/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java index 4fbcad3cc4..6ebc241d70 100644 --- a/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java +++ b/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java @@ -47,7 +47,8 @@ * @author Andrzej Bialecki */ public class SWFParser implements Parser { - public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.swf"); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf = null; diff --git a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java index de9768e9c7..9c8b8820c0 100644 --- a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java +++ b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.parse.tika; +import java.lang.invoke.MethodHandles; import java.lang.ClassLoader; import java.lang.InstantiationException; import java.util.WeakHashMap; @@ -27,8 +28,9 @@ class BoilerpipeExtractorRepository { - public static final Logger LOG = LoggerFactory.getLogger(BoilerpipeExtractorRepository.class); - public static final WeakHashMap extractorRepository = new WeakHashMap(); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); + public static final WeakHashMap extractorRepository = new WeakHashMap(); /** * Returns an instance of the specified extractor diff --git a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java index 9da6160f1a..e5b593cea0 100644 --- a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java +++ b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.parse.tika; +import java.lang.invoke.MethodHandles; import org.apache.avro.util.Utf8; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -62,7 +63,8 @@ public class TikaParser implements org.apache.nutch.parse.Parser { - public static final Logger LOG = LoggerFactory.getLogger(TikaParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static Collection FIELDS = new HashSet(); diff --git a/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java b/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java index 06bea9f1ad..9fb14c7f34 100644 --- a/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java +++ b/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.tika; +import java.lang.invoke.MethodHandles; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.CompositeParser; import org.junit.Test; @@ -186,8 +187,8 @@ public class DOMContentUtilsTest { private static Configuration conf; private static DOMContentUtils utils = null; - public static final Logger Logger = LoggerFactory - .getLogger(DOMContentUtilsTest.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public DOMContentUtilsTest(String name) { } @@ -279,13 +280,13 @@ private static boolean equalsIgnoreWhitespace(String s1, String s2) { while (st1.hasMoreTokens()) { if (!st2.hasMoreTokens()) { - Logger.info("st1+ '" + st1.nextToken() + "'"); + LOG.info("st1+ '" + st1.nextToken() + "'"); return false; } String st1Token = st1.nextToken(); String st2Token = st2.nextToken(); if (!st1Token.equals(st2Token)) { - Logger.info("st1:'" + st1Token + "' != st2:'" + st2Token + "'"); + LOG.info("st1:'" + st1Token + "' != st2:'" + st2Token + "'"); return false; } } diff --git a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java index dc8f224063..bc6878bb7e 100644 --- a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java +++ b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.parse.zip; +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Properties; @@ -41,7 +42,8 @@ */ public class ZipParser implements Parser { - private static final Logger LOG = LoggerFactory.getLogger(ZipParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; /** Creates a new instance of ZipParser */ diff --git a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java index 0336e13385..618ff94008 100644 --- a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java +++ b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java @@ -18,6 +18,7 @@ package org.apache.nutch.parse.zip; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.io.InputStream; import java.util.List; @@ -42,8 +43,6 @@ import org.apache.nutch.protocol.Content; import org.apache.nutch.util.MimeUtil; - - /** * * @author Rohit Kulkarni & Ashish Vaidya @@ -52,8 +51,9 @@ public class ZipTextExtractor { /** Get the MimeTypes resolver instance. */ private MimeUtil MIME; - - public static final Logger LOG = LoggerFactory.getLogger(ZipTextExtractor.class); + + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java b/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java index 20ba474aa4..fc42f3e25b 100644 --- a/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java +++ b/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.file; +import java.lang.invoke.MethodHandles; import crawlercommons.robots.BaseRobotRules; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.net.protocols.Response; @@ -41,7 +42,8 @@ */ public class File implements Protocol { - public static final Logger LOG = LoggerFactory.getLogger(File.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Collection FIELDS = new HashSet(); diff --git a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java index 9f3f9c5e35..76735a1eef 100644 --- a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java +++ b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.ftp; +import java.lang.invoke.MethodHandles; import crawlercommons.robots.BaseRobotRules; import org.apache.commons.net.ftp.FTPFileEntryParser; import org.apache.hadoop.conf.Configuration; @@ -43,7 +44,8 @@ */ public class Ftp implements Protocol { - public static final Logger LOG = LoggerFactory.getLogger(Ftp.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Collection FIELDS = new HashSet(); diff --git a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java index 4ce9a83583..903f067413 100644 --- a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java +++ b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.ftp; +import java.lang.invoke.MethodHandles; import crawlercommons.robots.BaseRobotRules; import crawlercommons.robots.SimpleRobotRules; import org.apache.hadoop.conf.Configuration; @@ -39,8 +40,8 @@ public class FtpRobotRulesParser extends RobotRulesParser { private static final String CONTENT_TYPE = "text/plain"; - public static final Logger LOG = LoggerFactory - .getLogger(FtpRobotRulesParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); FtpRobotRulesParser() { } diff --git a/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java b/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java index a518cd1f62..694cddf52c 100755 --- a/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java +++ b/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.http; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.net.URL; import java.util.Collection; @@ -33,7 +34,8 @@ public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Collection FIELDS = new HashSet(); diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java index 92baf298e9..ca24b59c7a 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java @@ -25,6 +25,7 @@ package org.apache.nutch.protocol.httpclient; +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; @@ -46,7 +47,7 @@ public class DummySSLProtocolSocketFactory implements /** Logger object for this class. */ private static final Logger LOG = LoggerFactory - .getLogger(DummySSLProtocolSocketFactory.class); + .getLogger(MethodHandles.lookup().lookupClass()); private SSLContext sslcontext = null; diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java index 69abab75a0..336f750717 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.httpclient; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.InputStream; import java.io.IOException; import java.net.URL; @@ -67,7 +68,8 @@ */ public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager(); diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java index eada2062ea..0409e954b0 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.httpclient; // JDK imports +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -53,8 +54,8 @@ public class HttpAuthenticationFactory implements Configurable { */ public static final String WWW_AUTHENTICATE = "WWW-Authenticate"; - public static final Logger LOG = LoggerFactory - .getLogger(HttpAuthenticationFactory.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static Map auths = new TreeMap(); diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java index cb09e697a1..be4b204b34 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.httpclient; // JDK imports +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -44,8 +45,8 @@ public class HttpBasicAuthentication implements HttpAuthentication, Configurable { - public static final Logger LOG = LoggerFactory - .getLogger(HttpBasicAuthentication.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static Pattern basic = Pattern .compile("[bB][aA][sS][iI][cC] [rR][eE][aA][lL][mM]=\"(\\w*)\""); diff --git a/src/plugin/protocol-sftp/src/java/org/apache/nutch/protocol/sftp/Sftp.java b/src/plugin/protocol-sftp/src/java/org/apache/nutch/protocol/sftp/Sftp.java index 2dbdd48899..94bc68c0d7 100644 --- a/src/plugin/protocol-sftp/src/java/org/apache/nutch/protocol/sftp/Sftp.java +++ b/src/plugin/protocol-sftp/src/java/org/apache/nutch/protocol/sftp/Sftp.java @@ -18,6 +18,7 @@ package org.apache.nutch.protocol.sftp; //JDK imports +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -61,7 +62,8 @@ */ public class Sftp implements Protocol { - private static final Logger logger = LoggerFactory.getLogger(Sftp.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final Map> channelSftpByHostMap = new Hashtable>(); private Configuration configuration; @@ -97,7 +99,7 @@ public ProtocolOutput getProtocolOutput(String url, WebPage page) { return po; } } catch (MalformedURLException e) { - logger.error("Bad URL String: " + urlStr, e); + LOG.error("Bad URL String: " + urlStr, e); return null; } catch (InterruptedException e) { return null; @@ -106,14 +108,14 @@ public ProtocolOutput getProtocolOutput(String url, WebPage page) { } catch (IOException e) { return null; } catch (Exception e) { - logger.error("Unknown Exception in getProtocolOutput()", e); + LOG.error("Unknown Exception in getProtocolOutput()", e); return null; } finally { if (channelSftp != null) { try { putChannelSftp(sUrl, channelSftp); } catch (InterruptedException e) { - logger.error("Cannot return ChannelSftp object to Queue", e); + LOG.error("Cannot return ChannelSftp object to Queue", e); } } } @@ -130,7 +132,7 @@ private ChannelSftp getChannelSftp(URL url) throws InterruptedException { ChannelSftp cSftp = queue.take(); return cSftp; } catch (InterruptedException e) { - logger + LOG .error("Wait for getChannelSftp() interrupted for host: " + host, e); throw e; } @@ -147,7 +149,7 @@ private void putChannelSftp(URL url, ChannelSftp cSftp) try { queue.put(cSftp); } catch (InterruptedException e) { - logger + LOG .error("Wait for putChannelSftp() interrupted for host: " + host, e); throw e; } @@ -164,13 +166,13 @@ private ProtocolOutput getFileProtocolOutput(URL url, bytes = new byte[size]; iStream.read(bytes); } catch (SftpException e) { - logger + LOG .error( "SftpException in getFileProtocolOutput(), file: " + url.getFile(), e); throw e; } catch (IOException e) { - logger.error( + LOG.error( "IOException in getFileProtocolOutput(), file: " + url.getFile(), e); throw e; } finally { @@ -227,7 +229,7 @@ private ProtocolOutput getDirectoryProtocolOutput(URL url, ProtocolOutput po = new ProtocolOutput(content); return po; } catch (SftpException e) { - logger.error("SftpException in getDirectoryProtocolOutput()", e); + LOG.error("SftpException in getDirectoryProtocolOutput()", e); throw e; } } @@ -268,7 +270,7 @@ public void setConf(Configuration arg0) { try { session = jsch.getSession(user, server, port); } catch (JSchException e) { - logger.error("Cannot create JSch session for user: " + user + LOG.error("Cannot create JSch session for user: " + user + ", host: " + server + ", port: " + port); return; } @@ -285,7 +287,7 @@ public void setConf(Configuration arg0) { cSftp = (ChannelSftp) session.openChannel("sftp"); cSftp.connect(); } catch (JSchException e) { - logger.error("Cannot connect to JSch session for user: " + user + LOG.error("Cannot connect to JSch session for user: " + user + ", host: " + server + ", port: " + port); return; } @@ -295,7 +297,7 @@ public void setConf(Configuration arg0) { try { queue.put(cSftp); } catch (InterruptedException e) { - logger.error("Interrupted during setConf()", e); + LOG.error("Interrupted during setConf()", e); return; } channelSftpByHostMap.put(server, queue); diff --git a/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java b/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java index 1e07e6adc2..6b7513727b 100644 --- a/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java +++ b/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java @@ -17,6 +17,7 @@ package org.apache.nutch.scoring.opic; +import java.lang.invoke.MethodHandles; import org.apache.avro.util.Utf8; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.indexer.NutchDocument; @@ -47,8 +48,8 @@ */ public class OPICScoringFilter implements ScoringFilter { - private final static Logger LOG = LoggerFactory - .getLogger(OPICScoringFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final static Utf8 CASH_KEY = new Utf8("_csh_"); diff --git a/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java b/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java index c905411091..f422daa93b 100644 --- a/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java +++ b/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.collection; +import java.lang.invoke.MethodHandles; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -47,7 +48,8 @@ public class CollectionManager extends Configured { public static final String DEFAULT_FILE_NAME = "subcollections.xml"; - static final Logger LOG = LoggerFactory.getLogger(CollectionManager.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); transient Map collectionMap = new HashMap(); diff --git a/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java b/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java index edc706ebf4..52c1022816 100644 --- a/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java +++ b/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexer.subcollection; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; @@ -50,8 +51,8 @@ public SubcollectionIndexingFilter(Configuration conf) { /** * Logger */ - public static final Logger LOG = LoggerFactory - .getLogger(SubcollectionIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * "Mark" document to be a part of subcollection diff --git a/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java b/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java index 02b80f30df..b247f9ed14 100644 --- a/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java +++ b/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexer.tld; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -38,8 +39,8 @@ * @author Enis Soztutar <enis.soz.nutch@gmail.com> */ public class TLDIndexingFilter implements IndexingFilter { - public static final Logger LOG = LoggerFactory - .getLogger(TLDIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; diff --git a/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java b/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java index 5b7d5816cd..1e984b34a4 100644 --- a/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java +++ b/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.urlfilter.domain; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; @@ -78,7 +79,7 @@ public class DomainURLFilter implements URLFilter { private static final Logger LOG = LoggerFactory - .getLogger(DomainURLFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); // read in attribute "file" of this plugin. private static String attributeFile = null; diff --git a/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java b/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java index 6e779ddf4d..8e23dc32d1 100644 --- a/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java +++ b/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.urlfilter.domain; +import java.lang.invoke.MethodHandles; import org.junit.Test; import static org.junit.Assert.*; @@ -26,8 +27,8 @@ public class TestDomainURLFilter { - protected static final Logger LOG = LoggerFactory - .getLogger(TestDomainURLFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final static String SEPARATOR = System.getProperty("file.separator"); private final static String SAMPLES = System.getProperty("test.data", "."); diff --git a/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java b/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java index 75ece12c48..224d09260b 100644 --- a/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java +++ b/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java @@ -19,6 +19,7 @@ package org.apache.nutch.urlfilter.prefix; +import java.lang.invoke.MethodHandles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +55,7 @@ public class PrefixURLFilter implements URLFilter { private static final Logger LOG = LoggerFactory - .getLogger(PrefixURLFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); // read in attribute "file" of this plugin. private static String attributeFile = null; diff --git a/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java b/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java index ccad47d4e8..47987abd54 100644 --- a/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java +++ b/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java @@ -17,6 +17,7 @@ package org.apache.nutch.urlfilter.suffix; +import java.lang.invoke.MethodHandles; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.net.*; @@ -129,7 +130,7 @@ public class SuffixURLFilter implements URLFilter { private static final Logger LOG = LoggerFactory - .getLogger(SuffixURLFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); // read in attribute "file" of this plugin. private String attributeFile = null; diff --git a/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java b/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java index b64829321a..e17b19a773 100644 --- a/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java +++ b/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java @@ -17,6 +17,7 @@ package org.apache.nutch.net.urlnormalizer.basic; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -46,8 +47,8 @@ * */ public class BasicURLNormalizer extends Configured implements URLNormalizer { - public static final Logger LOG = LoggerFactory - .getLogger(BasicURLNormalizer.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Pattern to detect whether a URL path could be normalized. Contains one of diff --git a/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java b/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java index 66f7a1b363..5cabfd08a2 100644 --- a/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java +++ b/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java @@ -17,6 +17,7 @@ package org.apache.nutch.net.urlnormalizer.regex; +import java.lang.invoke.MethodHandles; import java.io.FileReader; import java.io.IOException; import java.io.Reader; @@ -70,7 +71,7 @@ public class RegexURLNormalizer extends Configured implements URLNormalizer { private static final Logger LOG = LoggerFactory - .getLogger(RegexURLNormalizer.class); + .getLogger(MethodHandles.lookup().lookupClass()); /** * Class which holds a compiled pattern and its corresponding substition diff --git a/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java b/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java index 128ecdcbbf..47a09387bd 100644 --- a/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java +++ b/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java @@ -17,6 +17,7 @@ package org.apache.nutch.net.urlnormalizer.regex; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.File; import java.io.FileFilter; @@ -42,7 +43,7 @@ /** Unit tests for RegexUrlNormalizer. */ public class TestRegexURLNormalizer { private static final Logger LOG = LoggerFactory - .getLogger(TestRegexURLNormalizer.class); + .getLogger(MethodHandles.lookup().lookupClass()); private RegexURLNormalizer normalizer; private Configuration conf; diff --git a/src/test/org/apache/nutch/fetcher/TestFetcher.java b/src/test/org/apache/nutch/fetcher/TestFetcher.java index 9d62d50a6d..cd8cb2dcd5 100644 --- a/src/test/org/apache/nutch/fetcher/TestFetcher.java +++ b/src/test/org/apache/nutch/fetcher/TestFetcher.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.fetcher; +import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; @@ -53,7 +54,8 @@ */ public class TestFetcher extends AbstractNutchTest { - private static final Logger LOG = LoggerFactory.getLogger(AbstractNutchTest.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); final static Path testdir = new Path("build/test/fetch-test"); Path urlPath;