You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by sn...@apache.org on 2017/01/19 22:07:58 UTC
[1/3] nutch git commit: NUTCH-2351 Logging with generic class name.
Repository: nutch
Updated Branches:
refs/heads/2.x 7d3e45f23 -> 54300a89e
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/indexer-elastic2/src/java/org/apache/nutch/indexwriter/elastic2/ElasticIndexWriter.java
----------------------------------------------------------------------
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 8b413d7..cb3366d 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 @@ package org.apache.nutch.indexwriter.elastic2;
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 @@ import org.slf4j.LoggerFactory;
/**
*/
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 793c2c9..22700d4 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 @@ import org.apache.solr.common.SolrInputDocument;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 0aa9a56..2e266df 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/1a84334c/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 ead34c2..e484083 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 @@ 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 {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 064cd8d..e18b012 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 @@ package org.apache.nutch.analysis.lang;
// 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 @@ import java.util.*;
*/
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 0a6121b..c79feb2 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 @@ 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)!");
}
}
@@ -439,8 +441,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....");
}
byte[] content;
@@ -453,8 +455,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);
}
@@ -464,8 +466,8 @@ public abstract class HttpBase implements Protocol {
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 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/1a84334c/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 bd64d76..2af6fa5 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 @@ import java.util.Locale;
*/
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/1a84334c/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 a1475a7..ff96480 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 @@ import org.apache.nutch.net.*;
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/1a84334c/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 ae4660f..f8acfa6 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 @@ 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/1a84334c/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 00fa30d..58e8f72 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 @@ import org.w3c.dom.NodeList;
*/
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 4264f6f..cebb63e 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 @@ 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/1a84334c/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 0527d5e..9088081 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.InputSource;
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.
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 f3dd0f6..9079f02 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 @@ import static org.junit.Assert.*;
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, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a, \u010de\u0161tina, \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac";
private static final String encodingTestBody = "<ul>\n <li>fran�ais\n <li>espa�ol\n <li>\u0440\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a\n <li>\u010de\u0161tina\n <li>\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac\n</ul>";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 a685844..5f8e4b1 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 @@ import org.w3c.dom.NodeList;
* @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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/parse-metatags/src/java/org/apache/nutch/parse/metatags/MetaTagsParser.java
----------------------------------------------------------------------
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 f61838c..6c51beb 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.util.Map.Entry;
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 @@ import org.w3c.dom.DocumentFragment;
*/
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 4fbcad3..6ebc241 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 @@ import com.anotherbigidea.io.InStream;
* @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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java
----------------------------------------------------------------------
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 de9768e..9c8b882 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 @@ import de.l3s.boilerpipe.extractors.*;
class BoilerpipeExtractorRepository {
- public static final Logger LOG = LoggerFactory.getLogger(BoilerpipeExtractorRepository.class);
- public static final WeakHashMap<String, BoilerpipeExtractor> extractorRepository = new WeakHashMap<String, BoilerpipeExtractor>();
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
+ public static final WeakHashMap<String, BoilerpipeExtractor> extractorRepository = new WeakHashMap<String, BoilerpipeExtractor>();
/**
* Returns an instance of the specified extractor
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 9da6160..e5b593c 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 @@ import java.util.HashSet;
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java
----------------------------------------------------------------------
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 06bea9f..9fb14c7 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 @@ public class DOMContentUtilsTest {
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;
}
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 dc8f224..bc6878b 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 @@ 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/1a84334c/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 0336e13..618ff94 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.parse.Outlink;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 20ba474..fc42f3e 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 @@ import java.util.HashSet;
*/
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 9f3f9c5..76735a1 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 @@ import java.nio.charset.StandardCharsets;
*/
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 4ce9a83..903f067 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 @@ import java.util.Locale;
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/1a84334c/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 a518cd1..694cddf 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 @@ 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 final Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 92baf29..ca24b59 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/1a84334c/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 69abab7..336f750 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 @@ 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/1a84334c/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 eada206..0409e95 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<Object, Object>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 cb09e69..be4b204 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 @@ 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/1a84334c/src/plugin/protocol-sftp/src/java/org/apache/nutch/protocol/sftp/Sftp.java
----------------------------------------------------------------------
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 2dbdd48..94bc68c 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 @@ import org.slf4j.LoggerFactory;
*/
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<String, BlockingQueue<ChannelSftp>> channelSftpByHostMap = new Hashtable<String, BlockingQueue<ChannelSftp>>();
private Configuration configuration;
@@ -97,7 +99,7 @@ public class Sftp implements Protocol {
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 class Sftp implements Protocol {
} 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 @@ public class Sftp implements Protocol {
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 @@ public class Sftp implements Protocol {
try {
queue.put(cSftp);
} catch (InterruptedException e) {
- logger
+ LOG
.error("Wait for putChannelSftp() interrupted for host: " + host, e);
throw e;
}
@@ -164,13 +166,13 @@ public class Sftp implements Protocol {
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 @@ public class Sftp implements Protocol {
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 class Sftp implements Protocol {
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 class Sftp implements Protocol {
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 class Sftp implements Protocol {
try {
queue.put(cSftp);
} catch (InterruptedException e) {
- logger.error("Interrupted during setConf()", e);
+ LOG.error("Interrupted during setConf()", e);
return;
}
channelSftpByHostMap.put(server, queue);
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
----------------------------------------------------------------------
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 1e07e6a..6b75137 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 @@ import java.util.Set;
*/
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_");
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
----------------------------------------------------------------------
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 c905411..f422daa 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<String, Subcollection> collectionMap = new HashMap<String, Subcollection>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java
----------------------------------------------------------------------
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 edc706e..52c1022 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 class SubcollectionIndexingFilter extends Configured implements
/**
* 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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java
----------------------------------------------------------------------
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 02b80f3..b247f9e 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 @@ import org.apache.nutch.util.domain.DomainSuffix;
* @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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java
----------------------------------------------------------------------
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 5b7d581..1e984b3 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 @@ import org.apache.nutch.util.domain.DomainSuffix;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java
----------------------------------------------------------------------
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 6e779dd..8e23dc3 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 @@ import org.apache.nutch.util.NutchConfiguration;
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", ".");
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java
----------------------------------------------------------------------
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 75ece12..224d092 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 @@ import java.util.ArrayList;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java
----------------------------------------------------------------------
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 ccad47d..47987ab 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 @@ import java.net.MalformedURLException;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
----------------------------------------------------------------------
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 b648293..e17b19a 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 @@ import org.apache.hadoop.conf.Configured;
* </ul>
*/
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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java
----------------------------------------------------------------------
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 66f7a1b..5cabfd0 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 @@ import org.xml.sax.InputSource;
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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java
----------------------------------------------------------------------
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 128ecdc..47a0938 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 @@ import org.apache.nutch.util.NutchConfiguration;
/** 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/test/org/apache/nutch/fetcher/TestFetcher.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/fetcher/TestFetcher.java b/src/test/org/apache/nutch/fetcher/TestFetcher.java
index 9d62d50..cd8cb2d 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 @@ import static org.junit.Assert.*;
*/
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;
[3/3] nutch git commit: Merge branch 'kamaci/NUTCH-2351' into 2.x,
closes #171
Posted by sn...@apache.org.
Merge branch 'kamaci/NUTCH-2351' into 2.x, closes #171
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/54300a89
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/54300a89
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/54300a89
Branch: refs/heads/2.x
Commit: 54300a89e7a329effa11a8e3218ccff984ed8669
Parents: 7d3e45f 1a84334
Author: Sebastian Nagel <sn...@apache.org>
Authored: Thu Jan 19 23:01:11 2017 +0100
Committer: Sebastian Nagel <sn...@apache.org>
Committed: Thu Jan 19 23:01:11 2017 +0100
----------------------------------------------------------------------
src/java/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 ++-
.../org/apache/nutch/crawl/DbUpdateMapper.java | 3 ++-
.../org/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 ++-
.../org/apache/nutch/crawl/URLPartitioner.java | 3 ++-
.../org/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 +++++---
.../org/apache/nutch/host/HostDbUpdateJob.java | 6 +++--
.../org/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 +++++---
.../org/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 ++-
.../apache/nutch/parse/ParsePluginsReader.java | 5 ++--
src/java/org/apache/nutch/parse/ParseUtil.java | 4 ++-
.../org/apache/nutch/parse/ParserChecker.java | 4 ++-
.../org/apache/nutch/parse/ParserFactory.java | 4 ++-
src/java/org/apache/nutch/parse/ParserJob.java | 4 ++-
.../apache/nutch/plugin/PluginDescriptor.java | 5 ++--
.../nutch/plugin/PluginManifestParser.java | 2 +-
.../apache/nutch/plugin/PluginRepository.java | 5 ++--
.../apache/nutch/protocol/ProtocolFactory.java | 5 ++--
.../apache/nutch/protocol/RobotRulesParser.java | 5 ++--
src/java/org/apache/nutch/tools/Benchmark.java | 4 ++-
src/java/org/apache/nutch/tools/DmozParser.java | 4 ++-
.../org/apache/nutch/tools/ResolveUrls.java | 4 ++-
.../apache/nutch/tools/arc/ArcRecordReader.java | 5 ++--
.../nutch/tools/proxy/LogDebugHandler.java | 3 ++-
.../apache/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 ++-
.../org/apache/nutch/util/EncodingDetector.java | 5 ++--
src/java/org/apache/nutch/util/GZIPUtils.java | 4 ++-
src/java/org/apache/nutch/util/MimeUtil.java | 5 ++--
src/java/org/apache/nutch/util/ObjectCache.java | 4 ++-
.../nutch/util/domain/DomainStatistics.java | 3 ++-
.../nutch/util/domain/DomainSuffixes.java | 3 ++-
.../nutch/util/domain/DomainSuffixesReader.java | 3 ++-
.../nutch/webui/client/impl/CrawlingCycle.java | 6 +++--
.../client/impl/RemoteCommandExecutor.java | 6 +++--
.../webui/service/impl/CrawlServiceImpl.java | 6 +++--
.../webui/service/impl/NutchServiceImpl.java | 7 +++---
.../creativecommons/nutch/CCIndexingFilter.java | 5 ++--
.../creativecommons/nutch/CCParseFilter.java | 4 ++-
.../org/apache/nutch/parse/feed/FeedParser.java | 5 ++--
.../apache/nutch/parse/feed/TestFeedParser.java | 5 ++--
.../indexer/anchor/AnchorIndexingFilter.java | 5 ++--
.../indexer/basic/BasicIndexingFilter.java | 5 ++--
.../nutch/indexer/html/HtmlIndexingFilter.java | 5 ++--
.../nutch/indexer/more/MoreIndexingFilter.java | 5 ++--
.../indexwriter/elastic/ElasticIndexWriter.java | 4 ++-
.../elastic2/ElasticIndexWriter.java | 4 ++-
.../nutch/indexwriter/solr/SolrIndexWriter.java | 5 ++--
.../indexwriter/solr/SolrMappingReader.java | 4 ++-
.../nutch/indexwriter/solr/SolrUtils.java | 4 ++-
.../nutch/analysis/lang/HTMLLanguageParser.java | 5 ++--
.../nutch/protocol/http/api/HttpBase.java | 26 +++++++++++---------
.../protocol/http/api/HttpRobotRulesParser.java | 6 +++--
.../nutch/urlfilter/api/RegexURLFilterBase.java | 5 ++--
.../urlfilter/api/RegexURLFilterBaseTest.java | 5 ++--
.../nutch/microformats/reltag/RelTagParser.java | 4 ++-
.../org/apache/nutch/parse/ext/ExtParser.java | 4 ++-
.../org/apache/nutch/parse/html/HtmlParser.java | 5 ++--
.../apache/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 +++--
.../org/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 ++-
.../java/org/apache/nutch/protocol/ftp/Ftp.java | 4 ++-
.../nutch/protocol/ftp/FtpRobotRulesParser.java | 5 ++--
.../org/apache/nutch/protocol/http/Http.java | 4 ++-
.../DummySSLProtocolSocketFactory.java | 3 ++-
.../apache/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 ++--
.../nutch/urlfilter/domain/DomainURLFilter.java | 3 ++-
.../urlfilter/domain/TestDomainURLFilter.java | 5 ++--
.../nutch/urlfilter/prefix/PrefixURLFilter.java | 3 ++-
.../nutch/urlfilter/suffix/SuffixURLFilter.java | 3 ++-
.../urlnormalizer/basic/BasicURLNormalizer.java | 5 ++--
.../urlnormalizer/regex/RegexURLNormalizer.java | 3 ++-
.../regex/TestRegexURLNormalizer.java | 3 ++-
.../org/apache/nutch/fetcher/TestFetcher.java | 4 ++-
114 files changed, 365 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
[2/3] nutch git commit: NUTCH-2351 Logging with generic class name.
Posted by sn...@apache.org.
NUTCH-2351 Logging with generic class name.
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/1a84334c
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/1a84334c
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/1a84334c
Branch: refs/heads/2.x
Commit: 1a84334c115bfda16980cd822da31ba5ae401afe
Parents: 7d3e45f
Author: kamaci <fu...@gmail.com>
Authored: Tue Jan 17 23:14:39 2017 +0200
Committer: Sebastian Nagel <sn...@apache.org>
Committed: Thu Jan 19 23:00:44 2017 +0100
----------------------------------------------------------------------
src/java/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 ++-
.../org/apache/nutch/crawl/DbUpdateMapper.java | 3 ++-
.../org/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 ++-
.../org/apache/nutch/crawl/URLPartitioner.java | 3 ++-
.../org/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 +++++---
.../org/apache/nutch/host/HostDbUpdateJob.java | 6 +++--
.../org/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 +++++---
.../org/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 ++-
.../apache/nutch/parse/ParsePluginsReader.java | 5 ++--
src/java/org/apache/nutch/parse/ParseUtil.java | 4 ++-
.../org/apache/nutch/parse/ParserChecker.java | 4 ++-
.../org/apache/nutch/parse/ParserFactory.java | 4 ++-
src/java/org/apache/nutch/parse/ParserJob.java | 4 ++-
.../apache/nutch/plugin/PluginDescriptor.java | 5 ++--
.../nutch/plugin/PluginManifestParser.java | 2 +-
.../apache/nutch/plugin/PluginRepository.java | 5 ++--
.../apache/nutch/protocol/ProtocolFactory.java | 5 ++--
.../apache/nutch/protocol/RobotRulesParser.java | 5 ++--
src/java/org/apache/nutch/tools/Benchmark.java | 4 ++-
src/java/org/apache/nutch/tools/DmozParser.java | 4 ++-
.../org/apache/nutch/tools/ResolveUrls.java | 4 ++-
.../apache/nutch/tools/arc/ArcRecordReader.java | 5 ++--
.../nutch/tools/proxy/LogDebugHandler.java | 3 ++-
.../apache/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 ++-
.../org/apache/nutch/util/EncodingDetector.java | 5 ++--
src/java/org/apache/nutch/util/GZIPUtils.java | 4 ++-
src/java/org/apache/nutch/util/MimeUtil.java | 5 ++--
src/java/org/apache/nutch/util/ObjectCache.java | 4 ++-
.../nutch/util/domain/DomainStatistics.java | 3 ++-
.../nutch/util/domain/DomainSuffixes.java | 3 ++-
.../nutch/util/domain/DomainSuffixesReader.java | 3 ++-
.../nutch/webui/client/impl/CrawlingCycle.java | 6 +++--
.../client/impl/RemoteCommandExecutor.java | 6 +++--
.../webui/service/impl/CrawlServiceImpl.java | 6 +++--
.../webui/service/impl/NutchServiceImpl.java | 7 +++---
.../creativecommons/nutch/CCIndexingFilter.java | 5 ++--
.../creativecommons/nutch/CCParseFilter.java | 4 ++-
.../org/apache/nutch/parse/feed/FeedParser.java | 5 ++--
.../apache/nutch/parse/feed/TestFeedParser.java | 5 ++--
.../indexer/anchor/AnchorIndexingFilter.java | 5 ++--
.../indexer/basic/BasicIndexingFilter.java | 5 ++--
.../nutch/indexer/html/HtmlIndexingFilter.java | 5 ++--
.../nutch/indexer/more/MoreIndexingFilter.java | 5 ++--
.../indexwriter/elastic/ElasticIndexWriter.java | 4 ++-
.../elastic2/ElasticIndexWriter.java | 4 ++-
.../nutch/indexwriter/solr/SolrIndexWriter.java | 5 ++--
.../indexwriter/solr/SolrMappingReader.java | 4 ++-
.../nutch/indexwriter/solr/SolrUtils.java | 4 ++-
.../nutch/analysis/lang/HTMLLanguageParser.java | 5 ++--
.../nutch/protocol/http/api/HttpBase.java | 26 +++++++++++---------
.../protocol/http/api/HttpRobotRulesParser.java | 6 +++--
.../nutch/urlfilter/api/RegexURLFilterBase.java | 5 ++--
.../urlfilter/api/RegexURLFilterBaseTest.java | 5 ++--
.../nutch/microformats/reltag/RelTagParser.java | 4 ++-
.../org/apache/nutch/parse/ext/ExtParser.java | 4 ++-
.../org/apache/nutch/parse/html/HtmlParser.java | 5 ++--
.../apache/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 +++--
.../org/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 ++-
.../java/org/apache/nutch/protocol/ftp/Ftp.java | 4 ++-
.../nutch/protocol/ftp/FtpRobotRulesParser.java | 5 ++--
.../org/apache/nutch/protocol/http/Http.java | 4 ++-
.../DummySSLProtocolSocketFactory.java | 3 ++-
.../apache/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 ++--
.../nutch/urlfilter/domain/DomainURLFilter.java | 3 ++-
.../urlfilter/domain/TestDomainURLFilter.java | 5 ++--
.../nutch/urlfilter/prefix/PrefixURLFilter.java | 3 ++-
.../nutch/urlfilter/suffix/SuffixURLFilter.java | 3 ++-
.../urlnormalizer/basic/BasicURLNormalizer.java | 5 ++--
.../urlnormalizer/regex/RegexURLNormalizer.java | 3 ++-
.../regex/TestRegexURLNormalizer.java | 3 ++-
.../org/apache/nutch/fetcher/TestFetcher.java | 4 ++-
114 files changed, 365 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/NutchServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/NutchServer.java b/src/java/org/apache/nutch/api/NutchServer.java
index 5118497..11c9542 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 @@ import com.google.common.collect.Sets;
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/impl/JobWorker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/impl/JobWorker.java b/src/java/org/apache/nutch/api/impl/JobWorker.java
index 8ac78cc..43c9ec8 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.Logger;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/impl/db/DbIterator.java
----------------------------------------------------------------------
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 e7fc0dd..5fd21d2 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.Sets;
import com.google.common.collect.UnmodifiableIterator;
public class DbIterator extends UnmodifiableIterator<Map<String, Object>> {
- private static final Logger LOG = LoggerFactory.getLogger(DbIterator.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Result<String, WebPage> result;
private boolean hasNext;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/resources/AdminResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/resources/AdminResource.java b/src/java/org/apache/nutch/api/resources/AdminResource.java
index bc19555..02dad44 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/resources/SeedResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/resources/SeedResource.java b/src/java/org/apache/nutch/api/resources/SeedResource.java
index accf097..b228d65 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.File;
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 @@ import com.google.common.io.Files;
@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 @@ public class SeedResource extends AbstractResource {
}
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());
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/api/security/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/security/SecurityUtils.java b/src/java/org/apache/nutch/api/security/SecurityUtils.java
index 8fd56f9..3795202 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 org.slf4j.LoggerFactory;
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 @@ import java.util.List;
*/
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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
index 8070c7b..aa6fd9b 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.apache.nutch.storage.WebPage;
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 @@ import java.util.Set;
public abstract class AbstractFetchSchedule extends Configured implements
FetchSchedule {
private static final Logger LOG = LoggerFactory
- .getLogger(AbstractFetchSchedule.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
protected int defaultInterval;
protected int maxInterval;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/DbUpdateMapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/DbUpdateMapper.java b/src/java/org/apache/nutch/crawl/DbUpdateMapper.java
index 6bab0d7..be1cc30 100644
--- a/src/java/org/apache/nutch/crawl/DbUpdateMapper.java
+++ b/src/java/org/apache/nutch/crawl/DbUpdateMapper.java
@@ -37,7 +37,8 @@ import org.apache.gora.mapreduce.GoraMapper;
public class DbUpdateMapper extends
GoraMapper<String, WebPage, UrlWithScore, NutchWritable> {
- public static final Logger LOG = DbUpdaterJob.LOG;
+
+ private static final Logger LOG = DbUpdaterJob.LOG;
private ScoringFilters scoringFilters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/DbUpdateReducer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/DbUpdateReducer.java b/src/java/org/apache/nutch/crawl/DbUpdateReducer.java
index 2e94c53..0e4bf57 100644
--- a/src/java/org/apache/nutch/crawl/DbUpdateReducer.java
+++ b/src/java/org/apache/nutch/crawl/DbUpdateReducer.java
@@ -44,7 +44,7 @@ GoraReducer<UrlWithScore, NutchWritable, String, WebPage> {
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/DbUpdaterJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/DbUpdaterJob.java b/src/java/org/apache/nutch/crawl/DbUpdaterJob.java
index 3885b68..b784322 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 @@ import org.slf4j.LoggerFactory;
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
index 80e14b7..0501494 100755
--- a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
+++ b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
@@ -22,11 +22,13 @@ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.nutch.util.ObjectCache;
+import java.lang.invoke.MethodHandles;
+
/** Creates and caches a {@link FetchSchedule} implementation. */
public class FetchScheduleFactory {
- public static final Logger LOG = LoggerFactory
- .getLogger(FetchScheduleFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private FetchScheduleFactory() {
} // no public ctor
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/GeneratorJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/GeneratorJob.java b/src/java/org/apache/nutch/crawl/GeneratorJob.java
index 1627590..6451534 100644
--- a/src/java/org/apache/nutch/crawl/GeneratorJob.java
+++ b/src/java/org/apache/nutch/crawl/GeneratorJob.java
@@ -19,6 +19,7 @@ package org.apache.nutch.crawl;
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<SelectorEntry> {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/InjectorJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/InjectorJob.java b/src/java/org/apache/nutch/crawl/InjectorJob.java
index df91a73..1f9747f 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.Logger;
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 @@ import java.util.*;
**/
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
static {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/SignatureFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/SignatureFactory.java b/src/java/org/apache/nutch/crawl/SignatureFactory.java
index 8cf7471..7e969b4 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 @@ import org.apache.nutch.util.ObjectCache;
*/
public class SignatureFactory {
private static final Logger LOG = LoggerFactory
- .getLogger(SignatureFactory.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private SignatureFactory() {
} // no public ctor
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/URLPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/URLPartitioner.java b/src/java/org/apache/nutch/crawl/URLPartitioner.java
index 98c59bc..b61cb09 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 @@ import org.apache.nutch.util.URLUtil;
*/
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/crawl/WebTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/WebTableReader.java b/src/java/org/apache/nutch/crawl/WebTableReader.java
index 5e58641..6aacd57 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.Logger;
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 @@ import java.util.regex.Pattern;
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<String, WebPage, Text, LongWritable> {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/fetcher/FetcherJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetcherJob.java b/src/java/org/apache/nutch/fetcher/FetcherJob.java
index 015c209..bd06121 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 @@ public class FetcherJob extends NutchTool implements Tool {
}
}
- public static final Logger LOG = LoggerFactory.getLogger(FetcherJob.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public FetcherJob() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/fetcher/FetcherReducer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetcherReducer.java b/src/java/org/apache/nutch/fetcher/FetcherReducer.java
index 68b982d..364bf7e 100644
--- a/src/java/org/apache/nutch/fetcher/FetcherReducer.java
+++ b/src/java/org/apache/nutch/fetcher/FetcherReducer.java
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class FetcherReducer extends
GoraReducer<IntWritable, FetchEntry, String, WebPage> {
- 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);
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/host/HostDb.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/host/HostDb.java b/src/java/org/apache/nutch/host/HostDb.java
index 579fe8b..4bfbd5a 100644
--- a/src/java/org/apache/nutch/host/HostDb.java
+++ b/src/java/org/apache/nutch/host/HostDb.java
@@ -18,12 +18,11 @@ package org.apache.nutch.host;
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.Cache;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/host/HostDbReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/host/HostDbReader.java b/src/java/org/apache/nutch/host/HostDbReader.java
index 7ea14bc..df71aa8 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.Host;
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 class HostDbReader extends Configured implements Tool {
read(key);
return 0;
} catch (Exception e) {
- LOG.fatal("HostDBReader: " + StringUtils.stringifyException(e));
+ LOG.error("HostDBReader: " + StringUtils.stringifyException(e));
return -1;
}
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/host/HostDbUpdateJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/host/HostDbUpdateJob.java b/src/java/org/apache/nutch/host/HostDbUpdateJob.java
index 4c717b8..0bfec40 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 @@ import org.slf4j.LoggerFactory;
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/host/HostInjectorJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/host/HostInjectorJob.java b/src/java/org/apache/nutch/host/HostInjectorJob.java
index 83f247c..59a2e64 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.Logger;
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 @@ import java.util.*;
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/CleaningJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/CleaningJob.java b/src/java/org/apache/nutch/indexer/CleaningJob.java
index bea7333..70c3b24 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 @@ import org.apache.nutch.util.ToolUtil;
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<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java b/src/java/org/apache/nutch/indexer/IndexCleaningFilters.java
index b396549..38ddef7 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexUtil.java b/src/java/org/apache/nutch/indexer/IndexUtil.java
index ddb6f0d..7b98830 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexWriters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexWriters.java b/src/java/org/apache/nutch/indexer/IndexWriters.java
index 74d3416..664d20d 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 @@ import org.slf4j.LoggerFactory;
/** Creates and caches {@link IndexWriter} implementing plugins. */
public class IndexWriters {
- public final static Logger LOG = LoggerFactory.getLogger(IndexWriters.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private IndexWriter[] indexWriters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexingFilters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingFilters.java b/src/java/org/apache/nutch/indexer/IndexingFilters.java
index b192db0..422b93f 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
index ec77607..8bae405 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 @@ import org.slf4j.LoggerFactory;
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() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/IndexingJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingJob.java b/src/java/org/apache/nutch/indexer/IndexingJob.java
index 8713910..bcac02b 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 @@ import org.slf4j.LoggerFactory;
public class IndexingJob extends NutchTool implements Tool {
- public static Logger LOG = LoggerFactory.getLogger(IndexingJob.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java b/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java
index 25cfdca..09e34fd 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 @@ package org.apache.nutch.indexer.solr;
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<Text, SolrDeleteDuplicates.SolrRecord, Text, SolrDeleteDuplicates.SolrRecord>
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 *]";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/indexer/solr/SolrUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/solr/SolrUtils.java b/src/java/org/apache/nutch/indexer/solr/SolrUtils.java
index 0f46547..ce8d35e 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.hadoop.conf.Configuration;
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 {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/net/URLNormalizers.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/net/URLNormalizers.java b/src/java/org/apache/nutch/net/URLNormalizers.java
index 1fc1df8..9091f36 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<Extension> EMPTY_EXTENSION_LIST = Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/OutlinkExtractor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/OutlinkExtractor.java b/src/java/org/apache/nutch/parse/OutlinkExtractor.java
index d1773f8..b4214b5 100644
--- a/src/java/org/apache/nutch/parse/OutlinkExtractor.java
+++ b/src/java/org/apache/nutch/parse/OutlinkExtractor.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +50,7 @@ import org.apache.oro.text.regex.Perl5Matcher;
*/
public class OutlinkExtractor {
private static final Logger LOG = LoggerFactory
- .getLogger(OutlinkExtractor.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Regex pattern to get URLs within a plain text.
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/ParsePluginsReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParsePluginsReader.java b/src/java/org/apache/nutch/parse/ParsePluginsReader.java
index b4c6f4e..0cfbdba 100644
--- a/src/java/org/apache/nutch/parse/ParsePluginsReader.java
+++ b/src/java/org/apache/nutch/parse/ParsePluginsReader.java
@@ -18,6 +18,7 @@ package org.apache.nutch.parse;
// JDK imports
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -52,8 +53,8 @@ import org.apache.nutch.util.NutchConfiguration;
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/ParseUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParseUtil.java b/src/java/org/apache/nutch/parse/ParseUtil.java
index a38fb0a..7c780c4 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.Logger;
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 class ParseUtil extends Configured {
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/ParserChecker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java
index 4d5c572..2b612a9 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.apache.nutch.util.URLUtil;
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 @@ import java.util.Map.Entry;
public class ParserChecker implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(ParserChecker.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
public ParserChecker() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/ParserFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParserFactory.java b/src/java/org/apache/nutch/parse/ParserFactory.java
index 2c73677..01113de 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 @@ import org.apache.nutch.util.ObjectCache;
/** Creates and caches {@link Parser} plugins. */
public final class ParserFactory {
- public static final Logger LOG = LoggerFactory.getLogger(ParserFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** Wildcard for default plugins. */
public static final String DEFAULT_PLUGIN = "*";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/parse/ParserJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParserJob.java b/src/java/org/apache/nutch/parse/ParserJob.java
index 9762a00..941a311 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 @@ import org.apache.gora.mapreduce.GoraMapper;
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/plugin/PluginDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/plugin/PluginDescriptor.java b/src/java/org/apache/nutch/plugin/PluginDescriptor.java
index d1196ba..06c221f 100644
--- a/src/java/org/apache/nutch/plugin/PluginDescriptor.java
+++ b/src/java/org/apache/nutch/plugin/PluginDescriptor.java
@@ -18,6 +18,7 @@ package org.apache.nutch.plugin;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -50,8 +51,8 @@ public class PluginDescriptor {
private ArrayList<URL> fNotExportedLibs = new ArrayList<URL>();
private ArrayList<Extension> fExtensions = new ArrayList<Extension>();
private PluginClassLoader fClassLoader;
- public static final Logger LOG = LoggerFactory
- .getLogger(PluginDescriptor.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration fConf;
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/plugin/PluginManifestParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/plugin/PluginManifestParser.java b/src/java/org/apache/nutch/plugin/PluginManifestParser.java
index bd2a490..69b59fe 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");
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/plugin/PluginRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/plugin/PluginRepository.java b/src/java/org/apache/nutch/plugin/PluginRepository.java
index 6486f63..c62963f 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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/protocol/ProtocolFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/protocol/ProtocolFactory.java b/src/java/org/apache/nutch/protocol/ProtocolFactory.java
index c318df7..d214945 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 @@ import org.apache.nutch.util.ObjectCache;
*/
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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/protocol/RobotRulesParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/protocol/RobotRulesParser.java b/src/java/org/apache/nutch/protocol/RobotRulesParser.java
index 867b71b..50ba06f 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.File;
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 @@ import crawlercommons.robots.SimpleRobotRulesParser;
*/
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<String, BaseRobotRules> CACHE = new Hashtable<String, BaseRobotRules>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/Benchmark.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/Benchmark.java b/src/java/org/apache/nutch/tools/Benchmark.java
index 68c1755..b5ea781 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.NutchConfiguration;
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();
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/DmozParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/DmozParser.java b/src/java/org/apache/nutch/tools/DmozParser.java
index 03d2662..cef1819 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 @@ import org.apache.nutch.util.TableUtil;
/** 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<String, WebPage> store = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/ResolveUrls.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/ResolveUrls.java b/src/java/org/apache/nutch/tools/ResolveUrls.java
index 8c8bf97..2269e7c 100644
--- a/src/java/org/apache/nutch/tools/ResolveUrls.java
+++ b/src/java/org/apache/nutch/tools/ResolveUrls.java
@@ -19,6 +19,7 @@ package org.apache.nutch.tools;
import java.io.BufferedReader;
import java.io.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 @@ import org.apache.nutch.util.URLUtil;
*/
public class ResolveUrls {
- public static final Logger LOG = LoggerFactory.getLogger(ResolveUrls.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private String urlsFile = null;
private int numThreads = 100;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
index 7f36b52..08c6534 100644
--- a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
+++ b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
@@ -18,6 +18,7 @@ package org.apache.nutch.tools.arc;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.zip.GZIPInputStream;
@@ -56,8 +57,8 @@ import org.apache.hadoop.util.StringUtils;
*/
public class ArcRecordReader implements RecordReader<Text, BytesWritable> {
- public static final Logger LOG = LoggerFactory
- .getLogger(ArcRecordReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected Configuration conf;
protected long splitStart = 0;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java b/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java
index aabdd1b..640ed2b 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 @@ package org.apache.nutch.tools.proxy;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -49,7 +50,7 @@ import org.mortbay.jetty.Request;
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,
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java b/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java
index cfa8d94..a0c985a 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.handler.HandlerList;
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
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/java/org/apache/nutch/util/Bytes.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/Bytes.java b/src/java/org/apache/nutch/util/Bytes.java
index 043a897..0a2a1ed 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.DataInput;
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 @@ import org.apache.hadoop.io.WritableUtils;
*/
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";
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 2e2ed9c..5ab9157 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/1a84334c/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 18635b6..20d3ae6 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/1a84334c/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 25f8eef..edf2594 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.Logger;
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 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/1a84334c/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 b9e5229..2e000d8 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/1a84334c/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 241087c..ec4a398 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/1a84334c/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 2aa3292..157e914 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/1a84334c/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 7313a03..179634b 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 @@ import org.slf4j.LoggerFactory;
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/1a84334c/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 286436e..a26195c 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/1a84334c/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/1a84334c/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/1a84334c/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/1a84334c/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 39dbae8..aa3b19f 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;
@@ -71,7 +73,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/1a84334c/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/1a84334c/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 6a8e378..d216078 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.apache.nutch.util.Bytes;
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 @@ import java.util.StringTokenizer;
/** 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/1a84334c/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 be427ef..fae6bb0 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 org.xml.sax.InputSource;
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 @@ import java.nio.charset.StandardCharsets;
/** 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 {
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 0751ddc..b3c05bb 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 61a5968..92cbcc0 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.
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 7e0e246..bb26385 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 @@ import java.util.Locale;
*/
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/1a84334c/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 617c681..10bbf51 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 @@ import java.util.HashSet;
* 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;
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/src/plugin/index-html/src/java/org/apache/nutch/indexer/html/HtmlIndexingFilter.java
----------------------------------------------------------------------
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 eb1454b..03e73e6 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.apache.nutch.util.StringUtil;
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;
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/1a84334c/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 9171b1c..230373d 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 @@ import org.slf4j.LoggerFactory;
*/
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/1a84334c/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 acb1d17..533dfff 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.util.HashMap;
@@ -48,7 +49,8 @@ import org.slf4j.LoggerFactory;
/**
*/
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;