http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java b/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java index 39b8d95..9277991 100644 --- a/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java +++ b/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java @@ -17,6 +17,7 @@ package org.apache.nutch.tools.arc; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map.Entry; @@ -75,8 +76,8 @@ import org.apache.nutch.util.TimingUtil; public class ArcSegmentCreator extends Configured implements Tool, Mapper<Text, BytesWritable, Text, NutchWritable> { - public static final Logger LOG = LoggerFactory - .getLogger(ArcSegmentCreator.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static final String URL_VERSION = "arc.url.version"; private JobConf jobConf; private URLFilters urlFilters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/warc/WARCExporter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/tools/warc/WARCExporter.java b/src/java/org/apache/nutch/tools/warc/WARCExporter.java index 2e50105..4e8418f 100644 --- a/src/java/org/apache/nutch/tools/warc/WARCExporter.java +++ b/src/java/org/apache/nutch/tools/warc/WARCExporter.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.DataInput; import java.io.DataInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URI; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -78,7 +79,8 @@ import com.martinkl.warc.mapred.WARCOutputFormat; public class WARCExporter extends Configured implements Tool { - public static Logger LOG = LoggerFactory.getLogger(WARCExporter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final String CRLF = "\r\n"; private static final byte[] CRLF_BYTES = { 13, 10 }; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/CrawlCompletionStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/CrawlCompletionStats.java b/src/java/org/apache/nutch/util/CrawlCompletionStats.java index 8aafe59..4920fbf 100644 --- a/src/java/org/apache/nutch/util/CrawlCompletionStats.java +++ b/src/java/org/apache/nutch/util/CrawlCompletionStats.java @@ -19,6 +19,7 @@ package org.apache.nutch.util; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.text.SimpleDateFormat; import org.slf4j.Logger; @@ -62,7 +63,7 @@ import org.apache.commons.cli.MissingOptionException; public class CrawlCompletionStats extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(CrawlCompletionStats.class); + .getLogger(MethodHandles.lookup().lookupClass()); private static final int MODE_HOST = 1; private static final int MODE_DOMAIN = 2; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DeflateUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/DeflateUtils.java b/src/java/org/apache/nutch/util/DeflateUtils.java index 5863522..a7e7e32 100644 --- a/src/java/org/apache/nutch/util/DeflateUtils.java +++ b/src/java/org/apache/nutch/util/DeflateUtils.java @@ -19,6 +19,7 @@ package org.apache.nutch.util; 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 @@ import org.slf4j.LoggerFactory; */ 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DomUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/DomUtil.java b/src/java/org/apache/nutch/util/DomUtil.java index 9595bf4..e93477a 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.IOException; 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 @@ import org.slf4j.LoggerFactory; 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 http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DumpFileUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/DumpFileUtil.java b/src/java/org/apache/nutch/util/DumpFileUtil.java index 9ed3e75..be9ec87 100644 --- a/src/java/org/apache/nutch/util/DumpFileUtil.java +++ b/src/java/org/apache/nutch/util/DumpFileUtil.java @@ -26,11 +26,12 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Map; public class DumpFileUtil { - private static final Logger LOG = LoggerFactory.getLogger(DumpFileUtil.class - .getName()); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private final static String DIR_PATTERN = "%s/%s/%s"; private final static String FILENAME_PATTERN = "%s_%s.%s"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/EncodingDetector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/EncodingDetector.java b/src/java/org/apache/nutch/util/EncodingDetector.java index 4e62dd3..87fbc21 100644 --- a/src/java/org/apache/nutch/util/EncodingDetector.java +++ b/src/java/org/apache/nutch/util/EncodingDetector.java @@ -20,6 +20,7 @@ import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.HashMap; @@ -101,8 +102,8 @@ public class EncodingDetector { } } - 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/GZIPUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/GZIPUtils.java b/src/java/org/apache/nutch/util/GZIPUtils.java index 63b10e2..6a6a984 100644 --- a/src/java/org/apache/nutch/util/GZIPUtils.java +++ b/src/java/org/apache/nutch/util/GZIPUtils.java @@ -20,6 +20,7 @@ package org.apache.nutch.util; 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 @@ import org.slf4j.LoggerFactory; */ 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/JexlUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/JexlUtil.java b/src/java/org/apache/nutch/util/JexlUtil.java index 656a458..9709094 100644 --- a/src/java/org/apache/nutch/util/JexlUtil.java +++ b/src/java/org/apache/nutch/util/JexlUtil.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.util; +import java.lang.invoke.MethodHandles; import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory; */ public class JexlUtil { - public static final Logger LOG = LoggerFactory.getLogger(JexlUtil.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/MimeUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/MimeUtil.java b/src/java/org/apache/nutch/util/MimeUtil.java index a73187b..63ef583 100644 --- a/src/java/org/apache/nutch/util/MimeUtil.java +++ b/src/java/org/apache/nutch/util/MimeUtil.java @@ -21,6 +21,7 @@ package org.apache.nutch.util; 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(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/ObjectCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/ObjectCache.java b/src/java/org/apache/nutch/util/ObjectCache.java index 0277ee6..34daf9e 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 @@ import org.apache.hadoop.conf.Configuration; 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<Configuration, ObjectCache> CACHE = new WeakHashMap<Configuration, ObjectCache>(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java b/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java index d26cbfc..a188606 100644 --- a/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java +++ b/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java @@ -19,6 +19,7 @@ package org.apache.nutch.util; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.text.SimpleDateFormat; import org.slf4j.Logger; @@ -61,7 +62,7 @@ import org.apache.nutch.metadata.Nutch; public class ProtocolStatusStatistics extends Configured implements Tool { private static final Logger LOG = LoggerFactory - .getLogger(ProtocolStatusStatistics.class); + .getLogger(MethodHandles.lookup().lookupClass()); private static final Text UNFETCHED_TEXT = new Text("UNFETCHED"); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainStatistics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/domain/DomainStatistics.java b/src/java/org/apache/nutch/util/domain/DomainStatistics.java index 6c1bd9e..af1c266 100644 --- a/src/java/org/apache/nutch/util/domain/DomainStatistics.java +++ b/src/java/org/apache/nutch/util/domain/DomainStatistics.java @@ -19,6 +19,7 @@ package org.apache.nutch.util.domain; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.text.SimpleDateFormat; import org.slf4j.Logger; @@ -48,7 +49,7 @@ import org.apache.nutch.util.URLUtil; 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"); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainSuffixes.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixes.java b/src/java/org/apache/nutch/util/domain/DomainSuffixes.java index 765457e..f2a2005 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 @@ import org.apache.hadoop.util.StringUtils; */ public class DomainSuffixes { private static final Logger LOG = LoggerFactory - .getLogger(DomainSuffixes.class); + .getLogger(MethodHandles.lookup().lookupClass()); private HashMap<String, DomainSuffix> domains = new HashMap<String, DomainSuffix>(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java b/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java index a2a60e2..ae88736 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 @@ package org.apache.nutch.util.domain; 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 @@ import org.xml.sax.SAXException; class DomainSuffixesReader { private static final Logger LOG = LoggerFactory - .getLogger(DomainSuffixesReader.class); + .getLogger(MethodHandles.lookup().lookupClass()); void read(DomainSuffixes tldEntries, InputStream input) throws IOException { try { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java ---------------------------------------------------------------------- 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 2482c06..6a4f2f0 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 @@ import com.google.common.collect.Lists; * */ 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 class CrawlingCycle { 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()); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java ---------------------------------------------------------------------- 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 e1eefc2..9e4d1a8 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 @@ package org.apache.nutch.webui.client.impl; 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 @@ import org.slf4j.LoggerFactory; * */ 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 class RemoteCommandExecutor { .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)); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java ---------------------------------------------------------------------- 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 7bb133b..09798ea 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 @@ import com.j256.ormlite.dao.Dao; @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<Crawl, Long> crawlDao; @@ -74,7 +76,7 @@ public class CrawlServiceImpl implements CrawlService, CrawlingCycleListener { } catch (Exception e) { crawl.setStatus(CrawlStatus.ERROR); saveCrawl(crawl); - log.error("exception occured", e); + LOG.error("exception occured", e); } } http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java ---------------------------------------------------------------------- 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 db989cf..8e34866 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 @@ import com.sun.jersey.api.client.ClientHandlerException; @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 class NutchServiceImpl implements NutchService { return ConnectionStatus.DISCONNECTED; } - logger.error("Cannot connect to nutch server!", e); + LOG.error("Cannot connect to nutch server!", e); } return null; } http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java ---------------------------------------------------------------------- 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 e7c55c4..fea2eab 100644 --- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java +++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java @@ -35,14 +35,15 @@ import org.apache.hadoop.conf.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; import java.util.*; import java.net.URL; import java.net.MalformedURLException; /** 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"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java ---------------------------------------------------------------------- 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 1fa951e..57de6f6 100644 --- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java +++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java @@ -27,6 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; +import java.lang.invoke.MethodHandles; import java.io.*; import java.net.*; import javax.xml.parsers.*; @@ -35,7 +36,8 @@ import org.w3c.dom.*; /** Adds metadata identifying the Creative Commons license used, if any. */ public class CCParseFilter implements HtmlParseFilter { - 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 { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java ---------------------------------------------------------------------- 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 936c885..0936187 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; @@ -79,7 +80,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(FeedParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java ---------------------------------------------------------------------- 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 36c8739..f5d4807 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; @@ -58,8 +59,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()); /** * Calls the {@link FeedParser} on a sample RSS file and checks that there are http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java ---------------------------------------------------------------------- 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 6c9b834..4bee174 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 java.util.HashSet; import org.apache.hadoop.conf.Configuration; @@ -37,8 +38,8 @@ import org.slf4j.LoggerFactory; */ 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java ---------------------------------------------------------------------- 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 8584fa8..5e1233b 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 @@ -33,6 +33,7 @@ import org.apache.hadoop.io.Text; import org.apache.nutch.crawl.CrawlDatum; import org.apache.nutch.crawl.Inlinks; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.Date; @@ -48,8 +49,8 @@ import org.apache.hadoop.conf.Configuration; * {@code indexer.max.content.length} in nutch-default.xml. */ 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 int MAX_CONTENT_LENGTH; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java ---------------------------------------------------------------------- diff --git a/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java b/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java index f515f1f..6b71443 100644 --- a/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java +++ b/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexer.geoip; +import java.lang.invoke.MethodHandles; import java.io.File; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -114,7 +115,7 @@ import com.maxmind.geoip2.WebServiceClient; public class GeoIPIndexingFilter implements IndexingFilter { private static final Logger LOG = LoggerFactory - .getLogger(GeoIPIndexingFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java ---------------------------------------------------------------------- diff --git a/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java b/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java index 975df66..76471cb 100644 --- a/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java +++ b/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java @@ -26,8 +26,11 @@ import org.apache.nutch.indexer.IndexingFilter; import org.apache.nutch.indexer.NutchDocument; import org.apache.nutch.parse.Outlink; import org.apache.nutch.parse.Parse; + +import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.util.HashSet; @@ -69,8 +72,8 @@ public class LinksIndexingFilter implements IndexingFilter { public final static String LINKS_INLINKS_HOST = "index.links.inlinks.host.ignore"; public final static String LINKS_ONLY_HOSTS = "index.links.hosts.only"; - public final static org.slf4j.Logger LOG = LoggerFactory - .getLogger(LinksIndexingFilter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; private boolean filterOutlinks; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java ---------------------------------------------------------------------- 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 6e64ede..53fe344 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 @@ -42,6 +42,7 @@ import org.apache.hadoop.io.Writable; import java.text.ParseException; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.util.Date; @@ -68,8 +69,8 @@ import org.apache.commons.lang.time.DateUtils; */ 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java ---------------------------------------------------------------------- diff --git a/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java b/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java index b6f1a9c..7b3296b 100644 --- a/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java +++ b/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java @@ -17,6 +17,7 @@ package org.apache.nutch.indexwriter.cloudsearch; +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -59,8 +60,8 @@ import com.amazonaws.util.json.JSONObject; * Writes documents to CloudSearch. */ public class CloudSearchIndexWriter implements IndexWriter { - public static final Logger LOG = LoggerFactory - .getLogger(CloudSearchIndexWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static final int MAX_SIZE_BATCH_BYTES = 5242880; private static final int MAX_SIZE_DOC_BYTES = 1048576; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java ---------------------------------------------------------------------- diff --git a/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java b/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java index b27ba14..0930707 100644 --- a/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java +++ b/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.indexwriter.dummy; +import java.lang.invoke.MethodHandles; import java.io.BufferedWriter; import java.io.IOException; import java.io.FileWriter; @@ -35,8 +36,8 @@ import org.slf4j.LoggerFactory; * and add. */ public class DummyIndexWriter implements IndexWriter { - public static final Logger LOG = LoggerFactory - .getLogger(DummyIndexWriter.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration config; private Writer writer; private boolean delete = false; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java ---------------------------------------------------------------------- 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 00b96f1..dfcc01c 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 @@ package org.apache.nutch.indexwriter.elastic; import static org.elasticsearch.node.NodeBuilder.nodeBuilder; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.net.InetAddress; @@ -52,7 +53,8 @@ import org.slf4j.LoggerFactory; * Sends NutchDocuments to a configured Elasticsearch index. */ 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_PORT = 9300; private static final int DEFAULT_MAX_BULK_DOCS = 250; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java ---------------------------------------------------------------------- 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 0d9e2e0..d444364 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.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -52,8 +53,8 @@ import java.net.URLDecoder; 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 List<SolrClient> solrClients; private SolrMappingReader solrMapping; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java ---------------------------------------------------------------------- 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 19ffa6f..9b9ec42 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.InputSource; 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java ---------------------------------------------------------------------- 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 eec0080..d732b95 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 @@ -16,9 +16,10 @@ */ package org.apache.nutch.indexwriter.solr; - +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.mapred.JobConf; @@ -30,7 +31,8 @@ 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()); /** * http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java ---------------------------------------------------------------------- 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 cb8f8c1..133164b 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 @@ -17,6 +17,7 @@ package org.apache.nutch.analysis.lang; // JDK imports +import java.lang.invoke.MethodHandles; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -41,8 +42,8 @@ import org.w3c.dom.Node; public class HTMLLanguageParser implements HtmlParseFilter { - public static final Logger LOG = LoggerFactory - .getLogger(HTMLLanguageParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private int detect = -1, identify = -1; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java ---------------------------------------------------------------------- diff --git a/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java b/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java index 064894e..cc0096c 100644 --- a/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java +++ b/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.htmlunit; +import java.lang.invoke.MethodHandles; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -43,7 +44,8 @@ import com.gargoylesoftware.htmlunit.WebClient; public class HtmlUnitWebDriver extends HtmlUnitDriver { - private static final Logger LOG = LoggerFactory.getLogger(HtmlUnitWebDriver.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static boolean enableJavascript; private static boolean enableCss; private static boolean enableRedirect; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java ---------------------------------------------------------------------- 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 90b256a..41b63e3 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; @@ -28,6 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; + // Logging imports import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -94,10 +96,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; @@ -408,8 +411,8 @@ public abstract class HttpBase implements Protocol { 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)!"); } } @@ -461,8 +464,8 @@ public abstract class HttpBase implements Protocol { public byte[] processGzipEncoded(byte[] compressed, URL url) throws IOException { - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("uncompressing...."); + if (LOG.isTraceEnabled()) { + LOG.trace("uncompressing...."); } // content can be empty (i.e. redirection) in which case @@ -480,8 +483,8 @@ public abstract class HttpBase implements Protocol { 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); } @@ -496,8 +499,8 @@ public abstract class HttpBase implements Protocol { if (compressed.length == 0) return compressed; - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("inflating...."); + if (LOG.isTraceEnabled()) { + LOG.trace("inflating...."); } byte[] content; @@ -510,8 +513,8 @@ public abstract class HttpBase implements Protocol { 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); } http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java ---------------------------------------------------------------------- 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 494ae0d..2359139 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 java.net.URL; import java.util.List; @@ -39,8 +40,8 @@ import crawlercommons.robots.BaseRobotRules; */ 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() { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java ---------------------------------------------------------------------- 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 f5cc081..ca3ea0f 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; @@ -63,8 +64,8 @@ import org.apache.nutch.util.URLUtil; 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<RegexRule> rules; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java ---------------------------------------------------------------------- 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 0b58231..fec01ad 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; @@ -39,8 +40,8 @@ import org.apache.nutch.net.URLFilter; 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", "."); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java ---------------------------------------------------------------------- diff --git a/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java b/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java index 86692ae..0c4f497 100644 --- a/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java +++ b/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.selenium; +import java.lang.invoke.MethodHandles; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -50,7 +51,8 @@ import com.opera.core.systems.OperaDriver; public class HttpWebClient { - private static final Logger LOG = LoggerFactory.getLogger(HttpWebClient.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public static ThreadLocal<WebDriver> threadWebDriver = new ThreadLocal<WebDriver>() { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java ---------------------------------------------------------------------- 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 9176a1e..a4ebc8a 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.util.Iterator; @@ -51,7 +52,8 @@ import org.apache.hadoop.conf.Configuration; */ public class RelTagParser implements HtmlParseFilter { - public final static Logger LOG = LoggerFactory.getLogger(RelTagParser.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public final static String REL_TAG = "Rel-Tag"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java ---------------------------------------------------------------------- diff --git a/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java b/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java index 494d888..e8aa41b 100644 --- a/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java +++ b/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java @@ -58,6 +58,7 @@ import org.apache.nutch.util.PrefixStringMatcher; import org.apache.nutch.util.TrieStringMatcher; import org.apache.tika.Tika; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -75,7 +76,7 @@ public class MimeTypeIndexingFilter implements IndexingFilter { public static final String MIMEFILTER_REGEX_FILE = "mimetype.filter.file"; private static final Logger LOG = LoggerFactory - .getLogger(MimeTypeIndexingFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); private MimeUtil MIME; private Tika tika = new Tika(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java ---------------------------------------------------------------------- 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 94d9b32..a4c14a9 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 @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; import java.util.Hashtable; +import java.lang.invoke.MethodHandles; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.nio.charset.Charset; @@ -50,8 +51,8 @@ import java.nio.charset.Charset; 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java ---------------------------------------------------------------------- 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 4d043ba..7f60939 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.util.ArrayList; import java.util.Map; import java.net.URL; @@ -40,8 +41,8 @@ import org.apache.nutch.parse.*; import org.apache.nutch.util.*; 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. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java ---------------------------------------------------------------------- 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 7099f50..0b39206 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.charset.Charset; import org.apache.hadoop.conf.Configuration; @@ -33,8 +34,8 @@ import org.slf4j.LoggerFactory; 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 = "<ul>\n <li>français\n <li>español\n <li>ÑÑÑÑкий ÑзÑк\n <li>ÄeÅ¡tina\n <li>ελληνικά\n</ul>"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java ---------------------------------------------------------------------- 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 8c95372..7f6d105 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; @@ -61,7 +62,8 @@ import org.w3c.dom.NodeList; * Parts of the code come from OutlinkExtractor.java */ public class JSParseFilter implements HtmlParseFilter, 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java ---------------------------------------------------------------------- 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 9251366..a81f4f1 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 @@ -17,6 +17,7 @@ package org.apache.nutch.parse.swf; +import java.lang.invoke.MethodHandles; import java.io.FileInputStream; import java.io.IOException; import java.util.*; @@ -44,8 +45,8 @@ import com.anotherbigidea.io.InStream; * distribution. */ 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java ---------------------------------------------------------------------- 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 5d7eca9..49dc378 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 java.io.ByteArrayInputStream; import java.net.MalformedURLException; import java.net.URL; @@ -60,7 +61,8 @@ import org.xml.sax.ContentHandler; 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 Configuration conf; private TikaConfig tikaConfig = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java ---------------------------------------------------------------------- diff --git a/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java b/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java index c9394dc..cdfe2b4 100644 --- a/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java +++ b/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java @@ -17,6 +17,8 @@ package org.apache.nutch.tika; +import java.lang.invoke.MethodHandles; + import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -52,8 +54,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()); /** * <p> http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java ---------------------------------------------------------------------- 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 f441fd0..25a52a1 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.File; import java.io.FileInputStream; @@ -46,7 +47,8 @@ import org.apache.hadoop.conf.Configuration; */ 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 */ http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java ---------------------------------------------------------------------- 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 b454727..6ad42e6 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; @@ -49,8 +50,8 @@ import org.apache.tika.Tika; */ public class ZipTextExtractor { - public static final Logger LOG = LoggerFactory - .getLogger(ZipTextExtractor.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private Configuration conf; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java ---------------------------------------------------------------------- diff --git a/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java b/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java index 30810ae..05ea5c9 100644 --- a/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java +++ b/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java @@ -30,6 +30,7 @@ import org.apache.nutch.parse.Parse; import org.apache.nutch.parse.ParseResult; import org.apache.nutch.protocol.Content; +import java.lang.invoke.MethodHandles; import java.io.Reader; import java.io.BufferedReader; import java.io.IOException; @@ -47,7 +48,7 @@ import java.util.ArrayList; public class NaiveBayesParseFilter implements HtmlParseFilter { private static final Logger LOG = LoggerFactory - .getLogger(NaiveBayesParseFilter.class); + .getLogger(MethodHandles.lookup().lookupClass()); public static final String TRAINFILE_MODELFILTER = "parsefilter.naivebayes.trainfile"; public static final String DICTFILE_MODELFILTER = "parsefilter.naivebayes.wordlist"; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java ---------------------------------------------------------------------- diff --git a/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java b/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java index 0752c91..6955166 100644 --- a/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java +++ b/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java @@ -17,6 +17,7 @@ package org.apache.nutch.parsefilter.regex; +import java.lang.invoke.MethodHandles; import java.io.BufferedReader; import java.io.IOException; import java.io.FileReader; @@ -48,8 +49,9 @@ import org.w3c.dom.*; * extracted text, a configurable field is set to true. */ public class RegexParseFilter implements HtmlParseFilter { - - private static final Logger LOG = LoggerFactory.getLogger(RegexParseFilter.class); + + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static String attributeFile = null; private String regexFile = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java ---------------------------------------------------------------------- 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 2efb140..8a415b6 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 @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.file; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.List; @@ -48,7 +49,8 @@ import crawlercommons.robots.BaseRobotRules; */ public class File implements Protocol { - public static final Logger LOG = LoggerFactory.getLogger(File.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); static final int MAX_REDIRECTS = 5; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java ---------------------------------------------------------------------- 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 a4051ed..84aa823 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 @@ -35,6 +35,7 @@ import org.apache.nutch.protocol.ProtocolOutput; import org.apache.nutch.protocol.ProtocolStatus; import crawlercommons.robots.BaseRobotRules; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.List; import java.io.IOException; @@ -49,7 +50,8 @@ import java.io.IOException; */ 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 int BUFFER_SIZE = 16384; // 16*1024 = 16384 http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java ---------------------------------------------------------------------- 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 482acdf..7b944e7 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 java.net.URL; import java.util.List; @@ -42,8 +43,8 @@ import crawlercommons.robots.SimpleRobotRules; 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() { } http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java b/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java index c40ed69..cd6d742 100644 --- a/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java +++ b/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.htmlunit; +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.net.URL; @@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory; public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Default constructor. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java ---------------------------------------------------------------------- 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 56f9f4f..bb4ab61 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; @@ -36,7 +37,8 @@ import org.apache.nutch.util.NutchConfiguration; public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); /** * Public default constructor. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java ---------------------------------------------------------------------- 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 afcf24a..a49b3e3 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; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java index b5509cc..2102f80 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java @@ -20,6 +20,7 @@ package org.apache.nutch.protocol.httpclient; +import java.lang.invoke.MethodHandles; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; @@ -37,7 +38,7 @@ public class DummyX509TrustManager implements X509TrustManager { /** Logger object for this class. */ private static final Logger LOG = LoggerFactory - .getLogger(DummyX509TrustManager.class); + .getLogger(MethodHandles.lookup().lookupClass()); /** * Constructor for DummyX509TrustManager. http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java ---------------------------------------------------------------------- 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 9b91180..0e1b4f9 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; @@ -85,7 +86,8 @@ import org.apache.nutch.util.NutchConfiguration; */ 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(); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java ---------------------------------------------------------------------- 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 064a6d0..9e064bb 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; @@ -50,8 +51,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 Configuration conf = null; http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java ---------------------------------------------------------------------- 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 0cc2de5..c5f3e31 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; @@ -45,8 +46,8 @@ import org.apache.hadoop.conf.Configurable; 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*)\""); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java index 2f36538..e7e96d3 100644 --- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java +++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.httpclient; +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.CookieHandler; @@ -45,8 +46,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class HttpFormAuthentication { - private static final Logger LOGGER = LoggerFactory - .getLogger(HttpFormAuthentication.class); + private static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); private static Map<String, String> defaultLoginHeaders = new HashMap<String, String>(); static { @@ -116,23 +117,23 @@ public class HttpFormAuthentication { setLoginHeader(post); // NUTCH-2280 - LOGGER.debug("FormAuth: set cookie policy"); + LOG.debug("FormAuth: set cookie policy"); this.setCookieParams(authConfigurer, post.getParams()); post.addParameters(params.toArray(new NameValuePair[0])); int rspCode = client.executeMethod(post); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("rspCode: " + rspCode); - LOGGER.debug("\nSending 'POST' request to URL : " + url); + if (LOG.isDebugEnabled()) { + LOG.debug("rspCode: " + rspCode); + LOG.debug("\nSending 'POST' request to URL : " + url); - LOGGER.debug("Post parameters : " + params); - LOGGER.debug("Response Code : " + rspCode); + LOG.debug("Post parameters : " + params); + LOG.debug("Response Code : " + rspCode); for (Header header : post.getRequestHeaders()) { - LOGGER.debug("Response headers : " + header); + LOG.debug("Response headers : " + header); } } String rst = IOUtils.toString(post.getResponseBodyAsStream()); - LOGGER.debug("login post result: " + rst); + LOG.debug("login post result: " + rst); } finally { if (post != null) { post.releaseConnection(); @@ -163,7 +164,7 @@ public class HttpFormAuthentication { String policy = formConfigurer.getCookiePolicy(); Object p = FieldUtils.readDeclaredStaticField(CookiePolicy.class, policy); if (null != p) { - LOGGER.debug("reflection of cookie value: " + p.toString()); + LOG.debug("reflection of cookie value: " + p.toString()); params.setParameter(HttpMethodParams.COOKIE_POLICY, p); } } @@ -207,12 +208,12 @@ public class HttpFormAuthentication { Document doc = Jsoup.parse(pageContent); Element loginform = doc.getElementById(authConfigurer.getLoginFormId()); if (loginform == null) { - LOGGER.debug("No form element found with 'id' = {}, trying 'name'.", + LOG.debug("No form element found with 'id' = {}, trying 'name'.", authConfigurer.getLoginFormId()); loginform = doc .select("form[name=" + authConfigurer.getLoginFormId() + "]").first(); if (loginform == null) { - LOGGER.debug("No form element found with 'name' = {}", + LOG.debug("No form element found with 'name' = {}", authConfigurer.getLoginFormId()); throw new IllegalArgumentException( "No form exists: " + authConfigurer.getLoginFormId()); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java index 9449fa1..14751ff 100644 --- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java +++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.interactiveselenium; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.net.URL; import org.apache.hadoop.conf.Configuration; @@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory; public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public Http() { super(LOG); http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java index f3c0f6f..2ca563a 100644 --- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java +++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java @@ -16,6 +16,8 @@ */ package org.apache.nutch.protocol.interactiveselenium; +import java.lang.invoke.MethodHandles; + import org.apache.hadoop.util.StringUtils; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -30,7 +32,7 @@ import org.slf4j.LoggerFactory; public class DefalultMultiInteractionHandler implements InteractiveSeleniumHandler { private static final Logger LOG = LoggerFactory - .getLogger(DefalultMultiInteractionHandler.class); + .getLogger(MethodHandles.lookup().lookupClass()); public String processDriver(WebDriver driver) { // loop and get multiple pages in this string http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java index e3423d5..50225c3 100644 --- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java +++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java @@ -16,6 +16,7 @@ */ package org.apache.nutch.protocol.interactiveselenium; +import java.lang.invoke.MethodHandles; import java.util.List; import org.apache.hadoop.conf.Configuration; @@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory; */ public class DefaultClickAllAjaxLinksHandler implements InteractiveSeleniumHandler { private static final Logger LOG = LoggerFactory - .getLogger(DefaultClickAllAjaxLinksHandler.class); + .getLogger(MethodHandles.lookup().lookupClass()); public String processDriver(WebDriver driver) { http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java ---------------------------------------------------------------------- diff --git a/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java b/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java index 7726bdf..41fd5b1 100644 --- a/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java +++ b/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java @@ -17,6 +17,7 @@ package org.apache.nutch.protocol.selenium; // JDK imports +import java.lang.invoke.MethodHandles; import java.io.IOException; import java.net.URL; import org.apache.hadoop.conf.Configuration; @@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory; public class Http extends HttpBase { - public static final Logger LOG = LoggerFactory.getLogger(Http.class); + protected static final Logger LOG = LoggerFactory + .getLogger(MethodHandles.lookup().lookupClass()); public Http() { super(LOG);
