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 21:47:19 UTC
[1/3] nutch git commit: NUTCH-2352 Logging with generic class name,
closes #172
Repository: nutch
Updated Branches:
refs/heads/master f351790d7 -> 2b93a66f0
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
----------------------------------------------------------------------
diff --git a/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java b/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
index 3fafbaf..88a616f 100644
--- a/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
+++ b/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
@@ -17,6 +17,8 @@
package org.apache.nutch.publisher.rabbitmq;
+import java.lang.invoke.MethodHandles;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.StringUtils;
import org.apache.nutch.publisher.NutchPublisher;
@@ -34,7 +36,8 @@ public class RabbitMQPublisherImpl implements NutchPublisher{
private static String EXCHANGE_SERVER;
private static String EXCHANGE_TYPE;
private static String HOST;
- private static final Logger LOG = LoggerFactory.getLogger(RabbitMQPublisherImpl.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static Channel channel;
@Override
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/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 e943d06..ec2e053 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 java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
@@ -50,8 +51,8 @@ import org.apache.nutch.scoring.ScoringFilterException;
*/
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 Configuration conf;
private float scoreInjected;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/CosineSimilarity.java
----------------------------------------------------------------------
diff --git a/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/CosineSimilarity.java b/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/CosineSimilarity.java
index 9853b34..c681970 100644
--- a/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/CosineSimilarity.java
+++ b/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/CosineSimilarity.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.scoring.similarity.cosine;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.util.Collection;
import java.util.Map.Entry;
@@ -34,9 +35,9 @@ import org.slf4j.LoggerFactory;
public class CosineSimilarity implements SimilarityModel{
- private Configuration conf;
- private final static Logger LOG = LoggerFactory
- .getLogger(CosineSimilarity.class);
+ private Configuration conf;
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
@Override
public void setConf(Configuration conf) {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/Model.java
----------------------------------------------------------------------
diff --git a/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/Model.java b/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/Model.java
index d8180f2..825f286 100644
--- a/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/Model.java
+++ b/src/plugin/scoring-similarity/src/java/org/apache/nutch/scoring/similarity/cosine/Model.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.scoring.similarity.cosine;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -46,8 +47,9 @@ import org.slf4j.LoggerFactory;
public class Model {
//Currently only one file, but in future could accept a corpus hence an ArrayList
- public static ArrayList<DocVector> docVectors = new ArrayList<>();
- private static final Logger LOG = LoggerFactory.getLogger(Model.class);
+ public static ArrayList<DocVector> docVectors = new ArrayList<>();
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static boolean isModelCreated = false;
private static List<String> stopWords;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/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 0dff3f8..9fc08a1 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/2b93a66f/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 2946d9e..c4b8b31 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,8 @@
*/
package org.apache.nutch.indexer.subcollection;
+import java.lang.invoke.MethodHandles;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.io.Text;
@@ -72,8 +74,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/2b93a66f/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 cd7e194..3155853 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 org.slf4j.Logger;
@@ -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/2b93a66f/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 821d944..1e2a6cc 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;
@@ -76,7 +77,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/2b93a66f/src/plugin/urlfilter-domainblacklist/src/java/org/apache/nutch/urlfilter/domainblacklist/DomainBlacklistURLFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlfilter-domainblacklist/src/java/org/apache/nutch/urlfilter/domainblacklist/DomainBlacklistURLFilter.java b/src/plugin/urlfilter-domainblacklist/src/java/org/apache/nutch/urlfilter/domainblacklist/DomainBlacklistURLFilter.java
index 37b1cdc..81f7c66 100644
--- a/src/plugin/urlfilter-domainblacklist/src/java/org/apache/nutch/urlfilter/domainblacklist/DomainBlacklistURLFilter.java
+++ b/src/plugin/urlfilter-domainblacklist/src/java/org/apache/nutch/urlfilter/domainblacklist/DomainBlacklistURLFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.urlfilter.domainblacklist;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -76,7 +77,7 @@ import org.apache.nutch.util.domain.DomainSuffix;
public class DomainBlacklistURLFilter implements URLFilter {
private static final Logger LOG = LoggerFactory
- .getLogger(DomainBlacklistURLFilter.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/2b93a66f/src/plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt/ExemptionUrlFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt/ExemptionUrlFilter.java b/src/plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt/ExemptionUrlFilter.java
index bbac300..40128c8 100644
--- a/src/plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt/ExemptionUrlFilter.java
+++ b/src/plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt/ExemptionUrlFilter.java
@@ -24,6 +24,7 @@ import org.apache.nutch.urlfilter.regex.RegexURLFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -59,8 +60,8 @@ public class ExemptionUrlFilter extends RegexURLFilter
public static final String DB_IGNORE_EXTERNAL_EXEMPTIONS_FILE
= "db.ignore.external.exemptions.file";
- private static final Logger LOG =
- LoggerFactory.getLogger(ExemptionUrlFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private List<Pattern> exemptions;
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/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 2e955b5..1e85dc3 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
@@ -28,6 +28,7 @@ import org.apache.nutch.util.TrieStringMatcher;
import org.apache.nutch.plugin.Extension;
import org.apache.nutch.plugin.PluginRepository;
+import java.lang.invoke.MethodHandles;
import java.io.Reader;
import java.io.FileReader;
import java.io.BufferedReader;
@@ -51,7 +52,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/2b93a66f/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 39c541f..0cc5944 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
@@ -29,6 +29,7 @@ import org.apache.nutch.plugin.PluginRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.io.Reader;
import java.io.FileReader;
import java.io.BufferedReader;
@@ -126,7 +127,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/2b93a66f/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java b/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
index dc673a2..5e5e7aa 100644
--- a/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
+++ b/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
@@ -17,6 +17,8 @@
package org.apache.nutch.indexer.urlmeta;
+import java.lang.invoke.MethodHandles;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
@@ -68,7 +70,7 @@ import org.apache.nutch.parse.Parse;
public class URLMetaIndexingFilter implements IndexingFilter {
private static final Logger LOG = LoggerFactory
- .getLogger(URLMetaIndexingFilter.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String CONF_PROPERTY = "urlmeta.tags";
private static String[] urlMetaTags;
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java b/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
index 3965e42..ebc238e 100644
--- a/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
+++ b/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
@@ -17,6 +17,7 @@
package org.apache.nutch.scoring.urlmeta;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Map.Entry;
import java.util.Iterator;
@@ -44,7 +45,7 @@ import org.apache.nutch.scoring.ScoringFilterException;
public class URLMetaScoringFilter extends Configured implements ScoringFilter {
private static final Logger LOG = LoggerFactory
- .getLogger(URLMetaScoringFilter.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String CONF_PROPERTY = "urlmeta.tags";
private static String[] urlMetaTags;
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/urlnormalizer-ajax/src/java/org/apache/nutch/net/urlnormalizer/ajax/AjaxURLNormalizer.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlnormalizer-ajax/src/java/org/apache/nutch/net/urlnormalizer/ajax/AjaxURLNormalizer.java b/src/plugin/urlnormalizer-ajax/src/java/org/apache/nutch/net/urlnormalizer/ajax/AjaxURLNormalizer.java
index 5286f6f..e1c134a 100644
--- a/src/plugin/urlnormalizer-ajax/src/java/org/apache/nutch/net/urlnormalizer/ajax/AjaxURLNormalizer.java
+++ b/src/plugin/urlnormalizer-ajax/src/java/org/apache/nutch/net/urlnormalizer/ajax/AjaxURLNormalizer.java
@@ -17,6 +17,7 @@
package org.apache.nutch.net.urlnormalizer.ajax;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.net.URI;
import java.net.URLEncoder;
@@ -38,7 +39,8 @@ import org.apache.hadoop.conf.Configuration;
* ^(.*)\?.*_escaped_fragment_
*/
public class AjaxURLNormalizer implements URLNormalizer {
- public static final Logger LOG = LoggerFactory.getLogger(AjaxURLNormalizer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static String AJAX_URL_PART = "#!";
public static String ESCAPED_URL_PART = "_escaped_fragment_=";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/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 5287d2d..348efce 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.slf4j.LoggerFactory;
* </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/2b93a66f/src/plugin/urlnormalizer-host/src/java/org/apache/nutch/net/urlnormalizer/host/HostURLNormalizer.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlnormalizer-host/src/java/org/apache/nutch/net/urlnormalizer/host/HostURLNormalizer.java b/src/plugin/urlnormalizer-host/src/java/org/apache/nutch/net/urlnormalizer/host/HostURLNormalizer.java
index 8d5c110..9b5e3eb 100644
--- a/src/plugin/urlnormalizer-host/src/java/org/apache/nutch/net/urlnormalizer/host/HostURLNormalizer.java
+++ b/src/plugin/urlnormalizer-host/src/java/org/apache/nutch/net/urlnormalizer/host/HostURLNormalizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.net.urlnormalizer.host;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -50,7 +51,7 @@ public class HostURLNormalizer implements URLNormalizer {
private Configuration conf;
private static final Logger LOG = LoggerFactory
- .getLogger(HostURLNormalizer.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static String attributeFile = null;
private String hostsFile = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/urlnormalizer-protocol/src/java/org/apache/nutch/net/urlnormalizer/protocol/ProtocolURLNormalizer.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlnormalizer-protocol/src/java/org/apache/nutch/net/urlnormalizer/protocol/ProtocolURLNormalizer.java b/src/plugin/urlnormalizer-protocol/src/java/org/apache/nutch/net/urlnormalizer/protocol/ProtocolURLNormalizer.java
index 4278325..1faa041 100644
--- a/src/plugin/urlnormalizer-protocol/src/java/org/apache/nutch/net/urlnormalizer/protocol/ProtocolURLNormalizer.java
+++ b/src/plugin/urlnormalizer-protocol/src/java/org/apache/nutch/net/urlnormalizer/protocol/ProtocolURLNormalizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.net.urlnormalizer.protocol;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -43,7 +44,8 @@ public class ProtocolURLNormalizer implements URLNormalizer {
private Configuration conf;
- private static final Logger LOG = LoggerFactory.getLogger(ProtocolURLNormalizer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final char QUESTION_MARK = '?';
private static final String PROTOCOL_DELIMITER = "://";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/urlnormalizer-querystring/src/java/org/apache/nutch/net/urlnormalizer/querystring/QuerystringURLNormalizer.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlnormalizer-querystring/src/java/org/apache/nutch/net/urlnormalizer/querystring/QuerystringURLNormalizer.java b/src/plugin/urlnormalizer-querystring/src/java/org/apache/nutch/net/urlnormalizer/querystring/QuerystringURLNormalizer.java
index 1de03a3..19e5bba 100644
--- a/src/plugin/urlnormalizer-querystring/src/java/org/apache/nutch/net/urlnormalizer/querystring/QuerystringURLNormalizer.java
+++ b/src/plugin/urlnormalizer-querystring/src/java/org/apache/nutch/net/urlnormalizer/querystring/QuerystringURLNormalizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.net.urlnormalizer.querystring;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -43,7 +44,7 @@ public class QuerystringURLNormalizer implements URLNormalizer {
private Configuration conf;
private static final Logger LOG = LoggerFactory
- .getLogger(QuerystringURLNormalizer.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public QuerystringURLNormalizer() {
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/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 363da18..7626f60 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;
@@ -67,7 +68,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/2b93a66f/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 cbf6c64..2afbd75 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;
@@ -37,7 +38,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/2b93a66f/src/plugin/urlnormalizer-slash/src/java/org/apache/nutch/net/urlnormalizer/slash/SlashURLNormalizer.java
----------------------------------------------------------------------
diff --git a/src/plugin/urlnormalizer-slash/src/java/org/apache/nutch/net/urlnormalizer/slash/SlashURLNormalizer.java b/src/plugin/urlnormalizer-slash/src/java/org/apache/nutch/net/urlnormalizer/slash/SlashURLNormalizer.java
index 4554cf0..c96013f 100644
--- a/src/plugin/urlnormalizer-slash/src/java/org/apache/nutch/net/urlnormalizer/slash/SlashURLNormalizer.java
+++ b/src/plugin/urlnormalizer-slash/src/java/org/apache/nutch/net/urlnormalizer/slash/SlashURLNormalizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.net.urlnormalizer.slash;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -43,7 +44,8 @@ public class SlashURLNormalizer implements URLNormalizer {
private Configuration conf;
- private static final Logger LOG = LoggerFactory.getLogger(SlashURLNormalizer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final char QUESTION_MARK = '?';
private static final char SLASH = '/';
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/ContinuousCrawlTestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/ContinuousCrawlTestUtil.java b/src/test/org/apache/nutch/crawl/ContinuousCrawlTestUtil.java
index bb938a6..0bd6b6d 100644
--- a/src/test/org/apache/nutch/crawl/ContinuousCrawlTestUtil.java
+++ b/src/test/org/apache/nutch/crawl/ContinuousCrawlTestUtil.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
public class ContinuousCrawlTestUtil extends TestCase {
private static final Logger LOG = LoggerFactory
- .getLogger(ContinuousCrawlTestUtil.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
protected static Text dummyURL = new Text("http://nutch.apache.org/");
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
index 56905e4..eb935df 100644
--- a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
+++ b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -40,7 +41,7 @@ import org.mortbay.jetty.handler.ResourceHandler;
public class CrawlDBTestUtil {
private static final Logger LOG = LoggerFactory
- .getLogger(CrawlDBTestUtil.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Creates synthetic crawldb
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/CrawlDbUpdateTestDriver.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/CrawlDbUpdateTestDriver.java b/src/test/org/apache/nutch/crawl/CrawlDbUpdateTestDriver.java
index 7238f88..715c080 100644
--- a/src/test/org/apache/nutch/crawl/CrawlDbUpdateTestDriver.java
+++ b/src/test/org/apache/nutch/crawl/CrawlDbUpdateTestDriver.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
@@ -61,7 +62,7 @@ import org.apache.hadoop.mrunit.types.Pair;
public class CrawlDbUpdateTestDriver<T extends Reducer<Text, CrawlDatum, Text, CrawlDatum>> {
private static final Logger LOG = LoggerFactory
- .getLogger(CrawlDbUpdateTestDriver.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private ReduceDriver<Text, CrawlDatum, Text, CrawlDatum> reduceDriver;
private T reducer;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java b/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java
index bfb716d..ea18dd1 100644
--- a/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java
+++ b/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
public class CrawlDbUpdateUtil<T extends Reducer<Text, CrawlDatum, Text, CrawlDatum>> {
private static final Logger LOG = LoggerFactory
- .getLogger(CrawlDbUpdateUtil.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private T reducer;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/TODOTestCrawlDbStates.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/TODOTestCrawlDbStates.java b/src/test/org/apache/nutch/crawl/TODOTestCrawlDbStates.java
index e44cb39..037a6ec 100644
--- a/src/test/org/apache/nutch/crawl/TODOTestCrawlDbStates.java
+++ b/src/test/org/apache/nutch/crawl/TODOTestCrawlDbStates.java
@@ -1,5 +1,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
+
import static org.apache.nutch.crawl.CrawlDatum.*;
import org.apache.hadoop.conf.Configuration;
@@ -14,7 +16,7 @@ import org.slf4j.LoggerFactory;
public class TODOTestCrawlDbStates extends TestCrawlDbStates {
private static final Logger LOG = LoggerFactory
- .getLogger(TODOTestCrawlDbStates.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* NUTCH-578: a fetch_retry should result in a db_gone if db.fetch.retry.max
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java b/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java
index b670551..7c4b2eb 100644
--- a/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java
+++ b/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java
@@ -17,11 +17,13 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Iterator;
import java.util.TreeSet;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -37,8 +39,8 @@ import org.junit.Before;
import org.junit.Test;
public class TestCrawlDbMerger {
- private static final Logger LOG = Logger.getLogger(CrawlDbMerger.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
String url10 = "http://example.com/";
String url11 = "http://example.com/foo";
@@ -117,18 +119,18 @@ public class TestCrawlDbMerger {
createCrawlDb(conf, fs, crawldb1, init1, cd1);
createCrawlDb(conf, fs, crawldb2, init2, cd2);
CrawlDbMerger merger = new CrawlDbMerger(conf);
- LOG.fine("* merging crawldbs to " + output);
+ LOG.debug("* merging crawldbs to " + output);
merger.merge(output, new Path[] { crawldb1, crawldb2 }, false, false);
- LOG.fine("* reading crawldb: " + output);
+ LOG.debug("* reading crawldb: " + output);
reader = new CrawlDbReader();
String crawlDb = output.toString();
Iterator<String> it = expected.keySet().iterator();
while (it.hasNext()) {
String url = it.next();
- LOG.fine("url=" + url);
+ LOG.debug("url=" + url);
CrawlDatum cd = expected.get(url);
CrawlDatum res = reader.get(crawlDb, url, new JobConf(conf));
- LOG.fine(" -> " + res);
+ LOG.debug(" -> " + res);
System.out.println("url=" + url);
System.out.println(" cd " + cd);
System.out.println(" res " + res);
@@ -142,7 +144,7 @@ public class TestCrawlDbMerger {
private void createCrawlDb(Configuration config, FileSystem fs, Path crawldb,
TreeSet<String> init, CrawlDatum cd) throws Exception {
- LOG.fine("* creating crawldb: " + crawldb);
+ LOG.debug("* creating crawldb: " + crawldb);
Path dir = new Path(crawldb, CrawlDb.CURRENT_NAME);
Option wKeyOpt = MapFile.Writer.keyClass(Text.class);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java b/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java
index 7f1c9cf..b61a21c 100644
--- a/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java
+++ b/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
@@ -60,7 +61,7 @@ import org.slf4j.LoggerFactory;
public class TestCrawlDbStates {
private static final Logger LOG = LoggerFactory
- .getLogger(TestCrawlDbStates.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
protected static final byte[][] fetchDbStatusPairs = {
{ -1, STATUS_DB_UNFETCHED }, { STATUS_FETCH_SUCCESS, STATUS_DB_FETCHED },
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/crawl/TestLinkDbMerger.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/crawl/TestLinkDbMerger.java b/src/test/org/apache/nutch/crawl/TestLinkDbMerger.java
index 23aaa88..de9e4ac 100644
--- a/src/test/org/apache/nutch/crawl/TestLinkDbMerger.java
+++ b/src/test/org/apache/nutch/crawl/TestLinkDbMerger.java
@@ -17,11 +17,11 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.TreeMap;
-import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -35,10 +35,12 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestLinkDbMerger {
- private static final Logger LOG = Logger.getLogger(TestLinkDbMerger.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
String url10 = "http://example.com/foo";
String[] urls10 = new String[] { "http://example.com/100",
@@ -108,14 +110,14 @@ public class TestLinkDbMerger {
createLinkDb(conf, fs, linkdb1, init1);
createLinkDb(conf, fs, linkdb2, init2);
LinkDbMerger merger = new LinkDbMerger(conf);
- LOG.fine("* merging linkdbs to " + output);
+ LOG.debug("* merging linkdbs to " + output);
merger.merge(output, new Path[] { linkdb1, linkdb2 }, false, false);
- LOG.fine("* reading linkdb: " + output);
+ LOG.debug("* reading linkdb: " + output);
reader = new LinkDbReader(conf, output);
Iterator<String> it = expected.keySet().iterator();
while (it.hasNext()) {
String url = it.next();
- LOG.fine("url=" + url);
+ LOG.debug("url=" + url);
String[] vals = expected.get(url);
Inlinks inlinks = reader.getInlinks(new Text(url));
// may not be null
@@ -127,7 +129,7 @@ public class TestLinkDbMerger {
links.add(in.getFromUrl());
}
for (int i = 0; i < vals.length; i++) {
- LOG.fine(" -> " + vals[i]);
+ LOG.debug(" -> " + vals[i]);
Assert.assertTrue(links.contains(vals[i]));
}
}
@@ -137,7 +139,7 @@ public class TestLinkDbMerger {
private void createLinkDb(Configuration config, FileSystem fs, Path linkdb,
TreeMap<String, String[]> init) throws Exception {
- LOG.fine("* creating linkdb: " + linkdb);
+ LOG.debug("* creating linkdb: " + linkdb);
Path dir = new Path(linkdb, LinkDb.CURRENT_NAME);
Option wKeyOpt = MapFile.Writer.keyClass(Text.class);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/indexer/TestIndexerMapReduce.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/indexer/TestIndexerMapReduce.java b/src/test/org/apache/nutch/indexer/TestIndexerMapReduce.java
index d581a0f..4e9ff3b 100644
--- a/src/test/org/apache/nutch/indexer/TestIndexerMapReduce.java
+++ b/src/test/org/apache/nutch/indexer/TestIndexerMapReduce.java
@@ -17,6 +17,8 @@
package org.apache.nutch.indexer;
+import java.lang.invoke.MethodHandles;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.mrunit.ReduceDriver;
import org.apache.hadoop.mrunit.types.Pair;
@@ -52,7 +54,7 @@ import org.apache.hadoop.conf.Configuration;
public class TestIndexerMapReduce {
private static final Logger LOG = LoggerFactory
- .getLogger(TestIndexerMapReduce.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public static String testUrl = "http://nutch.apache.org/";
public static Text testUrlText = new Text(testUrl);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/segment/TestSegmentMergerCrawlDatums.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/segment/TestSegmentMergerCrawlDatums.java b/src/test/org/apache/nutch/segment/TestSegmentMergerCrawlDatums.java
index aaed8bc..c824285 100644
--- a/src/test/org/apache/nutch/segment/TestSegmentMergerCrawlDatums.java
+++ b/src/test/org/apache/nutch/segment/TestSegmentMergerCrawlDatums.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.segment;
+import java.lang.invoke.MethodHandles;
import java.text.DecimalFormat;
import java.util.Random;
@@ -58,7 +59,7 @@ public class TestSegmentMergerCrawlDatums {
Random rnd;
private static final Logger LOG = LoggerFactory
- .getLogger(TestSegmentMergerCrawlDatums.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/service/TestNutchServer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/service/TestNutchServer.java b/src/test/org/apache/nutch/service/TestNutchServer.java
index 1ee16c4..021d031 100644
--- a/src/test/org/apache/nutch/service/TestNutchServer.java
+++ b/src/test/org/apache/nutch/service/TestNutchServer.java
@@ -17,6 +17,7 @@
package org.apache.nutch.service;
+import java.lang.invoke.MethodHandles;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -27,7 +28,8 @@ import org.slf4j.LoggerFactory;
public class TestNutchServer {
- private static final Logger LOG = LoggerFactory.getLogger(TestNutchServer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
NutchServer server = NutchServer.getInstance();
private int port[] = {8081, 9999, 9100, 8900};
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/tools/proxy/LogDebugHandler.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/tools/proxy/LogDebugHandler.java b/src/test/org/apache/nutch/tools/proxy/LogDebugHandler.java
index 2682f6d..7db5b02 100644
--- a/src/test/org/apache/nutch/tools/proxy/LogDebugHandler.java
+++ b/src/test/org/apache/nutch/tools/proxy/LogDebugHandler.java
@@ -17,6 +17,7 @@ package org.apache.nutch.tools.proxy;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import javax.servlet.Filter;
@@ -33,7 +34,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/2b93a66f/src/test/org/apache/nutch/tools/proxy/ProxyTestbed.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/tools/proxy/ProxyTestbed.java b/src/test/org/apache/nutch/tools/proxy/ProxyTestbed.java
index a7e6aeb..a6b2d8e 100644
--- a/src/test/org/apache/nutch/tools/proxy/ProxyTestbed.java
+++ b/src/test/org/apache/nutch/tools/proxy/ProxyTestbed.java
@@ -17,6 +17,7 @@ package org.apache.nutch.tools.proxy;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -38,7 +39,8 @@ import org.mortbay.jetty.servlet.ServletHandler;
import org.mortbay.proxy.AsyncProxyServlet;
public class ProxyTestbed {
- private static final Logger LOG = LoggerFactory.getLogger(ProxyTestbed.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* @param args
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/test/org/apache/nutch/tools/proxy/SegmentHandler.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/nutch/tools/proxy/SegmentHandler.java b/src/test/org/apache/nutch/tools/proxy/SegmentHandler.java
index 5d198b4..419726c 100644
--- a/src/test/org/apache/nutch/tools/proxy/SegmentHandler.java
+++ b/src/test/org/apache/nutch/tools/proxy/SegmentHandler.java
@@ -17,6 +17,7 @@ package org.apache.nutch.tools.proxy;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.io.Closeable;
import java.io.IOException;
import java.io.OutputStream;
@@ -52,7 +53,7 @@ import org.mortbay.jetty.Request;
*/
public class SegmentHandler extends AbstractTestbedHandler {
private static final Logger LOG = LoggerFactory
- .getLogger(SegmentHandler.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private Segment seg;
private static HashMap<Integer, Integer> protoCodes = new HashMap<Integer, Integer>();
[2/3] nutch git commit: NUTCH-2352 Logging with generic class name,
closes #172
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java b/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
index 39b8d95..9277991 100644
--- a/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
+++ b/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
@@ -17,6 +17,7 @@
package org.apache.nutch.tools.arc;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map.Entry;
@@ -75,8 +76,8 @@ import org.apache.nutch.util.TimingUtil;
public class ArcSegmentCreator extends Configured implements Tool,
Mapper<Text, BytesWritable, Text, NutchWritable> {
- public static final Logger LOG = LoggerFactory
- .getLogger(ArcSegmentCreator.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String URL_VERSION = "arc.url.version";
private JobConf jobConf;
private URLFilters urlFilters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/warc/WARCExporter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/warc/WARCExporter.java b/src/java/org/apache/nutch/tools/warc/WARCExporter.java
index 2e50105..4e8418f 100644
--- a/src/java/org/apache/nutch/tools/warc/WARCExporter.java
+++ b/src/java/org/apache/nutch/tools/warc/WARCExporter.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URI;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -78,7 +79,8 @@ import com.martinkl.warc.mapred.WARCOutputFormat;
public class WARCExporter extends Configured implements Tool {
- public static Logger LOG = LoggerFactory.getLogger(WARCExporter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String CRLF = "\r\n";
private static final byte[] CRLF_BYTES = { 13, 10 };
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/CrawlCompletionStats.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/CrawlCompletionStats.java b/src/java/org/apache/nutch/util/CrawlCompletionStats.java
index 8aafe59..4920fbf 100644
--- a/src/java/org/apache/nutch/util/CrawlCompletionStats.java
+++ b/src/java/org/apache/nutch/util/CrawlCompletionStats.java
@@ -19,6 +19,7 @@ package org.apache.nutch.util;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.text.SimpleDateFormat;
import org.slf4j.Logger;
@@ -62,7 +63,7 @@ import org.apache.commons.cli.MissingOptionException;
public class CrawlCompletionStats extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(CrawlCompletionStats.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int MODE_HOST = 1;
private static final int MODE_DOMAIN = 2;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DeflateUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/DeflateUtils.java b/src/java/org/apache/nutch/util/DeflateUtils.java
index 5863522..a7e7e32 100644
--- a/src/java/org/apache/nutch/util/DeflateUtils.java
+++ b/src/java/org/apache/nutch/util/DeflateUtils.java
@@ -19,6 +19,7 @@ package org.apache.nutch.util;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import java.util.zip.DeflaterOutputStream;
@@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class DeflateUtils {
- private static final Logger LOG = LoggerFactory.getLogger(DeflateUtils.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int EXPECTED_COMPRESSION_RATIO = 5;
private static final int BUF_SIZE = 4096;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DomUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/DomUtil.java b/src/java/org/apache/nutch/util/DomUtil.java
index 9595bf4..e93477a 100644
--- a/src/java/org/apache/nutch/util/DomUtil.java
+++ b/src/java/org/apache/nutch/util/DomUtil.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -40,7 +41,8 @@ import org.slf4j.LoggerFactory;
public class DomUtil {
- private final static Logger LOG = LoggerFactory.getLogger(DomUtil.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Returns parsed dom tree or null if any error
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/DumpFileUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/DumpFileUtil.java b/src/java/org/apache/nutch/util/DumpFileUtil.java
index 9ed3e75..be9ec87 100644
--- a/src/java/org/apache/nutch/util/DumpFileUtil.java
+++ b/src/java/org/apache/nutch/util/DumpFileUtil.java
@@ -26,11 +26,12 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
public class DumpFileUtil {
- private static final Logger LOG = LoggerFactory.getLogger(DumpFileUtil.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private final static String DIR_PATTERN = "%s/%s/%s";
private final static String FILENAME_PATTERN = "%s_%s.%s";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/EncodingDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/EncodingDetector.java b/src/java/org/apache/nutch/util/EncodingDetector.java
index 4e62dd3..87fbc21 100644
--- a/src/java/org/apache/nutch/util/EncodingDetector.java
+++ b/src/java/org/apache/nutch/util/EncodingDetector.java
@@ -20,6 +20,7 @@ import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
@@ -101,8 +102,8 @@ public class EncodingDetector {
}
}
- public static final Logger LOG = LoggerFactory
- .getLogger(EncodingDetector.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final int NO_THRESHOLD = -1;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/GZIPUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/GZIPUtils.java b/src/java/org/apache/nutch/util/GZIPUtils.java
index 63b10e2..6a6a984 100644
--- a/src/java/org/apache/nutch/util/GZIPUtils.java
+++ b/src/java/org/apache/nutch/util/GZIPUtils.java
@@ -20,6 +20,7 @@ package org.apache.nutch.util;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class GZIPUtils {
- private static final Logger LOG = LoggerFactory.getLogger(GZIPUtils.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int EXPECTED_COMPRESSION_RATIO = 5;
private static final int BUF_SIZE = 4096;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/JexlUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/JexlUtil.java b/src/java/org/apache/nutch/util/JexlUtil.java
index 656a458..9709094 100644
--- a/src/java/org/apache/nutch/util/JexlUtil.java
+++ b/src/java/org/apache/nutch/util/JexlUtil.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.util;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class JexlUtil {
- public static final Logger LOG = LoggerFactory.getLogger(JexlUtil.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
*
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/MimeUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/MimeUtil.java b/src/java/org/apache/nutch/util/MimeUtil.java
index a73187b..63ef583 100644
--- a/src/java/org/apache/nutch/util/MimeUtil.java
+++ b/src/java/org/apache/nutch/util/MimeUtil.java
@@ -21,6 +21,7 @@ package org.apache.nutch.util;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
// Hadoop imports
import org.apache.hadoop.conf.Configuration;
@@ -66,8 +67,8 @@ public final class MimeUtil {
private boolean mimeMagic;
/* our log stream */
- private static final Logger LOG = LoggerFactory.getLogger(MimeUtil.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public MimeUtil(Configuration conf) {
tika = new Tika();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/ObjectCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/ObjectCache.java b/src/java/org/apache/nutch/util/ObjectCache.java
index 0277ee6..34daf9e 100644
--- a/src/java/org/apache/nutch/util/ObjectCache.java
+++ b/src/java/org/apache/nutch/util/ObjectCache.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.util;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.WeakHashMap;
@@ -25,7 +26,8 @@ import org.apache.hadoop.conf.Configuration;
public class ObjectCache {
- private static final Logger LOG = LoggerFactory.getLogger(ObjectCache.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final WeakHashMap<Configuration, ObjectCache> CACHE = new WeakHashMap<Configuration, ObjectCache>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java b/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java
index d26cbfc..a188606 100644
--- a/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java
+++ b/src/java/org/apache/nutch/util/ProtocolStatusStatistics.java
@@ -19,6 +19,7 @@ package org.apache.nutch.util;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.text.SimpleDateFormat;
import org.slf4j.Logger;
@@ -61,7 +62,7 @@ import org.apache.nutch.metadata.Nutch;
public class ProtocolStatusStatistics extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(ProtocolStatusStatistics.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final Text UNFETCHED_TEXT = new Text("UNFETCHED");
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainStatistics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/domain/DomainStatistics.java b/src/java/org/apache/nutch/util/domain/DomainStatistics.java
index 6c1bd9e..af1c266 100644
--- a/src/java/org/apache/nutch/util/domain/DomainStatistics.java
+++ b/src/java/org/apache/nutch/util/domain/DomainStatistics.java
@@ -19,6 +19,7 @@ package org.apache.nutch.util.domain;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.text.SimpleDateFormat;
import org.slf4j.Logger;
@@ -48,7 +49,7 @@ import org.apache.nutch.util.URLUtil;
public class DomainStatistics extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(DomainStatistics.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final Text FETCHED_TEXT = new Text("FETCHED");
private static final Text NOT_FETCHED_TEXT = new Text("NOT_FETCHED");
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixes.java b/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
index 765457e..f2a2005 100644
--- a/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
+++ b/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
@@ -18,6 +18,7 @@
package org.apache.nutch.util.domain;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.slf4j.Logger;
@@ -32,7 +33,7 @@ import org.apache.hadoop.util.StringUtils;
*/
public class DomainSuffixes {
private static final Logger LOG = LoggerFactory
- .getLogger(DomainSuffixes.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private HashMap<String, DomainSuffix> domains = new HashMap<String, DomainSuffix>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java b/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
index a2a60e2..ae88736 100644
--- a/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
+++ b/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
@@ -19,6 +19,7 @@ package org.apache.nutch.util.domain;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,7 +45,7 @@ import org.xml.sax.SAXException;
class DomainSuffixesReader {
private static final Logger LOG = LoggerFactory
- .getLogger(DomainSuffixesReader.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
void read(DomainSuffixes tldEntries, InputStream input) throws IOException {
try {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java b/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java
index 2482c06..6a4f2f0 100644
--- a/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java
+++ b/src/java/org/apache/nutch/webui/client/impl/CrawlingCycle.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.webui.client.impl;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
@@ -34,7 +35,8 @@ import com.google.common.collect.Lists;
*
*/
public class CrawlingCycle {
- private Logger log = LoggerFactory.getLogger(CrawlingCycle.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private CrawlingCycleListener listener;
private RemoteCommandExecutor executor;
@@ -58,7 +60,7 @@ public class CrawlingCycle {
JobInfo jobInfo = executor.executeRemoteJob(command);
command.setJobInfo(jobInfo);
- log.info("Executed remote command data: {}", command);
+ LOG.info("Executed remote command data: {}", command);
if (jobInfo.getState() == State.FAILED) {
listener.onCrawlError(crawl, jobInfo.getMsg());
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java b/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java
index e1eefc2..9e4d1a8 100644
--- a/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java
+++ b/src/java/org/apache/nutch/webui/client/impl/RemoteCommandExecutor.java
@@ -18,6 +18,7 @@ package org.apache.nutch.webui.client.impl;
import static com.google.common.base.Preconditions.checkState;
+import java.lang.invoke.MethodHandles;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -40,7 +41,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RemoteCommandExecutor {
- private Logger log = LoggerFactory.getLogger(RemoteCommandExecutor.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int DEFAULT_TIMEOUT_SEC = 60;
private Duration requestDelay = new Duration(500);
@@ -60,7 +62,7 @@ public class RemoteCommandExecutor {
.submit(new JobStateChecker(jobId));
return chekerFuture.get(getTimeout(command), TimeUnit.MILLISECONDS);
} catch (Exception e) {
- log.error("Remote command failed", e);
+ LOG.error("Remote command failed", e);
JobInfo jobInfo = new JobInfo();
jobInfo.setState(State.FAILED);
jobInfo.setMsg(ExceptionUtils.getStackTrace(e));
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java b/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java
index 7bb133b..09798ea 100644
--- a/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java
+++ b/src/java/org/apache/nutch/webui/service/impl/CrawlServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.webui.service.impl;
+import java.lang.invoke.MethodHandles;
import java.sql.SQLException;
import java.util.List;
@@ -41,7 +42,8 @@ import com.j256.ormlite.dao.Dao;
@Service
public class CrawlServiceImpl implements CrawlService, CrawlingCycleListener {
- private Logger log = LoggerFactory.getLogger(CrawlServiceImpl.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
@Resource
private Dao<Crawl, Long> crawlDao;
@@ -74,7 +76,7 @@ public class CrawlServiceImpl implements CrawlService, CrawlingCycleListener {
} catch (Exception e) {
crawl.setStatus(CrawlStatus.ERROR);
saveCrawl(crawl);
- log.error("exception occured", e);
+ LOG.error("exception occured", e);
}
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java b/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java
index db989cf..8e34866 100644
--- a/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java
+++ b/src/java/org/apache/nutch/webui/service/impl/NutchServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.webui.service.impl;
+import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.util.Collections;
import java.util.Map;
@@ -36,8 +37,8 @@ import com.sun.jersey.api.client.ClientHandlerException;
@Service
public class NutchServiceImpl implements NutchService {
- private static final Logger logger = LoggerFactory
- .getLogger(NutchServiceImpl.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
@Resource
private NutchClientFactory nutchClientFactory;
@@ -59,7 +60,7 @@ public class NutchServiceImpl implements NutchService {
return ConnectionStatus.DISCONNECTED;
}
- logger.error("Cannot connect to nutch server!", e);
+ LOG.error("Cannot connect to nutch server!", e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
index e7c55c4..fea2eab 100644
--- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
+++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
@@ -35,14 +35,15 @@ import org.apache.hadoop.conf.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import java.net.URL;
import java.net.MalformedURLException;
/** Adds basic searchable fields to a document. */
public class CCIndexingFilter implements IndexingFilter {
- public static final Logger LOG = LoggerFactory
- .getLogger(CCIndexingFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** The name of the document field we use. */
public static String FIELD = "cc";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
index 1fa951e..57de6f6 100644
--- a/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
+++ b/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
+import java.lang.invoke.MethodHandles;
import java.io.*;
import java.net.*;
import javax.xml.parsers.*;
@@ -35,7 +36,8 @@ import org.w3c.dom.*;
/** Adds metadata identifying the Creative Commons license used, if any. */
public class CCParseFilter implements HtmlParseFilter {
- public static final Logger LOG = LoggerFactory.getLogger(CCParseFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** Walks DOM tree, looking for RDF in comments and licenses in anchors. */
public static class Walker {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java b/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
index 936c885..0936187 100644
--- a/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
+++ b/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse.feed;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.File;
@@ -79,7 +80,8 @@ public class FeedParser implements Parser {
public static final String TEXT_PLAIN_CONTENT_TYPE = "text/plain; "
+ CHARSET_UTF8;
- public static final Logger LOG = LoggerFactory.getLogger(FeedParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java b/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
index 36c8739..f5d4807 100644
--- a/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
+++ b/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
@@ -18,6 +18,7 @@
package org.apache.nutch.parse.feed;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import java.util.Map;
@@ -58,8 +59,8 @@ public class TestFeedParser {
private String[] sampleFiles = { "rsstest.rss" };
- public static final Logger LOG = LoggerFactory.getLogger(TestFeedParser.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Calls the {@link FeedParser} on a sample RSS file and checks that there are
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java b/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
index 6c9b834..4bee174 100644
--- a/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
+++ b/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.indexer.anchor;
+import java.lang.invoke.MethodHandles;
import java.util.HashSet;
import org.apache.hadoop.conf.Configuration;
@@ -37,8 +38,8 @@ import org.slf4j.LoggerFactory;
*/
public class AnchorIndexingFilter implements IndexingFilter {
- public static final Logger LOG = LoggerFactory
- .getLogger(AnchorIndexingFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
private boolean deduplicate = false;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java b/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
index 8584fa8..5e1233b 100644
--- a/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
+++ b/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.io.Text;
import org.apache.nutch.crawl.CrawlDatum;
import org.apache.nutch.crawl.Inlinks;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Date;
@@ -48,8 +49,8 @@ import org.apache.hadoop.conf.Configuration;
* {@code indexer.max.content.length} in nutch-default.xml.
*/
public class BasicIndexingFilter implements IndexingFilter {
- public static final Logger LOG = LoggerFactory
- .getLogger(BasicIndexingFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private int MAX_TITLE_LENGTH;
private int MAX_CONTENT_LENGTH;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java b/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java
index f515f1f..6b71443 100644
--- a/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java
+++ b/src/plugin/index-geoip/src/java/org/apache/nutch/indexer/geoip/GeoIPIndexingFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.indexer.geoip;
+import java.lang.invoke.MethodHandles;
import java.io.File;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
@@ -114,7 +115,7 @@ import com.maxmind.geoip2.WebServiceClient;
public class GeoIPIndexingFilter implements IndexingFilter {
private static final Logger LOG = LoggerFactory
- .getLogger(GeoIPIndexingFilter.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java b/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java
index 975df66..76471cb 100644
--- a/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java
+++ b/src/plugin/index-links/src/java/org/apache/nutch/indexer/links/LinksIndexingFilter.java
@@ -26,8 +26,11 @@ import org.apache.nutch.indexer.IndexingFilter;
import org.apache.nutch.indexer.NutchDocument;
import org.apache.nutch.parse.Outlink;
import org.apache.nutch.parse.Parse;
+
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashSet;
@@ -69,8 +72,8 @@ public class LinksIndexingFilter implements IndexingFilter {
public final static String LINKS_INLINKS_HOST = "index.links.inlinks.host.ignore";
public final static String LINKS_ONLY_HOSTS = "index.links.hosts.only";
- public final static org.slf4j.Logger LOG = LoggerFactory
- .getLogger(LinksIndexingFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
private boolean filterOutlinks;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java b/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
index 6e64ede..53fe344 100644
--- a/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
+++ b/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.io.Writable;
import java.text.ParseException;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.Date;
@@ -68,8 +69,8 @@ import org.apache.commons.lang.time.DateUtils;
*/
public class MoreIndexingFilter implements IndexingFilter {
- public static final Logger LOG = LoggerFactory
- .getLogger(MoreIndexingFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** Get the MimeTypes resolver instance. */
private MimeUtil MIME;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java b/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java
index b6f1a9c..7b3296b 100644
--- a/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java
+++ b/src/plugin/indexer-cloudsearch/src/java/org/apache/nutch/indexwriter/cloudsearch/CloudSearchIndexWriter.java
@@ -17,6 +17,7 @@
package org.apache.nutch.indexwriter.cloudsearch;
+import java.lang.invoke.MethodHandles;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
@@ -59,8 +60,8 @@ import com.amazonaws.util.json.JSONObject;
* Writes documents to CloudSearch.
*/
public class CloudSearchIndexWriter implements IndexWriter {
- public static final Logger LOG = LoggerFactory
- .getLogger(CloudSearchIndexWriter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int MAX_SIZE_BATCH_BYTES = 5242880;
private static final int MAX_SIZE_DOC_BYTES = 1048576;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java b/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java
index b27ba14..0930707 100644
--- a/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java
+++ b/src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyIndexWriter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.indexwriter.dummy;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.FileWriter;
@@ -35,8 +36,8 @@ import org.slf4j.LoggerFactory;
* and add.
*/
public class DummyIndexWriter implements IndexWriter {
- public static final Logger LOG = LoggerFactory
- .getLogger(DummyIndexWriter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration config;
private Writer writer;
private boolean delete = false;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java b/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java
index 00b96f1..dfcc01c 100644
--- a/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java
+++ b/src/plugin/indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticIndexWriter.java
@@ -19,6 +19,7 @@ package org.apache.nutch.indexwriter.elastic;
import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.net.InetAddress;
@@ -52,7 +53,8 @@ import org.slf4j.LoggerFactory;
* Sends NutchDocuments to a configured Elasticsearch index.
*/
public class ElasticIndexWriter implements IndexWriter {
- public static Logger LOG = LoggerFactory.getLogger(ElasticIndexWriter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int DEFAULT_PORT = 9300;
private static final int DEFAULT_MAX_BULK_DOCS = 250;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
index 0d9e2e0..d444364 100644
--- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
+++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.indexwriter.solr;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@@ -52,8 +53,8 @@ import java.net.URLDecoder;
public class SolrIndexWriter implements IndexWriter {
- public static final Logger LOG = LoggerFactory
- .getLogger(SolrIndexWriter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private List<SolrClient> solrClients;
private SolrMappingReader solrMapping;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java
index 19ffa6f..9b9ec42 100644
--- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java
+++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.indexwriter.solr;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -37,7 +38,8 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class SolrMappingReader {
- public static Logger LOG = LoggerFactory.getLogger(SolrMappingReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java
----------------------------------------------------------------------
diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java
index eec0080..d732b95 100644
--- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java
+++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java
@@ -16,9 +16,10 @@
*/
package org.apache.nutch.indexwriter.solr;
-
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.mapred.JobConf;
@@ -30,7 +31,8 @@ import java.net.MalformedURLException;
public class SolrUtils {
- public static Logger LOG = LoggerFactory.getLogger(SolrUtils.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
*
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java b/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java
index cb8f8c1..133164b 100644
--- a/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java
+++ b/src/plugin/language-identifier/src/java/org/apache/nutch/analysis/lang/HTMLLanguageParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.analysis.lang;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -41,8 +42,8 @@ import org.w3c.dom.Node;
public class HTMLLanguageParser implements HtmlParseFilter {
- public static final Logger LOG = LoggerFactory
- .getLogger(HTMLLanguageParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private int detect = -1, identify = -1;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java b/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java
index 064894e..cc0096c 100644
--- a/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java
+++ b/src/plugin/lib-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/HtmlUnitWebDriver.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.protocol.htmlunit;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -43,7 +44,8 @@ import com.gargoylesoftware.htmlunit.WebClient;
public class HtmlUnitWebDriver extends HtmlUnitDriver {
- private static final Logger LOG = LoggerFactory.getLogger(HtmlUnitWebDriver.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static boolean enableJavascript;
private static boolean enableCss;
private static boolean enableRedirect;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
index 90b256a..41b63e3 100644
--- a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
+++ b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.http.api;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
@@ -28,6 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
+
// Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,10 +96,11 @@ public abstract class HttpBase implements Protocol {
protected String accept = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
/** The default logger */
- private final static Logger LOGGER = LoggerFactory.getLogger(HttpBase.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** The specified logger */
- private Logger logger = LOGGER;
+ private Logger logger = LOG;
/** The nutch configuration */
private Configuration conf = null;
@@ -408,8 +411,8 @@ public abstract class HttpBase implements Protocol {
if ((agentName == null) || (agentName.trim().length() == 0)) {
// TODO : NUTCH-258
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("No User-Agent string set (http.agent.name)!");
+ if (LOG.isErrorEnabled()) {
+ LOG.error("No User-Agent string set (http.agent.name)!");
}
}
@@ -461,8 +464,8 @@ public abstract class HttpBase implements Protocol {
public byte[] processGzipEncoded(byte[] compressed, URL url)
throws IOException {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("uncompressing....");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("uncompressing....");
}
// content can be empty (i.e. redirection) in which case
@@ -480,8 +483,8 @@ public abstract class HttpBase implements Protocol {
if (content == null)
throw new IOException("unzipBestEffort returned null");
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("fetched " + compressed.length
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("fetched " + compressed.length
+ " bytes of compressed content (expanded to " + content.length
+ " bytes) from " + url);
}
@@ -496,8 +499,8 @@ public abstract class HttpBase implements Protocol {
if (compressed.length == 0)
return compressed;
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("inflating....");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("inflating....");
}
byte[] content;
@@ -510,8 +513,8 @@ public abstract class HttpBase implements Protocol {
if (content == null)
throw new IOException("inflateBestEffort returned null");
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("fetched " + compressed.length
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("fetched " + compressed.length
+ " bytes of compressed content (expanded to " + content.length
+ " bytes) from " + url);
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java
index 494ae0d..2359139 100644
--- a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java
+++ b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpRobotRulesParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.http.api;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.List;
@@ -39,8 +40,8 @@ import crawlercommons.robots.BaseRobotRules;
*/
public class HttpRobotRulesParser extends RobotRulesParser {
- public static final Logger LOG = LoggerFactory
- .getLogger(HttpRobotRulesParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected boolean allowForbidden = false;
HttpRobotRulesParser() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java b/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
index f5cc081..ca3ea0f 100644
--- a/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
+++ b/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
@@ -17,6 +17,7 @@
package org.apache.nutch.urlfilter.api;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.File;
import java.io.Reader;
import java.io.FileReader;
@@ -63,8 +64,8 @@ import org.apache.nutch.util.URLUtil;
public abstract class RegexURLFilterBase implements URLFilter {
/** My logger */
- private final static Logger LOG = LoggerFactory
- .getLogger(RegexURLFilterBase.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** An array of applicable rules */
private List<RegexRule> rules;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java b/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
index 0b58231..fec01ad 100644
--- a/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
+++ b/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
@@ -17,6 +17,7 @@
package org.apache.nutch.urlfilter.api;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -39,8 +40,8 @@ import org.apache.nutch.net.URLFilter;
public abstract class RegexURLFilterBaseTest {
/** My logger */
- protected static final Logger LOG = LoggerFactory
- .getLogger(RegexURLFilterBaseTest.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private final static String SEPARATOR = System.getProperty("file.separator");
private final static String SAMPLES = System.getProperty("test.data", ".");
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java
----------------------------------------------------------------------
diff --git a/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java b/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java
index 86692ae..0c4f497 100644
--- a/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java
+++ b/src/plugin/lib-selenium/src/java/org/apache/nutch/protocol/selenium/HttpWebClient.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.protocol.selenium;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -50,7 +51,8 @@ import com.opera.core.systems.OperaDriver;
public class HttpWebClient {
- private static final Logger LOG = LoggerFactory.getLogger(HttpWebClient.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static ThreadLocal<WebDriver> threadWebDriver = new ThreadLocal<WebDriver>() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java b/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
index 9176a1e..a4ebc8a 100644
--- a/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
+++ b/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.microformats.reltag;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.net.URLDecoder;
import java.util.Iterator;
@@ -51,7 +52,8 @@ import org.apache.hadoop.conf.Configuration;
*/
public class RelTagParser implements HtmlParseFilter {
- public final static Logger LOG = LoggerFactory.getLogger(RelTagParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public final static String REL_TAG = "Rel-Tag";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java b/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java
index 494d888..e8aa41b 100644
--- a/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java
+++ b/src/plugin/mimetype-filter/src/java/org/apache/nutch/indexer/filter/MimeTypeIndexingFilter.java
@@ -58,6 +58,7 @@ import org.apache.nutch.util.PrefixStringMatcher;
import org.apache.nutch.util.TrieStringMatcher;
import org.apache.tika.Tika;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -75,7 +76,7 @@ public class MimeTypeIndexingFilter implements IndexingFilter {
public static final String MIMEFILTER_REGEX_FILE = "mimetype.filter.file";
private static final Logger LOG = LoggerFactory
- .getLogger(MimeTypeIndexingFilter.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private MimeUtil MIME;
private Tika tika = new Tika();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java b/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
index 94d9b32..a4c14a9 100644
--- a/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
+++ b/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import java.util.Hashtable;
+import java.lang.invoke.MethodHandles;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
@@ -50,8 +51,8 @@ import java.nio.charset.Charset;
public class ExtParser implements Parser {
- public static final Logger LOG = LoggerFactory
- .getLogger("org.apache.nutch.parse.ext");
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
static final int BUFFER_SIZE = 4096;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java b/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
index 4d043ba..7f60939 100644
--- a/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
+++ b/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse.html;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Map;
import java.net.URL;
@@ -40,8 +41,8 @@ import org.apache.nutch.parse.*;
import org.apache.nutch.util.*;
public class HtmlParser implements Parser {
- public static final Logger LOG = LoggerFactory
- .getLogger("org.apache.nutch.parse.html");
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
// I used 1000 bytes at first, but found that some documents have
// meta tag well past the first 1000 bytes.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java b/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java
index 7099f50..0b39206 100644
--- a/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java
+++ b/src/plugin/parse-html/src/test/org/apache/nutch/parse/html/TestHtmlParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse.html;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import org.apache.hadoop.conf.Configuration;
@@ -33,8 +34,8 @@ import org.slf4j.LoggerFactory;
public class TestHtmlParser {
- public static final Logger LOG = LoggerFactory
- .getLogger(TestHtmlParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String encodingTestKeywords = "fran�ais, espa�ol, \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/2b93a66f/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java b/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
index 8c95372..7f6d105 100644
--- a/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
+++ b/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.parse.js;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -61,7 +62,8 @@ import org.w3c.dom.NodeList;
* Parts of the code come from OutlinkExtractor.java
*/
public class JSParseFilter implements HtmlParseFilter, Parser {
- public static final Logger LOG = LoggerFactory.getLogger(JSParseFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int MAX_TITLE_LEN = 80;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java b/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
index 9251366..a81f4f1 100644
--- a/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
+++ b/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse.swf;
+import java.lang.invoke.MethodHandles;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.*;
@@ -44,8 +45,8 @@ import com.anotherbigidea.io.InStream;
* distribution.
*/
public class SWFParser implements Parser {
- public static final Logger LOG = LoggerFactory
- .getLogger("org.apache.nutch.parse.swf");
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
index 5d7eca9..49dc378 100644
--- a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
+++ b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.parse.tika;
+import java.lang.invoke.MethodHandles;
import java.io.ByteArrayInputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -60,7 +61,8 @@ import org.xml.sax.ContentHandler;
public class TikaParser implements org.apache.nutch.parse.Parser {
- public static final Logger LOG = LoggerFactory.getLogger(TikaParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
private TikaConfig tikaConfig = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java b/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
index c9394dc..cdfe2b4 100644
--- a/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
+++ b/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
@@ -17,6 +17,8 @@
package org.apache.nutch.tika;
+import java.lang.invoke.MethodHandles;
+
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -52,8 +54,8 @@ public class TestFeedParser {
private String[] sampleFiles = { "rsstest.rss" };
- public static final Logger LOG = LoggerFactory.getLogger(TestFeedParser.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* <p>
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
index f441fd0..25a52a1 100644
--- a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
+++ b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse.zip;
+import java.lang.invoke.MethodHandles;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -46,7 +47,8 @@ import org.apache.hadoop.conf.Configuration;
*/
public class ZipParser implements Parser {
- private static final Logger LOG = LoggerFactory.getLogger(ZipParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
/** Creates a new instance of ZipParser */
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
----------------------------------------------------------------------
diff --git a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
index b454727..6ad42e6 100644
--- a/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
+++ b/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
@@ -18,6 +18,7 @@
package org.apache.nutch.parse.zip;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -49,8 +50,8 @@ import org.apache.tika.Tika;
*/
public class ZipTextExtractor {
- public static final Logger LOG = LoggerFactory
- .getLogger(ZipTextExtractor.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java b/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java
index 30810ae..05ea5c9 100644
--- a/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java
+++ b/src/plugin/parsefilter-naivebayes/src/java/org/apache/nutch/parsefilter/naivebayes/NaiveBayesParseFilter.java
@@ -30,6 +30,7 @@ import org.apache.nutch.parse.Parse;
import org.apache.nutch.parse.ParseResult;
import org.apache.nutch.protocol.Content;
+import java.lang.invoke.MethodHandles;
import java.io.Reader;
import java.io.BufferedReader;
import java.io.IOException;
@@ -47,7 +48,7 @@ import java.util.ArrayList;
public class NaiveBayesParseFilter implements HtmlParseFilter {
private static final Logger LOG = LoggerFactory
- .getLogger(NaiveBayesParseFilter.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String TRAINFILE_MODELFILTER = "parsefilter.naivebayes.trainfile";
public static final String DICTFILE_MODELFILTER = "parsefilter.naivebayes.wordlist";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java
----------------------------------------------------------------------
diff --git a/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java b/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java
index 0752c91..6955166 100644
--- a/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java
+++ b/src/plugin/parsefilter-regex/src/java/org/apache/nutch/parsefilter/regex/RegexParseFilter.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parsefilter.regex;
+import java.lang.invoke.MethodHandles;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.FileReader;
@@ -48,8 +49,9 @@ import org.w3c.dom.*;
* extracted text, a configurable field is set to true.
*/
public class RegexParseFilter implements HtmlParseFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(RegexParseFilter.class);
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static String attributeFile = null;
private String regexFile = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java b/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
index 2efb140..8a415b6 100644
--- a/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
+++ b/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.file;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.List;
@@ -48,7 +49,8 @@ import crawlercommons.robots.BaseRobotRules;
*/
public class File implements Protocol {
- public static final Logger LOG = LoggerFactory.getLogger(File.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
static final int MAX_REDIRECTS = 5;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
index a4051ed..84aa823 100644
--- a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
+++ b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
@@ -35,6 +35,7 @@ import org.apache.nutch.protocol.ProtocolOutput;
import org.apache.nutch.protocol.ProtocolStatus;
import crawlercommons.robots.BaseRobotRules;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.List;
import java.io.IOException;
@@ -49,7 +50,8 @@ import java.io.IOException;
*/
public class Ftp implements Protocol {
- public static final Logger LOG = LoggerFactory.getLogger(Ftp.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int BUFFER_SIZE = 16384; // 16*1024 = 16384
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java
index 482acdf..7b944e7 100644
--- a/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java
+++ b/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpRobotRulesParser.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.ftp;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.List;
@@ -42,8 +43,8 @@ import crawlercommons.robots.SimpleRobotRules;
public class FtpRobotRulesParser extends RobotRulesParser {
private static final String CONTENT_TYPE = "text/plain";
- public static final Logger LOG = LoggerFactory
- .getLogger(FtpRobotRulesParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
FtpRobotRulesParser() {
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java b/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
index c40ed69..cd6d742 100644
--- a/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
+++ b/src/plugin/protocol-htmlunit/src/java/org/apache/nutch/protocol/htmlunit/Http.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.protocol.htmlunit;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URL;
@@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory;
public class Http extends HttpBase {
- public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Default constructor.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java b/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
index 56f9f4f..bb4ab61 100755
--- a/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
+++ b/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.http;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URL;
@@ -36,7 +37,8 @@ import org.apache.nutch.util.NutchConfiguration;
public class Http extends HttpBase {
- public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Public default constructor.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
index afcf24a..a49b3e3 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
@@ -25,6 +25,7 @@
package org.apache.nutch.protocol.httpclient;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
@@ -46,7 +47,7 @@ public class DummySSLProtocolSocketFactory implements
/** Logger object for this class. */
private static final Logger LOG = LoggerFactory
- .getLogger(DummySSLProtocolSocketFactory.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private SSLContext sslcontext = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
index b5509cc..2102f80 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
@@ -20,6 +20,7 @@
package org.apache.nutch.protocol.httpclient;
+import java.lang.invoke.MethodHandles;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -37,7 +38,7 @@ public class DummyX509TrustManager implements X509TrustManager {
/** Logger object for this class. */
private static final Logger LOG = LoggerFactory
- .getLogger(DummyX509TrustManager.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Constructor for DummyX509TrustManager.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
index 9b91180..0e1b4f9 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.httpclient;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
@@ -85,7 +86,8 @@ import org.apache.nutch.util.NutchConfiguration;
*/
public class Http extends HttpBase {
- public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
index 064a6d0..9e064bb 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.httpclient;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
@@ -50,8 +51,8 @@ public class HttpAuthenticationFactory implements Configurable {
*/
public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
- public static final Logger LOG = LoggerFactory
- .getLogger(HttpAuthenticationFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
index 0cc2de5..c5f3e31 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.httpclient;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,8 +46,8 @@ import org.apache.hadoop.conf.Configurable;
public class HttpBasicAuthentication implements HttpAuthentication,
Configurable {
- public static final Logger LOG = LoggerFactory
- .getLogger(HttpBasicAuthentication.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static Pattern basic = Pattern
.compile("[bB][aA][sS][iI][cC] [rR][eE][aA][lL][mM]=\"(\\w*)\"");
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java
index 2f36538..e7e96d3 100644
--- a/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java
+++ b/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpFormAuthentication.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.protocol.httpclient;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.CookieHandler;
@@ -45,8 +46,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HttpFormAuthentication {
- private static final Logger LOGGER = LoggerFactory
- .getLogger(HttpFormAuthentication.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static Map<String, String> defaultLoginHeaders = new HashMap<String, String>();
static {
@@ -116,23 +117,23 @@ public class HttpFormAuthentication {
setLoginHeader(post);
// NUTCH-2280
- LOGGER.debug("FormAuth: set cookie policy");
+ LOG.debug("FormAuth: set cookie policy");
this.setCookieParams(authConfigurer, post.getParams());
post.addParameters(params.toArray(new NameValuePair[0]));
int rspCode = client.executeMethod(post);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("rspCode: " + rspCode);
- LOGGER.debug("\nSending 'POST' request to URL : " + url);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("rspCode: " + rspCode);
+ LOG.debug("\nSending 'POST' request to URL : " + url);
- LOGGER.debug("Post parameters : " + params);
- LOGGER.debug("Response Code : " + rspCode);
+ LOG.debug("Post parameters : " + params);
+ LOG.debug("Response Code : " + rspCode);
for (Header header : post.getRequestHeaders()) {
- LOGGER.debug("Response headers : " + header);
+ LOG.debug("Response headers : " + header);
}
}
String rst = IOUtils.toString(post.getResponseBodyAsStream());
- LOGGER.debug("login post result: " + rst);
+ LOG.debug("login post result: " + rst);
} finally {
if (post != null) {
post.releaseConnection();
@@ -163,7 +164,7 @@ public class HttpFormAuthentication {
String policy = formConfigurer.getCookiePolicy();
Object p = FieldUtils.readDeclaredStaticField(CookiePolicy.class, policy);
if (null != p) {
- LOGGER.debug("reflection of cookie value: " + p.toString());
+ LOG.debug("reflection of cookie value: " + p.toString());
params.setParameter(HttpMethodParams.COOKIE_POLICY, p);
}
}
@@ -207,12 +208,12 @@ public class HttpFormAuthentication {
Document doc = Jsoup.parse(pageContent);
Element loginform = doc.getElementById(authConfigurer.getLoginFormId());
if (loginform == null) {
- LOGGER.debug("No form element found with 'id' = {}, trying 'name'.",
+ LOG.debug("No form element found with 'id' = {}, trying 'name'.",
authConfigurer.getLoginFormId());
loginform = doc
.select("form[name=" + authConfigurer.getLoginFormId() + "]").first();
if (loginform == null) {
- LOGGER.debug("No form element found with 'name' = {}",
+ LOG.debug("No form element found with 'name' = {}",
authConfigurer.getLoginFormId());
throw new IllegalArgumentException(
"No form exists: " + authConfigurer.getLoginFormId());
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java
index 9449fa1..14751ff 100644
--- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java
+++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/Http.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.interactiveselenium;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URL;
import org.apache.hadoop.conf.Configuration;
@@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory;
public class Http extends HttpBase {
- public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public Http() {
super(LOG);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java
index f3c0f6f..2ca563a 100644
--- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java
+++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefalultMultiInteractionHandler.java
@@ -16,6 +16,8 @@
*/
package org.apache.nutch.protocol.interactiveselenium;
+import java.lang.invoke.MethodHandles;
+
import org.apache.hadoop.util.StringUtils;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
@@ -30,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class DefalultMultiInteractionHandler implements
InteractiveSeleniumHandler {
private static final Logger LOG = LoggerFactory
- .getLogger(DefalultMultiInteractionHandler.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public String processDriver(WebDriver driver) {
// loop and get multiple pages in this string
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java
index e3423d5..50225c3 100644
--- a/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java
+++ b/src/plugin/protocol-interactiveselenium/src/java/org/apache/nutch/protocol/interactiveselenium/handlers/DefaultClickAllAjaxLinksHandler.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.protocol.interactiveselenium;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public class DefaultClickAllAjaxLinksHandler implements InteractiveSeleniumHandler {
private static final Logger LOG = LoggerFactory
- .getLogger(DefaultClickAllAjaxLinksHandler.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public String processDriver(WebDriver driver) {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java
----------------------------------------------------------------------
diff --git a/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java b/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java
index 7726bdf..41fd5b1 100644
--- a/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java
+++ b/src/plugin/protocol-selenium/src/java/org/apache/nutch/protocol/selenium/Http.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol.selenium;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URL;
import org.apache.hadoop.conf.Configuration;
@@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory;
public class Http extends HttpBase {
- public static final Logger LOG = LoggerFactory.getLogger(Http.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public Http() {
super(LOG);
[3/3] nutch git commit: NUTCH-2352 Logging with generic class name,
closes #172
Posted by sn...@apache.org.
NUTCH-2352 Logging with generic class name, closes #172
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/2b93a66f
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/2b93a66f
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/2b93a66f
Branch: refs/heads/master
Commit: 2b93a66f0472e93223c69053d5482dcbef26de6d
Parents: f351790
Author: kamaci <fu...@gmail.com>
Authored: Wed Jan 18 23:00:06 2017 +0200
Committer: Sebastian Nagel <sn...@apache.org>
Committed: Thu Jan 19 21:28:15 2017 +0100
----------------------------------------------------------------------
.../nutch/crawl/AbstractFetchSchedule.java | 4 ++-
.../nutch/crawl/AdaptiveFetchSchedule.java | 6 +++--
src/java/org/apache/nutch/crawl/CrawlDb.java | 4 ++-
.../org/apache/nutch/crawl/CrawlDbFilter.java | 4 ++-
.../org/apache/nutch/crawl/CrawlDbMerger.java | 3 ++-
.../org/apache/nutch/crawl/CrawlDbReader.java | 4 ++-
.../org/apache/nutch/crawl/CrawlDbReducer.java | 5 ++--
.../apache/nutch/crawl/DeduplicationJob.java | 5 ++--
.../nutch/crawl/FetchScheduleFactory.java | 6 +++--
src/java/org/apache/nutch/crawl/Generator.java | 4 ++-
src/java/org/apache/nutch/crawl/Injector.java | 4 ++-
src/java/org/apache/nutch/crawl/LinkDb.java | 4 ++-
.../org/apache/nutch/crawl/LinkDbFilter.java | 4 ++-
.../org/apache/nutch/crawl/LinkDbMerger.java | 4 ++-
.../org/apache/nutch/crawl/LinkDbReader.java | 4 ++-
.../nutch/crawl/MimeAdaptiveFetchSchedule.java | 5 ++--
.../apache/nutch/crawl/SignatureFactory.java | 4 ++-
.../org/apache/nutch/crawl/URLPartitioner.java | 3 ++-
.../org/apache/nutch/fetcher/FetchItem.java | 4 ++-
.../apache/nutch/fetcher/FetchItemQueue.java | 6 +++--
.../apache/nutch/fetcher/FetchItemQueues.java | 6 +++--
src/java/org/apache/nutch/fetcher/Fetcher.java | 4 ++-
.../org/apache/nutch/fetcher/FetcherThread.java | 6 +++--
.../nutch/fetcher/FetcherThreadPublisher.java | 5 +++-
.../org/apache/nutch/fetcher/QueueFeeder.java | 5 ++--
.../org/apache/nutch/hostdb/ReadHostDb.java | 4 ++-
.../org/apache/nutch/hostdb/ResolverThread.java | 4 ++-
.../org/apache/nutch/hostdb/UpdateHostDb.java | 4 ++-
.../apache/nutch/hostdb/UpdateHostDbMapper.java | 6 +++--
.../nutch/hostdb/UpdateHostDbReducer.java | 4 ++-
.../org/apache/nutch/indexer/CleaningJob.java | 4 ++-
.../org/apache/nutch/indexer/IndexWriters.java | 4 ++-
.../apache/nutch/indexer/IndexerMapReduce.java | 5 ++--
.../apache/nutch/indexer/IndexingFilters.java | 6 +++--
.../nutch/indexer/IndexingFiltersChecker.java | 5 ++--
.../org/apache/nutch/indexer/IndexingJob.java | 4 ++-
.../apache/nutch/net/URLExemptionFilters.java | 5 +++-
.../org/apache/nutch/net/URLNormalizers.java | 5 ++--
.../apache/nutch/parse/OutlinkExtractor.java | 3 ++-
.../apache/nutch/parse/ParseOutputFormat.java | 3 ++-
.../apache/nutch/parse/ParsePluginsReader.java | 5 ++--
.../org/apache/nutch/parse/ParseResult.java | 4 ++-
.../org/apache/nutch/parse/ParseSegment.java | 4 ++-
src/java/org/apache/nutch/parse/ParseUtil.java | 4 ++-
.../org/apache/nutch/parse/ParserChecker.java | 4 ++-
.../org/apache/nutch/parse/ParserFactory.java | 4 ++-
.../apache/nutch/plugin/PluginDescriptor.java | 5 ++--
.../apache/nutch/plugin/PluginRepository.java | 5 ++--
.../apache/nutch/protocol/ProtocolFactory.java | 5 ++--
.../apache/nutch/protocol/RobotRulesParser.java | 5 ++--
.../apache/nutch/publisher/NutchPublishers.java | 5 +++-
.../nutch/scoring/webgraph/LinkDumper.java | 4 ++-
.../apache/nutch/scoring/webgraph/LinkRank.java | 4 ++-
.../nutch/scoring/webgraph/NodeDumper.java | 4 ++-
.../nutch/scoring/webgraph/ScoreUpdater.java | 4 ++-
.../apache/nutch/scoring/webgraph/WebGraph.java | 4 ++-
.../apache/nutch/segment/SegmentChecker.java | 5 ++--
.../nutch/segment/SegmentMergeFilters.java | 3 ++-
.../org/apache/nutch/segment/SegmentMerger.java | 3 ++-
.../org/apache/nutch/segment/SegmentReader.java | 4 ++-
.../org/apache/nutch/service/NutchReader.java | 6 +++--
.../org/apache/nutch/service/NutchServer.java | 4 ++-
.../apache/nutch/service/impl/JobWorker.java | 4 ++-
.../nutch/service/resources/AdminResource.java | 3 ++-
.../nutch/service/resources/SeedResource.java | 7 ++---
.../nutch/tools/AbstractCommonCrawlFormat.java | 4 ++-
.../nutch/tools/CommonCrawlDataDumper.java | 3 ++-
src/java/org/apache/nutch/tools/DmozParser.java | 4 ++-
src/java/org/apache/nutch/tools/FileDumper.java | 5 ++--
.../org/apache/nutch/tools/FreeGenerator.java | 3 ++-
.../org/apache/nutch/tools/ResolveUrls.java | 4 ++-
.../apache/nutch/tools/arc/ArcRecordReader.java | 5 ++--
.../nutch/tools/arc/ArcSegmentCreator.java | 5 ++--
.../apache/nutch/tools/warc/WARCExporter.java | 4 ++-
.../apache/nutch/util/CrawlCompletionStats.java | 3 ++-
.../org/apache/nutch/util/DeflateUtils.java | 4 ++-
src/java/org/apache/nutch/util/DomUtil.java | 4 ++-
.../org/apache/nutch/util/DumpFileUtil.java | 5 ++--
.../org/apache/nutch/util/EncodingDetector.java | 5 ++--
src/java/org/apache/nutch/util/GZIPUtils.java | 4 ++-
src/java/org/apache/nutch/util/JexlUtil.java | 4 ++-
src/java/org/apache/nutch/util/MimeUtil.java | 5 ++--
src/java/org/apache/nutch/util/ObjectCache.java | 4 ++-
.../nutch/util/ProtocolStatusStatistics.java | 3 ++-
.../nutch/util/domain/DomainStatistics.java | 3 ++-
.../nutch/util/domain/DomainSuffixes.java | 3 ++-
.../nutch/util/domain/DomainSuffixesReader.java | 3 ++-
.../nutch/webui/client/impl/CrawlingCycle.java | 6 +++--
.../client/impl/RemoteCommandExecutor.java | 6 +++--
.../webui/service/impl/CrawlServiceImpl.java | 6 +++--
.../webui/service/impl/NutchServiceImpl.java | 7 ++---
.../creativecommons/nutch/CCIndexingFilter.java | 5 ++--
.../creativecommons/nutch/CCParseFilter.java | 4 ++-
.../org/apache/nutch/parse/feed/FeedParser.java | 4 ++-
.../apache/nutch/parse/feed/TestFeedParser.java | 5 ++--
.../indexer/anchor/AnchorIndexingFilter.java | 5 ++--
.../indexer/basic/BasicIndexingFilter.java | 5 ++--
.../indexer/geoip/GeoIPIndexingFilter.java | 3 ++-
.../indexer/links/LinksIndexingFilter.java | 7 +++--
.../nutch/indexer/more/MoreIndexingFilter.java | 5 ++--
.../cloudsearch/CloudSearchIndexWriter.java | 5 ++--
.../indexwriter/dummy/DummyIndexWriter.java | 5 ++--
.../indexwriter/elastic/ElasticIndexWriter.java | 4 ++-
.../nutch/indexwriter/solr/SolrIndexWriter.java | 5 ++--
.../indexwriter/solr/SolrMappingReader.java | 4 ++-
.../nutch/indexwriter/solr/SolrUtils.java | 6 +++--
.../nutch/analysis/lang/HTMLLanguageParser.java | 5 ++--
.../protocol/htmlunit/HtmlUnitWebDriver.java | 4 ++-
.../nutch/protocol/http/api/HttpBase.java | 27 +++++++++++---------
.../protocol/http/api/HttpRobotRulesParser.java | 5 ++--
.../nutch/urlfilter/api/RegexURLFilterBase.java | 5 ++--
.../urlfilter/api/RegexURLFilterBaseTest.java | 5 ++--
.../nutch/protocol/selenium/HttpWebClient.java | 4 ++-
.../nutch/microformats/reltag/RelTagParser.java | 4 ++-
.../indexer/filter/MimeTypeIndexingFilter.java | 3 ++-
.../org/apache/nutch/parse/ext/ExtParser.java | 5 ++--
.../org/apache/nutch/parse/html/HtmlParser.java | 5 ++--
.../apache/nutch/parse/html/TestHtmlParser.java | 5 ++--
.../apache/nutch/parse/js/JSParseFilter.java | 4 ++-
.../org/apache/nutch/parse/swf/SWFParser.java | 5 ++--
.../org/apache/nutch/parse/tika/TikaParser.java | 4 ++-
.../org/apache/nutch/tika/TestFeedParser.java | 6 +++--
.../org/apache/nutch/parse/zip/ZipParser.java | 4 ++-
.../nutch/parse/zip/ZipTextExtractor.java | 5 ++--
.../naivebayes/NaiveBayesParseFilter.java | 3 ++-
.../parsefilter/regex/RegexParseFilter.java | 6 +++--
.../org/apache/nutch/protocol/file/File.java | 4 ++-
.../java/org/apache/nutch/protocol/ftp/Ftp.java | 4 ++-
.../nutch/protocol/ftp/FtpRobotRulesParser.java | 5 ++--
.../apache/nutch/protocol/htmlunit/Http.java | 4 ++-
.../org/apache/nutch/protocol/http/Http.java | 4 ++-
.../DummySSLProtocolSocketFactory.java | 3 ++-
.../httpclient/DummyX509TrustManager.java | 3 ++-
.../apache/nutch/protocol/httpclient/Http.java | 4 ++-
.../httpclient/HttpAuthenticationFactory.java | 5 ++--
.../httpclient/HttpBasicAuthentication.java | 5 ++--
.../httpclient/HttpFormAuthentication.java | 27 ++++++++++----------
.../protocol/interactiveselenium/Http.java | 4 ++-
.../DefalultMultiInteractionHandler.java | 4 ++-
.../DefaultClickAllAjaxLinksHandler.java | 3 ++-
.../apache/nutch/protocol/selenium/Http.java | 4 ++-
.../rabbitmq/RabbitMQPublisherImpl.java | 5 +++-
.../nutch/scoring/opic/OPICScoringFilter.java | 5 ++--
.../similarity/cosine/CosineSimilarity.java | 7 ++---
.../nutch/scoring/similarity/cosine/Model.java | 6 +++--
.../nutch/collection/CollectionManager.java | 4 ++-
.../SubcollectionIndexingFilter.java | 6 +++--
.../nutch/indexer/tld/TLDIndexingFilter.java | 5 ++--
.../nutch/urlfilter/domain/DomainURLFilter.java | 3 ++-
.../DomainBlacklistURLFilter.java | 3 ++-
.../ignoreexempt/ExemptionUrlFilter.java | 5 ++--
.../nutch/urlfilter/prefix/PrefixURLFilter.java | 3 ++-
.../nutch/urlfilter/suffix/SuffixURLFilter.java | 3 ++-
.../indexer/urlmeta/URLMetaIndexingFilter.java | 4 ++-
.../scoring/urlmeta/URLMetaScoringFilter.java | 3 ++-
.../urlnormalizer/ajax/AjaxURLNormalizer.java | 4 ++-
.../urlnormalizer/basic/BasicURLNormalizer.java | 5 ++--
.../urlnormalizer/host/HostURLNormalizer.java | 3 ++-
.../protocol/ProtocolURLNormalizer.java | 4 ++-
.../querystring/QuerystringURLNormalizer.java | 3 ++-
.../urlnormalizer/regex/RegexURLNormalizer.java | 3 ++-
.../regex/TestRegexURLNormalizer.java | 3 ++-
.../urlnormalizer/slash/SlashURLNormalizer.java | 4 ++-
.../nutch/crawl/ContinuousCrawlTestUtil.java | 3 ++-
.../org/apache/nutch/crawl/CrawlDBTestUtil.java | 3 ++-
.../nutch/crawl/CrawlDbUpdateTestDriver.java | 3 ++-
.../apache/nutch/crawl/CrawlDbUpdateUtil.java | 3 ++-
.../nutch/crawl/TODOTestCrawlDbStates.java | 4 ++-
.../apache/nutch/crawl/TestCrawlDbMerger.java | 18 +++++++------
.../apache/nutch/crawl/TestCrawlDbStates.java | 3 ++-
.../apache/nutch/crawl/TestLinkDbMerger.java | 18 +++++++------
.../nutch/indexer/TestIndexerMapReduce.java | 4 ++-
.../segment/TestSegmentMergerCrawlDatums.java | 3 ++-
.../apache/nutch/service/TestNutchServer.java | 4 ++-
.../nutch/tools/proxy/LogDebugHandler.java | 3 ++-
.../apache/nutch/tools/proxy/ProxyTestbed.java | 4 ++-
.../nutch/tools/proxy/SegmentHandler.java | 3 ++-
177 files changed, 556 insertions(+), 280 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
index c259419..0e4eafa 100755
--- a/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
+++ b/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
@@ -24,6 +24,8 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.io.Text;
import org.apache.nutch.crawl.CrawlDatum;
+import java.lang.invoke.MethodHandles;
+
/**
* This class provides common methods for implementations of
* <code>FetchSchedule</code>.
@@ -33,7 +35,7 @@ import org.apache.nutch.crawl.CrawlDatum;
public abstract class AbstractFetchSchedule extends Configured implements
FetchSchedule {
private static final Logger LOG = LoggerFactory
- .getLogger(AbstractFetchSchedule.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
protected int defaultInterval;
protected int maxInterval;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java b/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java
index a4119ff..73655a0 100755
--- a/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java
+++ b/src/java/org/apache/nutch/crawl/AdaptiveFetchSchedule.java
@@ -27,6 +27,8 @@ import org.apache.nutch.util.NutchConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
/**
* This class implements an adaptive re-fetch algorithm. This works as follows:
* <ul>
@@ -63,8 +65,8 @@ import org.slf4j.LoggerFactory;
public class AdaptiveFetchSchedule extends AbstractFetchSchedule {
// Loggg
- public static final Logger LOG = LoggerFactory
- .getLogger(AbstractFetchSchedule.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected float INC_RATE;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDb.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/CrawlDb.java b/src/java/org/apache/nutch/crawl/CrawlDb.java
index 1537cdc..08461b7 100644
--- a/src/java/org/apache/nutch/crawl/CrawlDb.java
+++ b/src/java/org/apache/nutch/crawl/CrawlDb.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -44,7 +45,8 @@ import org.apache.nutch.util.TimingUtil;
* accordingly.
*/
public class CrawlDb extends NutchTool implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(CrawlDb.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String CRAWLDB_ADDITIONS_ALLOWED = "db.update.additions.allowed";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/CrawlDbFilter.java b/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
index de4c37b..0b9cac3 100644
--- a/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
+++ b/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +56,8 @@ public class CrawlDbFilter implements
private String scope;
- public static final Logger LOG = LoggerFactory.getLogger(CrawlDbFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public void configure(JobConf job) {
urlFiltering = job.getBoolean(URL_FILTERING, false);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/CrawlDbMerger.java b/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
index cd775d8..9e3de81 100644
--- a/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
+++ b/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Map.Entry;
@@ -57,7 +58,7 @@ import org.apache.nutch.util.TimingUtil;
*/
public class CrawlDbMerger extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(CrawlDbMerger.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public static class Merger extends MapReduceBase implements
Reducer<Text, CrawlDatum, Text, CrawlDatum> {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/CrawlDbReader.java b/src/java/org/apache/nutch/crawl/CrawlDbReader.java
index 5db5f95..d93b971 100644
--- a/src/java/org/apache/nutch/crawl/CrawlDbReader.java
+++ b/src/java/org/apache/nutch/crawl/CrawlDbReader.java
@@ -21,6 +21,7 @@ import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.Date;
import java.util.HashMap;
@@ -82,7 +83,8 @@ import org.apache.commons.lang.time.DateUtils;
*/
public class CrawlDbReader extends Configured implements Closeable, Tool {
- public static final Logger LOG = LoggerFactory.getLogger(CrawlDbReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private MapFile.Reader[] readers = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/CrawlDbReducer.java b/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
index 1ae73b8..76a7bc9 100644
--- a/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
+++ b/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -37,8 +38,8 @@ import org.apache.nutch.scoring.ScoringFilters;
/** Merge new page entries with existing entries. */
public class CrawlDbReducer implements
Reducer<Text, CrawlDatum, Text, CrawlDatum> {
- public static final Logger LOG = LoggerFactory
- .getLogger(CrawlDbReducer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private int retryMax;
private CrawlDatum result = new CrawlDatum();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/DeduplicationJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/DeduplicationJob.java b/src/java/org/apache/nutch/crawl/DeduplicationJob.java
index c439570..b908e41 100644
--- a/src/java/org/apache/nutch/crawl/DeduplicationJob.java
+++ b/src/java/org/apache/nutch/crawl/DeduplicationJob.java
@@ -18,6 +18,7 @@ package org.apache.nutch.crawl;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
import java.util.HashMap;
@@ -67,8 +68,8 @@ import org.slf4j.LoggerFactory;
***/
public class DeduplicationJob extends NutchTool implements Tool {
- public static final Logger LOG = LoggerFactory
- .getLogger(DeduplicationJob.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private final static Text urlKey = new Text("_URLTEMPKEY_");
private final static String DEDUPLICATION_GROUP_MODE = "deduplication.group.mode";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
index 7a84524..09a2fd8 100755
--- a/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
+++ b/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
@@ -22,11 +22,13 @@ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.nutch.util.ObjectCache;
+import java.lang.invoke.MethodHandles;
+
/** Creates and caches a {@link FetchSchedule} implementation. */
public class FetchScheduleFactory {
- public static final Logger LOG = LoggerFactory
- .getLogger(FetchScheduleFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private FetchScheduleFactory() {
} // no public ctor
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/Generator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/Generator.java b/src/java/org/apache/nutch/crawl/Generator.java
index 9a82089..971e1ff 100644
--- a/src/java/org/apache/nutch/crawl/Generator.java
+++ b/src/java/org/apache/nutch/crawl/Generator.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.net.*;
import java.util.*;
import java.text.*;
@@ -59,7 +60,8 @@ import org.apache.nutch.util.URLUtil;
**/
public class Generator extends NutchTool implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(Generator.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String GENERATE_UPDATE_CRAWLDB = "generate.update.crawldb";
public static final String GENERATOR_MIN_SCORE = "generate.min.score";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/Injector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/Injector.java b/src/java/org/apache/nutch/crawl/Injector.java
index 6575782..0d12ab1 100644
--- a/src/java/org/apache/nutch/crawl/Injector.java
+++ b/src/java/org/apache/nutch/crawl/Injector.java
@@ -50,6 +50,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
@@ -82,7 +83,8 @@ import java.util.Random;
* </p>
**/
public class Injector extends NutchTool implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(Injector.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** metadata key reserved for setting a custom score for a specific URL */
public static String nutchScoreMDName = "nutch.score";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDb.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/LinkDb.java b/src/java/org/apache/nutch/crawl/LinkDb.java
index 908a8e9..f1be66f 100644
--- a/src/java/org/apache/nutch/crawl/LinkDb.java
+++ b/src/java/org/apache/nutch/crawl/LinkDb.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
import java.net.*;
@@ -46,7 +47,8 @@ import org.apache.nutch.util.TimingUtil;
public class LinkDb extends NutchTool implements Tool,
Mapper<Text, ParseData, Text, Inlinks> {
- public static final Logger LOG = LoggerFactory.getLogger(LinkDb.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String IGNORE_INTERNAL_LINKS = "linkdb.ignore.internal.links";
public static final String IGNORE_EXTERNAL_LINKS = "linkdb.ignore.external.links";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/LinkDbFilter.java b/src/java/org/apache/nutch/crawl/LinkDbFilter.java
index 1ff9b05..d2bb457 100644
--- a/src/java/org/apache/nutch/crawl/LinkDbFilter.java
+++ b/src/java/org/apache/nutch/crawl/LinkDbFilter.java
@@ -18,6 +18,7 @@
package org.apache.nutch.crawl;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import org.slf4j.Logger;
@@ -53,7 +54,8 @@ public class LinkDbFilter implements Mapper<Text, Inlinks, Text, Inlinks> {
private String scope;
- public static final Logger LOG = LoggerFactory.getLogger(LinkDbFilter.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Text newKey = new Text();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbMerger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/LinkDbMerger.java b/src/java/org/apache/nutch/crawl/LinkDbMerger.java
index 39923ac..21a1c6f 100644
--- a/src/java/org/apache/nutch/crawl/LinkDbMerger.java
+++ b/src/java/org/apache/nutch/crawl/LinkDbMerger.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
@@ -69,7 +70,8 @@ import org.apache.nutch.util.TimingUtil;
*/
public class LinkDbMerger extends Configured implements Tool,
Reducer<Text, Inlinks, Text, Inlinks> {
- private static final Logger LOG = LoggerFactory.getLogger(LinkDbMerger.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private int maxInlinks;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/LinkDbReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/LinkDbReader.java b/src/java/org/apache/nutch/crawl/LinkDbReader.java
index 2e50e9a..170f2e0 100644
--- a/src/java/org/apache/nutch/crawl/LinkDbReader.java
+++ b/src/java/org/apache/nutch/crawl/LinkDbReader.java
@@ -19,6 +19,7 @@ package org.apache.nutch.crawl;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -44,7 +45,8 @@ import java.io.Closeable;
/** . */
public class LinkDbReader extends Configured implements Tool, Closeable {
- public static final Logger LOG = LoggerFactory.getLogger(LinkDbReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final Partitioner<WritableComparable, Writable> PARTITIONER = new HashPartitioner<WritableComparable, Writable>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java b/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java
index 4fe5cef..96452ae 100644
--- a/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java
+++ b/src/java/org/apache/nutch/crawl/MimeAdaptiveFetchSchedule.java
@@ -20,6 +20,7 @@ package org.apache.nutch.crawl;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.apache.commons.lang.StringUtils;
@@ -51,8 +52,8 @@ import org.slf4j.LoggerFactory;
*/
public class MimeAdaptiveFetchSchedule extends AdaptiveFetchSchedule {
// Loggg
- public static final Logger LOG = LoggerFactory
- .getLogger(MimeAdaptiveFetchSchedule.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
// Conf directives
public static final String SCHEDULE_INC_RATE = "db.fetch.schedule.adaptive.inc_rate";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/SignatureFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/SignatureFactory.java b/src/java/org/apache/nutch/crawl/SignatureFactory.java
index 16d8cc0..1966ca2 100644
--- a/src/java/org/apache/nutch/crawl/SignatureFactory.java
+++ b/src/java/org/apache/nutch/crawl/SignatureFactory.java
@@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.nutch.util.ObjectCache;
+import java.lang.invoke.MethodHandles;
+
/**
* Factory class, which instantiates a Signature implementation according to the
* current Configuration configuration. This newly created instance is cached in
@@ -34,7 +36,7 @@ import org.apache.nutch.util.ObjectCache;
*/
public class SignatureFactory {
private static final Logger LOG = LoggerFactory
- .getLogger(SignatureFactory.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private SignatureFactory() {
} // no public ctor
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/crawl/URLPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/crawl/URLPartitioner.java b/src/java/org/apache/nutch/crawl/URLPartitioner.java
index 4675f83..fcf5f70 100644
--- a/src/java/org/apache/nutch/crawl/URLPartitioner.java
+++ b/src/java/org/apache/nutch/crawl/URLPartitioner.java
@@ -17,6 +17,7 @@
package org.apache.nutch.crawl;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.URL;
import java.net.MalformedURLException;
@@ -35,7 +36,7 @@ import org.apache.nutch.util.URLUtil;
*/
public class URLPartitioner implements Partitioner<Text, Writable> {
private static final Logger LOG = LoggerFactory
- .getLogger(URLPartitioner.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String PARTITION_MODE_KEY = "partition.url.mode";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItem.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetchItem.java b/src/java/org/apache/nutch/fetcher/FetchItem.java
index 3ad4970..538fc5f 100644
--- a/src/java/org/apache/nutch/fetcher/FetchItem.java
+++ b/src/java/org/apache/nutch/fetcher/FetchItem.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.fetcher;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
@@ -31,7 +32,8 @@ import org.slf4j.Logger;
*/
public class FetchItem {
- private static final Logger LOG = LoggerFactory.getLogger(FetchItem.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
int outlinkDepth = 0;
String queueID;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItemQueue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetchItemQueue.java b/src/java/org/apache/nutch/fetcher/FetchItemQueue.java
index 182c063..435996b 100644
--- a/src/java/org/apache/nutch/fetcher/FetchItemQueue.java
+++ b/src/java/org/apache/nutch/fetcher/FetchItemQueue.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.fetcher;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -32,8 +33,9 @@ import org.slf4j.LoggerFactory;
* progress and elapsed time between requests.
*/
public class FetchItemQueue {
-
- private static final Logger LOG = LoggerFactory.getLogger(FetchItemQueues.class);
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
List<FetchItem> queue = Collections
.synchronizedList(new LinkedList<FetchItem>());
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetchItemQueues.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetchItemQueues.java b/src/java/org/apache/nutch/fetcher/FetchItemQueues.java
index 4473ff0..86549cc 100644
--- a/src/java/org/apache/nutch/fetcher/FetchItemQueues.java
+++ b/src/java/org/apache/nutch/fetcher/FetchItemQueues.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.fetcher;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -33,8 +34,9 @@ import org.slf4j.LoggerFactory;
*/
public class FetchItemQueues {
- private static final Logger LOG = LoggerFactory.getLogger(FetchItemQueues.class);
-
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
+
public static final String DEFAULT_ID = "default";
Map<String, FetchItemQueue> queues = new HashMap<String, FetchItemQueue>();
AtomicInteger totalSize = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/Fetcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/Fetcher.java b/src/java/org/apache/nutch/fetcher/Fetcher.java
index 17f5a93..56a7d1c 100644
--- a/src/java/org/apache/nutch/fetcher/Fetcher.java
+++ b/src/java/org/apache/nutch/fetcher/Fetcher.java
@@ -18,6 +18,7 @@ package org.apache.nutch.fetcher;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -86,7 +87,8 @@ MapRunnable<Text, CrawlDatum, Text, NutchWritable> {
public static final String PROTOCOL_REDIR = "protocol";
- public static final Logger LOG = LoggerFactory.getLogger(Fetcher.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static class InputFormat extends
SequenceFileInputFormat<Text, CrawlDatum> {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetcherThread.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetcherThread.java b/src/java/org/apache/nutch/fetcher/FetcherThread.java
index 5a1425d..544ec2f 100644
--- a/src/java/org/apache/nutch/fetcher/FetcherThread.java
+++ b/src/java/org/apache/nutch/fetcher/FetcherThread.java
@@ -17,6 +17,7 @@
package org.apache.nutch.fetcher;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -72,8 +73,9 @@ import crawlercommons.robots.BaseRobotRules;
* This class picks items from queues and fetches the pages.
*/
public class FetcherThread extends Thread {
-
- private static final Logger LOG = LoggerFactory.getLogger(FetcherThread.class);
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
private URLFilters urlFilters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java b/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java
index 2832017..8dd2011 100644
--- a/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java
+++ b/src/java/org/apache/nutch/fetcher/FetcherThreadPublisher.java
@@ -21,6 +21,8 @@ import org.apache.nutch.publisher.NutchPublishers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
/**
* This class handles the publishing of the events to the queue implementation.
*
@@ -28,7 +30,8 @@ import org.slf4j.LoggerFactory;
public class FetcherThreadPublisher {
private static NutchPublishers publisher;
- private static final Logger LOG = LoggerFactory.getLogger(FetcherThreadPublisher.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Configure all registered publishers
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/fetcher/QueueFeeder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/QueueFeeder.java b/src/java/org/apache/nutch/fetcher/QueueFeeder.java
index 79652e7..c2b39c7 100644
--- a/src/java/org/apache/nutch/fetcher/QueueFeeder.java
+++ b/src/java/org/apache/nutch/fetcher/QueueFeeder.java
@@ -17,6 +17,7 @@
package org.apache.nutch.fetcher;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.RecordReader;
@@ -29,9 +30,9 @@ import org.slf4j.LoggerFactory;
* are consumed by FetcherThread-s.
*/
public class QueueFeeder extends Thread {
-
- private static final Logger LOG = LoggerFactory.getLogger(QueueFeeder.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private RecordReader<Text, CrawlDatum> reader;
private FetchItemQueues queues;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/ReadHostDb.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/hostdb/ReadHostDb.java b/src/java/org/apache/nutch/hostdb/ReadHostDb.java
index 240e109..ab3ec0c 100644
--- a/src/java/org/apache/nutch/hostdb/ReadHostDb.java
+++ b/src/java/org/apache/nutch/hostdb/ReadHostDb.java
@@ -17,6 +17,7 @@
package org.apache.nutch.hostdb;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Map;
@@ -56,7 +57,8 @@ import org.apache.commons.jexl2.MapContext;
*/
public class ReadHostDb extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(ReadHostDb.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String HOSTDB_DUMP_HOSTNAMES = "hostdb.dump.hostnames";
public static final String HOSTDB_DUMP_HOMEPAGES = "hostdb.dump.homepages";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/ResolverThread.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/hostdb/ResolverThread.java b/src/java/org/apache/nutch/hostdb/ResolverThread.java
index e7c7978..7d05230 100644
--- a/src/java/org/apache/nutch/hostdb/ResolverThread.java
+++ b/src/java/org/apache/nutch/hostdb/ResolverThread.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.hostdb;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -32,7 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class ResolverThread implements Runnable {
- public static final Logger LOG = LoggerFactory.getLogger(ResolverThread.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected String host = null;
protected HostDatum datum = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDb.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDb.java b/src/java/org/apache/nutch/hostdb/UpdateHostDb.java
index 3ba3c81..519b51b 100644
--- a/src/java/org/apache/nutch/hostdb/UpdateHostDb.java
+++ b/src/java/org/apache/nutch/hostdb/UpdateHostDb.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.hostdb;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Random;
@@ -61,7 +62,8 @@ import org.slf4j.LoggerFactory;
*/
public class UpdateHostDb extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDb.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String LOCK_NAME = ".locked";
public static final String HOSTDB_PURGE_FAILED_HOSTS_THRESHOLD = "hostdb.purge.failed.hosts.threshold";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java b/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java
index 5844b04..593bd15 100644
--- a/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java
+++ b/src/java/org/apache/nutch/hostdb/UpdateHostDbMapper.java
@@ -17,6 +17,7 @@
package org.apache.nutch.hostdb;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.FloatWritable;
@@ -46,8 +47,9 @@ import org.slf4j.LoggerFactory;
*/
public class UpdateHostDbMapper
implements Mapper<Text, Writable, Text, NutchWritable> {
-
- public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDbMapper.class);
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected Text host = new Text();
protected HostDatum hostDatum = null;
protected CrawlDatum crawlDatum = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java b/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java
index 33dd18b..4577212 100644
--- a/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java
+++ b/src/java/org/apache/nutch/hostdb/UpdateHostDbReducer.java
@@ -17,6 +17,7 @@
package org.apache.nutch.hostdb;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.Iterator;
import java.util.concurrent.BlockingQueue;
@@ -51,7 +52,8 @@ import org.slf4j.LoggerFactory;
public class UpdateHostDbReducer
implements Reducer<Text, NutchWritable, Text, HostDatum> {
- public static final Logger LOG = LoggerFactory.getLogger(UpdateHostDbReducer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected ResolverThread resolverThread = null;
protected Integer numResolverThreads = 10;
protected static Integer purgeFailedHostsThreshold = -1;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/CleaningJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/CleaningJob.java b/src/java/org/apache/nutch/indexer/CleaningJob.java
index c16003a..6b3dc80 100644
--- a/src/java/org/apache/nutch/indexer/CleaningJob.java
+++ b/src/java/org/apache/nutch/indexer/CleaningJob.java
@@ -17,6 +17,7 @@
package org.apache.nutch.indexer;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Iterator;
@@ -50,7 +51,8 @@ import org.slf4j.LoggerFactory;
*/
public class CleaningJob implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(CleaningJob.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
@Override
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexWriters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexWriters.java b/src/java/org/apache/nutch/indexer/IndexWriters.java
index 681812b..d83b905 100644
--- a/src/java/org/apache/nutch/indexer/IndexWriters.java
+++ b/src/java/org/apache/nutch/indexer/IndexWriters.java
@@ -17,6 +17,7 @@
package org.apache.nutch.indexer;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.apache.hadoop.conf.Configuration;
@@ -33,7 +34,8 @@ import org.slf4j.LoggerFactory;
/** Creates and caches {@link IndexWriter} implementing plugins. */
public class IndexWriters {
- public final static Logger LOG = LoggerFactory.getLogger(IndexWriters.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private IndexWriter[] indexWriters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexerMapReduce.java b/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
index 5025525..5097215 100644
--- a/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
+++ b/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
@@ -17,6 +17,7 @@
package org.apache.nutch.indexer;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Iterator;
@@ -57,8 +58,8 @@ public class IndexerMapReduce extends Configured implements
Mapper<Text, Writable, Text, NutchWritable>,
Reducer<Text, NutchWritable, Text, NutchIndexAction> {
- public static final Logger LOG = LoggerFactory
- .getLogger(IndexerMapReduce.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String INDEXER_PARAMS = "indexer.additional.params";
public static final String INDEXER_DELETE = "indexer.delete";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingFilters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingFilters.java b/src/java/org/apache/nutch/indexer/IndexingFilters.java
index 334fcad..439658b 100644
--- a/src/java/org/apache/nutch/indexer/IndexingFilters.java
+++ b/src/java/org/apache/nutch/indexer/IndexingFilters.java
@@ -28,13 +28,15 @@ import org.apache.nutch.crawl.CrawlDatum;
import org.apache.nutch.crawl.Inlinks;
import org.apache.hadoop.io.Text;
+import java.lang.invoke.MethodHandles;
+
/** Creates and caches {@link IndexingFilter} implementing plugins. */
public class IndexingFilters {
public static final String INDEXINGFILTER_ORDER = "indexingfilter.order";
- public final static Logger LOG = LoggerFactory
- .getLogger(IndexingFilters.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private IndexingFilter[] indexingFilters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
index 2e1b9c2..2c6a1eb 100644
--- a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
+++ b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
@@ -20,6 +20,7 @@ package org.apache.nutch.indexer;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.lang.invoke.MethodHandles;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.InetSocketAddress;
@@ -74,8 +75,8 @@ public class IndexingFiltersChecker extends Configured implements Tool {
protected HashMap<String, String> metadata = new HashMap<String, String>();
protected int tcpPort = -1;
- public static final Logger LOG = LoggerFactory
- .getLogger(IndexingFiltersChecker.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public IndexingFiltersChecker() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/indexer/IndexingJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/indexer/IndexingJob.java b/src/java/org/apache/nutch/indexer/IndexingJob.java
index 342ea4a..53ab186 100644
--- a/src/java/org/apache/nutch/indexer/IndexingJob.java
+++ b/src/java/org/apache/nutch/indexer/IndexingJob.java
@@ -18,6 +18,7 @@ package org.apache.nutch.indexer;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -56,7 +57,8 @@ import org.slf4j.LoggerFactory;
public class IndexingJob extends NutchTool implements Tool {
- public static Logger LOG = LoggerFactory.getLogger(IndexingJob.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public IndexingJob() {
super(null);
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/net/URLExemptionFilters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/net/URLExemptionFilters.java b/src/java/org/apache/nutch/net/URLExemptionFilters.java
index d362f2e..93a8aee 100644
--- a/src/java/org/apache/nutch/net/URLExemptionFilters.java
+++ b/src/java/org/apache/nutch/net/URLExemptionFilters.java
@@ -24,10 +24,13 @@ import org.apache.nutch.plugin.PluginRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
/** Creates and caches {@link URLExemptionFilter} implementing plugins. */
public class URLExemptionFilters {
- private static final Logger LOG = LoggerFactory.getLogger(URLExemptionFilters.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private URLExemptionFilter[] filters;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/net/URLNormalizers.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/net/URLNormalizers.java b/src/java/org/apache/nutch/net/URLNormalizers.java
index 7a34353..c990148 100644
--- a/src/java/org/apache/nutch/net/URLNormalizers.java
+++ b/src/java/org/apache/nutch/net/URLNormalizers.java
@@ -17,6 +17,7 @@
package org.apache.nutch.net;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -117,8 +118,8 @@ public final class URLNormalizers {
/** Scope used when indexing URLs. */
public static final String SCOPE_INDEXER = "indexer";
- public static final Logger LOG = LoggerFactory
- .getLogger(URLNormalizers.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/* Empty extension list for caching purposes. */
private final List<Extension> EMPTY_EXTENSION_LIST = Collections
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/OutlinkExtractor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/OutlinkExtractor.java b/src/java/org/apache/nutch/parse/OutlinkExtractor.java
index d1773f8..b4214b5 100644
--- a/src/java/org/apache/nutch/parse/OutlinkExtractor.java
+++ b/src/java/org/apache/nutch/parse/OutlinkExtractor.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +50,7 @@ import org.apache.oro.text.regex.Perl5Matcher;
*/
public class OutlinkExtractor {
private static final Logger LOG = LoggerFactory
- .getLogger(OutlinkExtractor.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Regex pattern to get URLs within a plain text.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParseOutputFormat.java b/src/java/org/apache/nutch/parse/ParseOutputFormat.java
index 51b32fc..1ab7e3b 100644
--- a/src/java/org/apache/nutch/parse/ParseOutputFormat.java
+++ b/src/java/org/apache/nutch/parse/ParseOutputFormat.java
@@ -37,6 +37,7 @@ import org.apache.nutch.metadata.Nutch;
import org.apache.nutch.net.*;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -48,7 +49,7 @@ import org.apache.hadoop.util.Progressable;
/* Parse content in a segment. */
public class ParseOutputFormat implements OutputFormat<Text, Parse> {
private static final Logger LOG = LoggerFactory
- .getLogger(ParseOutputFormat.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private URLFilters filters;
private URLExemptionFilters exemptionFilters;
private URLNormalizers normalizers;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParsePluginsReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParsePluginsReader.java b/src/java/org/apache/nutch/parse/ParsePluginsReader.java
index daf96e0..c3b0101 100644
--- a/src/java/org/apache/nutch/parse/ParsePluginsReader.java
+++ b/src/java/org/apache/nutch/parse/ParsePluginsReader.java
@@ -18,6 +18,7 @@ package org.apache.nutch.parse;
// JDK imports
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -52,8 +53,8 @@ import org.apache.nutch.util.NutchConfiguration;
class ParsePluginsReader {
/* our log stream */
- public static final Logger LOG = LoggerFactory
- .getLogger(ParsePluginsReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** The property name of the parse-plugins location */
private static final String PP_FILE_PROP = "parse.plugin.file";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseResult.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParseResult.java b/src/java/org/apache/nutch/parse/ParseResult.java
index 92d8871..9c25da4 100644
--- a/src/java/org/apache/nutch/parse/ParseResult.java
+++ b/src/java/org/apache/nutch/parse/ParseResult.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -42,7 +43,8 @@ public class ParseResult implements Iterable<Map.Entry<Text, Parse>> {
private Map<Text, Parse> parseMap;
private String originalUrl;
- public static final Logger LOG = LoggerFactory.getLogger(ParseResult.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Create a container for parse results.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParseSegment.java b/src/java/org/apache/nutch/parse/ParseSegment.java
index 1a0da90..f6c857a 100644
--- a/src/java/org/apache/nutch/parse/ParseSegment.java
+++ b/src/java/org/apache/nutch/parse/ParseSegment.java
@@ -37,6 +37,7 @@ import org.apache.nutch.util.*;
import org.apache.hadoop.fs.Path;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Map.Entry;
@@ -46,7 +47,8 @@ public class ParseSegment extends NutchTool implements Tool,
Mapper<WritableComparable<?>, Content, Text, ParseImpl>,
Reducer<Text, Writable, Text, Writable> {
- public static final Logger LOG = LoggerFactory.getLogger(ParseSegment.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String SKIP_TRUNCATED = "parser.skip.truncated";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParseUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParseUtil.java b/src/java/org/apache/nutch/parse/ParseUtil.java
index 39024dc..bd7380d 100644
--- a/src/java/org/apache/nutch/parse/ParseUtil.java
+++ b/src/java/org/apache/nutch/parse/ParseUtil.java
@@ -18,6 +18,7 @@ package org.apache.nutch.parse;
// Commons Logging imports
+import java.lang.invoke.MethodHandles;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -42,7 +43,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
public class ParseUtil {
/* our log stream */
- public static final Logger LOG = LoggerFactory.getLogger(ParseUtil.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private ParserFactory parserFactory;
/** Parser timeout set to 30 sec by default. Set -1 to deactivate **/
private int maxParseTime = 30;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParserChecker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java
index 7e5b146..098891b 100644
--- a/src/java/org/apache/nutch/parse/ParserChecker.java
+++ b/src/java/org/apache/nutch/parse/ParserChecker.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -69,7 +70,8 @@ import org.apache.nutch.util.StringUtil;
public class ParserChecker implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(ParserChecker.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration conf;
public ParserChecker() {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/parse/ParserFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/parse/ParserFactory.java b/src/java/org/apache/nutch/parse/ParserFactory.java
index 0982de4..f333dd4 100644
--- a/src/java/org/apache/nutch/parse/ParserFactory.java
+++ b/src/java/org/apache/nutch/parse/ParserFactory.java
@@ -17,6 +17,7 @@
package org.apache.nutch.parse;
// JDK imports
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -41,7 +42,8 @@ import org.apache.nutch.util.ObjectCache;
/** Creates and caches {@link Parser} plugins. */
public final class ParserFactory {
- public static final Logger LOG = LoggerFactory.getLogger(ParserFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/** Wildcard for default plugins. */
public static final String DEFAULT_PLUGIN = "*";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/plugin/PluginDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/plugin/PluginDescriptor.java b/src/java/org/apache/nutch/plugin/PluginDescriptor.java
index 0a43745..ac2e20b 100644
--- a/src/java/org/apache/nutch/plugin/PluginDescriptor.java
+++ b/src/java/org/apache/nutch/plugin/PluginDescriptor.java
@@ -18,6 +18,7 @@ package org.apache.nutch.plugin;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
@@ -51,8 +52,8 @@ public class PluginDescriptor {
private ArrayList<URL> fNotExportedLibs = new ArrayList<URL>();
private ArrayList<Extension> fExtensions = new ArrayList<Extension>();
private PluginClassLoader fClassLoader;
- public static final Logger LOG = LoggerFactory
- .getLogger(PluginDescriptor.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private Configuration fConf;
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/plugin/PluginRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/plugin/PluginRepository.java b/src/java/org/apache/nutch/plugin/PluginRepository.java
index 3e19345..d43bf2f 100644
--- a/src/java/org/apache/nutch/plugin/PluginRepository.java
+++ b/src/java/org/apache/nutch/plugin/PluginRepository.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.plugin;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -58,8 +59,8 @@ public class PluginRepository {
private Configuration conf;
- public static final Logger LOG = LoggerFactory
- .getLogger(PluginRepository.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* @throws PluginRuntimeException
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/protocol/ProtocolFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/protocol/ProtocolFactory.java b/src/java/org/apache/nutch/protocol/ProtocolFactory.java
index 8a92d60..8da0158 100644
--- a/src/java/org/apache/nutch/protocol/ProtocolFactory.java
+++ b/src/java/org/apache/nutch/protocol/ProtocolFactory.java
@@ -17,6 +17,7 @@
package org.apache.nutch.protocol;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.net.MalformedURLException;
@@ -37,8 +38,8 @@ import org.apache.hadoop.conf.Configuration;
*/
public class ProtocolFactory {
- public static final Logger LOG = LoggerFactory
- .getLogger(ProtocolFactory.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private ExtensionPoint extensionPoint;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/protocol/RobotRulesParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/protocol/RobotRulesParser.java b/src/java/org/apache/nutch/protocol/RobotRulesParser.java
index d7eba92..c71191a 100644
--- a/src/java/org/apache/nutch/protocol/RobotRulesParser.java
+++ b/src/java/org/apache/nutch/protocol/RobotRulesParser.java
@@ -23,6 +23,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.LineNumberReader;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashSet;
@@ -60,8 +61,8 @@ import crawlercommons.robots.SimpleRobotRulesParser;
*/
public abstract class RobotRulesParser implements Tool {
- public static final Logger LOG = LoggerFactory
- .getLogger(RobotRulesParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected static final Hashtable<String, BaseRobotRules> CACHE = new Hashtable<String, BaseRobotRules>();
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/publisher/NutchPublishers.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/publisher/NutchPublishers.java b/src/java/org/apache/nutch/publisher/NutchPublishers.java
index b79c217..83b5234 100644
--- a/src/java/org/apache/nutch/publisher/NutchPublishers.java
+++ b/src/java/org/apache/nutch/publisher/NutchPublishers.java
@@ -23,9 +23,12 @@ import org.apache.nutch.plugin.PluginRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
public class NutchPublishers extends Configured implements NutchPublisher{
- private static final Logger LOG = LoggerFactory.getLogger(NutchPublishers.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private NutchPublisher[] publishers;
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java b/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
index 1569c4d..13f2299 100644
--- a/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
+++ b/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
@@ -19,6 +19,7 @@ package org.apache.nutch.scoring.webgraph;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
@@ -72,7 +73,8 @@ import org.apache.nutch.util.TimingUtil;
*/
public class LinkDumper extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(LinkDumper.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String DUMP_DIR = "linkdump";
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java b/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
index bd22828..2e80256 100644
--- a/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
+++ b/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
@@ -19,6 +19,7 @@ package org.apache.nutch.scoring.webgraph;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashSet;
@@ -69,7 +70,8 @@ import org.apache.nutch.util.URLUtil;
public class LinkRank extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(LinkRank.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String NUM_NODES = "_num_nodes_";
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java b/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
index 4a57c29..32ee1e7 100644
--- a/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
+++ b/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
@@ -17,6 +17,7 @@
package org.apache.nutch.scoring.webgraph;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Iterator;
@@ -65,7 +66,8 @@ import org.apache.nutch.util.URLUtil;
*/
public class NodeDumper extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(NodeDumper.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static enum DumpType {
INLINKS, OUTLINKS, SCORES
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java b/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
index 19704eb..3c86cf6 100644
--- a/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
+++ b/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
@@ -17,6 +17,7 @@
package org.apache.nutch.scoring.webgraph;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.Random;
@@ -65,7 +66,8 @@ public class ScoreUpdater extends Configured implements Tool,
Mapper<Text, Writable, Text, ObjectWritable>,
Reducer<Text, ObjectWritable, Text, CrawlDatum> {
- public static final Logger LOG = LoggerFactory.getLogger(ScoreUpdater.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private JobConf conf;
private float clearScore = 0.0f;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java b/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
index e2c3d8b..f40adf7 100644
--- a/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
+++ b/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
@@ -17,6 +17,7 @@
package org.apache.nutch.scoring.webgraph;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashSet;
@@ -95,7 +96,8 @@ import org.apache.nutch.util.URLUtil;
*/
public class WebGraph extends Configured implements Tool {
- public static final Logger LOG = LoggerFactory.getLogger(WebGraph.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final String LOCK_NAME = ".locked";
public static final String INLINK_DIR = "inlinks";
public static final String OUTLINK_DIR = "outlinks/current";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentChecker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/segment/SegmentChecker.java b/src/java/org/apache/nutch/segment/SegmentChecker.java
index ec601f4..8f7e8b0 100644
--- a/src/java/org/apache/nutch/segment/SegmentChecker.java
+++ b/src/java/org/apache/nutch/segment/SegmentChecker.java
@@ -17,6 +17,7 @@
package org.apache.nutch.segment;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.nutch.crawl.CrawlDatum;
import org.apache.nutch.parse.ParseText;
@@ -35,8 +36,8 @@ import org.slf4j.LoggerFactory;
*/
public class SegmentChecker {
- public static final Logger LOG = LoggerFactory
- .getLogger(SegmentChecker.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Check if the segment is indexable. May add new check methods here.
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/segment/SegmentMergeFilters.java b/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
index 7aa2de3..78b9f76 100644
--- a/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
+++ b/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.segment;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import org.slf4j.Logger;
@@ -40,7 +41,7 @@ import org.apache.nutch.protocol.Content;
*/
public class SegmentMergeFilters {
private static final Logger LOG = LoggerFactory
- .getLogger(SegmentMergeFilters.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private SegmentMergeFilter[] filters;
public SegmentMergeFilters(Configuration conf) {
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentMerger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/segment/SegmentMerger.java b/src/java/org/apache/nutch/segment/SegmentMerger.java
index ef12f52..792431f 100644
--- a/src/java/org/apache/nutch/segment/SegmentMerger.java
+++ b/src/java/org/apache/nutch/segment/SegmentMerger.java
@@ -18,6 +18,7 @@ package org.apache.nutch.segment;
import java.io.Closeable;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -127,7 +128,7 @@ public class SegmentMerger extends Configured implements Tool,
Mapper<Text, MetaWrapper, Text, MetaWrapper>,
Reducer<Text, MetaWrapper, Text, MetaWrapper> {
private static final Logger LOG = LoggerFactory
- .getLogger(SegmentMerger.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String SEGMENT_PART_KEY = "part";
private static final String SEGMENT_SLICE_KEY = "slice";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/segment/SegmentReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/segment/SegmentReader.java b/src/java/org/apache/nutch/segment/SegmentReader.java
index 9ea20be..15a5498 100644
--- a/src/java/org/apache/nutch/segment/SegmentReader.java
+++ b/src/java/org/apache/nutch/segment/SegmentReader.java
@@ -24,6 +24,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -74,7 +75,8 @@ import org.apache.nutch.util.NutchJob;
public class SegmentReader extends Configured implements Tool,
Reducer<Text, NutchWritable, Text, Text> {
- public static final Logger LOG = LoggerFactory.getLogger(SegmentReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
long recNo = 0L;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/NutchReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/service/NutchReader.java b/src/java/org/apache/nutch/service/NutchReader.java
index 00bb78f..ecc8705 100644
--- a/src/java/org/apache/nutch/service/NutchReader.java
+++ b/src/java/org/apache/nutch/service/NutchReader.java
@@ -17,6 +17,7 @@
package org.apache.nutch.service;
import java.io.FileNotFoundException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -26,8 +27,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public interface NutchReader {
-
- public static final Logger LOG = LoggerFactory.getLogger(NutchReader.class);
+
+ static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
public static final Configuration conf = NutchConfiguration.create();
public List read(String path) throws FileNotFoundException;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/NutchServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/service/NutchServer.java b/src/java/org/apache/nutch/service/NutchServer.java
index 6d531e0..8c76d40 100644
--- a/src/java/org/apache/nutch/service/NutchServer.java
+++ b/src/java/org/apache/nutch/service/NutchServer.java
@@ -17,6 +17,7 @@
package org.apache.nutch.service;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -58,7 +59,8 @@ import com.google.common.collect.Queues;
public class NutchServer {
- private static final Logger LOG = LoggerFactory.getLogger(NutchServer.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String LOCALHOST = "localhost";
private static final Integer DEFAULT_PORT = 8081;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/impl/JobWorker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/service/impl/JobWorker.java b/src/java/org/apache/nutch/service/impl/JobWorker.java
index 04821e7..6f3b09a 100644
--- a/src/java/org/apache/nutch/service/impl/JobWorker.java
+++ b/src/java/org/apache/nutch/service/impl/JobWorker.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.service.impl;
+import java.lang.invoke.MethodHandles;
import java.text.MessageFormat;
import org.apache.hadoop.conf.Configuration;
@@ -32,7 +33,8 @@ public class JobWorker implements Runnable{
private JobInfo jobInfo;
private JobConfig jobConfig;
- private static final Logger LOG = LoggerFactory.getLogger(JobWorker.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private NutchTool tool;
/**
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/resources/AdminResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/service/resources/AdminResource.java b/src/java/org/apache/nutch/service/resources/AdminResource.java
index 3f0189e..1b01b67 100644
--- a/src/java/org/apache/nutch/service/resources/AdminResource.java
+++ b/src/java/org/apache/nutch/service/resources/AdminResource.java
@@ -16,6 +16,7 @@
*/
package org.apache.nutch.service.resources;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import javax.ws.rs.GET;
@@ -32,7 +33,7 @@ public class AdminResource extends AbstractResource{
private final int DELAY_SEC = 1;
private static final Logger LOG = LoggerFactory
- .getLogger(AdminResource.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* To get the status of the Nutch Server
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/service/resources/SeedResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/service/resources/SeedResource.java b/src/java/org/apache/nutch/service/resources/SeedResource.java
index 61a0526..e8a5be3 100644
--- a/src/java/org/apache/nutch/service/resources/SeedResource.java
+++ b/src/java/org/apache/nutch/service/resources/SeedResource.java
@@ -17,6 +17,7 @@
package org.apache.nutch.service.resources;
import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Map;
@@ -41,8 +42,8 @@ import org.slf4j.LoggerFactory;
@Path("/seed")
public class SeedResource extends AbstractResource {
- private static final Logger log = LoggerFactory
- .getLogger(AdminResource.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Gets the list of seedFiles already created
@@ -84,7 +85,7 @@ public class SeedResource extends AbstractResource {
setSeedList(seedList.getName(), seedList);
return Response.ok().entity(seedFilePath).build();
} catch (Exception e) {
- log.warn("Error while creating seed : {}", e.getMessage());
+ LOG.warn("Error while creating seed : {}", e.getMessage());
}
return Response.serverError().build();
}
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java b/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java
index 1b425c4..b99a40f 100644
--- a/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java
+++ b/src/java/org/apache/nutch/tools/AbstractCommonCrawlFormat.java
@@ -19,6 +19,7 @@ package org.apache.nutch.tools;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.URLEncoder;
import java.net.UnknownHostException;
@@ -43,7 +44,8 @@ import com.ibm.icu.text.SimpleDateFormat;
*
*/
public abstract class AbstractCommonCrawlFormat implements CommonCrawlFormat {
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractCommonCrawlFormat.class.getName());
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected String url;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java b/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java
index b4fc0a7..fd52614 100644
--- a/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java
+++ b/src/java/org/apache/nutch/tools/CommonCrawlDataDumper.java
@@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
@@ -181,7 +182,7 @@ import com.ibm.icu.text.SimpleDateFormat;
public class CommonCrawlDataDumper extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(CommonCrawlDataDumper.class.getName());
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final int MAX_INLINKS = 5000;
private CommonCrawlConfig config = null;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/DmozParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/DmozParser.java b/src/java/org/apache/nutch/tools/DmozParser.java
index 54ec543..d96082b 100644
--- a/src/java/org/apache/nutch/tools/DmozParser.java
+++ b/src/java/org/apache/nutch/tools/DmozParser.java
@@ -18,6 +18,7 @@
package org.apache.nutch.tools;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import java.util.regex.*;
@@ -37,7 +38,8 @@ import org.apache.nutch.util.NutchConfiguration;
/** Utility that converts DMOZ RDF into a flat file of URLs to be injected. */
public class DmozParser {
- public static final Logger LOG = LoggerFactory.getLogger(DmozParser.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
long pages = 0;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/FileDumper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/FileDumper.java b/src/java/org/apache/nutch/tools/FileDumper.java
index b7c1805..655ed8e 100644
--- a/src/java/org/apache/nutch/tools/FileDumper.java
+++ b/src/java/org/apache/nutch/tools/FileDumper.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileFilter;
import java.io.FileOutputStream;
import java.io.ByteArrayInputStream;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -112,8 +113,8 @@ import org.slf4j.LoggerFactory;
*/
public class FileDumper {
- private static final Logger LOG = LoggerFactory.getLogger(FileDumper.class
- .getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
/**
* Dumps the reverse engineered raw content from the provided segment
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/FreeGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/FreeGenerator.java b/src/java/org/apache/nutch/tools/FreeGenerator.java
index 138372f..a004a79 100644
--- a/src/java/org/apache/nutch/tools/FreeGenerator.java
+++ b/src/java/org/apache/nutch/tools/FreeGenerator.java
@@ -18,6 +18,7 @@
package org.apache.nutch.tools;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Iterator;
@@ -60,7 +61,7 @@ import org.apache.nutch.util.TimingUtil;
*/
public class FreeGenerator extends Configured implements Tool {
private static final Logger LOG = LoggerFactory
- .getLogger(FreeGenerator.class);
+ .getLogger(MethodHandles.lookup().lookupClass());
private static final String FILTER_KEY = "free.generator.filter";
private static final String NORMALIZE_KEY = "free.generator.normalize";
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/ResolveUrls.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/ResolveUrls.java b/src/java/org/apache/nutch/tools/ResolveUrls.java
index 2b1c63b..a7b2930 100644
--- a/src/java/org/apache/nutch/tools/ResolveUrls.java
+++ b/src/java/org/apache/nutch/tools/ResolveUrls.java
@@ -19,6 +19,7 @@ package org.apache.nutch.tools;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -46,7 +47,8 @@ import org.apache.nutch.util.URLUtil;
*/
public class ResolveUrls {
- public static final Logger LOG = LoggerFactory.getLogger(ResolveUrls.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
private String urlsFile = null;
private int numThreads = 100;
http://git-wip-us.apache.org/repos/asf/nutch/blob/2b93a66f/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
index e9ff58d..03f1f37 100644
--- a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
+++ b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
@@ -18,6 +18,7 @@ package org.apache.nutch.tools.arc;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.zip.GZIPInputStream;
import org.slf4j.Logger;
@@ -54,8 +55,8 @@ import org.apache.hadoop.util.StringUtils;
*/
public class ArcRecordReader implements RecordReader<Text, BytesWritable> {
- public static final Logger LOG = LoggerFactory
- .getLogger(ArcRecordReader.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(MethodHandles.lookup().lookupClass());
protected Configuration conf;
protected long splitStart = 0;