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 <[email protected]> */ 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>();
