You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by nk...@apache.org on 2016/02/08 23:35:51 UTC
[16/50] [abbrv] lucene-solr git commit: SOLR-8330: Standardize and
fix logger creation and usage so that they aren't shared across source
files.(merge from branch_5x)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
index 5307584..5b40a2d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
@@ -44,7 +45,7 @@ import java.util.Map.Entry;
*/
public class TestSolrEntityProcessorEndToEnd extends AbstractDataImportHandlerTestCase {
- private static Logger LOG = LoggerFactory.getLogger(TestSolrEntityProcessorEndToEnd.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SOLR_CONFIG = "dataimport-solrconfig.xml";
private static final String SOLR_SCHEMA = "dataimport-schema.xml";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
index b184413..78f2444 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
@@ -32,7 +30,6 @@ import java.util.Set;
*/
public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCase {
- private static final Logger LOG = LoggerFactory.getLogger(TestSolrEntityProcessorUnit.class);
private static final String ID = "id";
public void testQuery() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
index 29e1df6..0deda51 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
@@ -1,5 +1,7 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class TestSortedMapBackedCache extends AbstractDIHCacheTestCase {
- public static Logger log = LoggerFactory.getLogger(TestSortedMapBackedCache.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Test
public void testCacheWithKeyLookup() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
index 574f5aa..28ca1fb 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
@@ -1,9 +1,13 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
+
import org.apache.solr.request.LocalSolrQueryRequest;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +30,9 @@ import org.junit.Test;
* Test with various combinations of parameters, child entities, transformers.
*/
public class TestSqlEntityProcessorDelta extends AbstractSqlEntityProcessorTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private boolean delta = false;
private boolean useParentDeltaQueryParam = false;
private IntChanges personChanges = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
index 8d5524c..8abe84d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
@@ -1,5 +1,6 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.sql.Connection;
import java.sql.Statement;
import java.util.Locale;
@@ -10,6 +11,8 @@ import junit.framework.Assert;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +33,8 @@ import org.junit.Test;
public class TestVariableResolverEndToEnd extends AbstractDIHJdbcTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Test
public void test() throws Exception {
h.query("/dataimport", generateRequest());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
index 4d5293a..ff0095d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
@@ -1,5 +1,7 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,8 +40,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestZKPropertiesWriter extends AbstractDataImportHandlerTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static ZkTestServer zkServer;
protected static String zkDir;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index cc27626..f4040a3 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.extraction;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
import org.apache.commons.io.IOUtils;
@@ -66,7 +67,7 @@ import org.xml.sax.SAXException;
**/
public class ExtractingDocumentLoader extends ContentStreamLoader {
- private static final Logger log = LoggerFactory.getLogger(ExtractingDocumentLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Extract Only supported format
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
index 4fc9e09..d1bd4c7 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -46,7 +47,7 @@ import java.util.Map;
*/
public class ExtractingRequestHandler extends ContentStreamHandlerBase implements SolrCoreAware {
- private transient static Logger log = LoggerFactory.getLogger(ExtractingRequestHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String PARSE_CONTEXT_CONFIG = "parseContext.config";
public static final String CONFIG_LOCATION = "tika.config";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java
index e67efad..ccf1c4d 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java
@@ -20,6 +20,7 @@ package org.apache.solr.handler.extraction;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
* If an explicit password is set, it will be used.
*/
public class RegexRulesPasswordProvider implements PasswordProvider {
- private static final Logger log = LoggerFactory.getLogger(RegexRulesPasswordProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private LinkedHashMap<Pattern,String> passwordMap = new LinkedHashMap<>();
private String explicitPassword;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
index efbc1e4..8e3dc25 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.extraction;
+import java.lang.invoke.MethodHandles;
import java.text.DateFormat;
import java.util.ArrayDeque;
import java.util.Collection;
@@ -57,7 +58,7 @@ import org.xml.sax.helpers.DefaultHandler;
* @see org.apache.solr.handler.extraction.ExtractingDocumentLoader
*/
public class SolrContentHandler extends DefaultHandler implements ExtractingParams {
- private transient static final Logger log = LoggerFactory.getLogger(SolrContentHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String contentFieldName = "content";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java
index b1c3cba..aae25f8 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java
@@ -17,6 +17,7 @@ package org.apache.solr.update.processor;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -30,6 +31,8 @@ import com.cybozu.labs.langdetect.DetectorFactory;
import com.cybozu.labs.langdetect.LangDetectException;
import com.cybozu.labs.langdetect.Language;
import org.apache.solr.common.SolrInputDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Identifies the language of a set of input fields using http://code.google.com/p/language-detection
@@ -38,7 +41,9 @@ import org.apache.solr.common.SolrInputDocument;
* @since 3.5
*/
public class LangDetectLanguageIdentifierUpdateProcessor extends LanguageIdentifierUpdateProcessor {
-
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public LangDetectLanguageIdentifierUpdateProcessor(SolrQueryRequest req,
SolrQueryResponse rsp, UpdateRequestProcessor next) {
super(req, rsp, next);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
index 6b85c9b..6d48d70 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -51,8 +52,7 @@ import java.util.regex.Pattern;
*/
public abstract class LanguageIdentifierUpdateProcessor extends UpdateRequestProcessor implements LangIdParams {
- protected final static Logger log = LoggerFactory
- .getLogger(LanguageIdentifierUpdateProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected boolean enabled;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
index 5d12174..ffc6274 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
@@ -17,6 +17,7 @@ package org.apache.solr.update.processor;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -25,6 +26,9 @@ import org.apache.solr.response.SolrQueryResponse;
import org.apache.tika.language.LanguageIdentifier;
import org.apache.solr.common.SolrInputDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Collection;
/**
@@ -37,6 +41,8 @@ import java.util.Collection;
*/
public class TikaLanguageIdentifierUpdateProcessor extends LanguageIdentifierUpdateProcessor {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public TikaLanguageIdentifierUpdateProcessor(SolrQueryRequest req,
SolrQueryResponse rsp, UpdateRequestProcessor next) {
super(req, rsp, next);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
index 5406b8b..24458d5 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -44,7 +45,7 @@ class BatchWriter {
private final EmbeddedSolrServer solr;
private volatile Exception batchWriteException = null;
- private static final Logger LOG = LoggerFactory.getLogger(BatchWriter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public Exception getBatchWriteException() {
return batchWriteException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
index fc8efcd..103e3ee 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
*/
class GoLive {
- private static final Logger LOG = LoggerFactory.getLogger(GoLive.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// TODO: handle clusters with replicas
public boolean goLive(Options options, FileStatus[] outDirs) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
index 5fd0cb5..66cd3dc 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.hadoop;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
*/
public class HeartBeater extends Thread {
- public static Logger LOG = LoggerFactory.getLogger(HeartBeater.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* count of threads asking for heart beat, at 0 no heart beat done. This could
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
index 5d65fa3..6f2638c 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Random;
import org.apache.hadoop.io.LongWritable;
@@ -38,7 +39,7 @@ public class LineRandomizerMapper extends Mapper<LongWritable, Text, LongWritabl
private Random random;
- private static final Logger LOGGER = LoggerFactory.getLogger(LineRandomizerMapper.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void setup(Context context) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
index af7759e..cbe194a 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
@@ -35,7 +36,7 @@ import org.slf4j.LoggerFactory;
*/
public class LineRandomizerReducer extends Reducer<LongWritable, Text, Text, NullWritable> {
- private static final Logger LOGGER = LoggerFactory.getLogger(LineRandomizerReducer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void reduce(LongWritable key, Iterable<Text> values, Context context) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
index 13853d1..a2430e7 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
@@ -28,6 +28,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -103,7 +104,7 @@ public class MapReduceIndexerTool extends Configured implements Tool {
private static final String FULL_INPUT_LIST = "full-input-list.txt";
- private static final Logger LOG = LoggerFactory.getLogger(MapReduceIndexerTool.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
index 9f59448..c8ad1a7 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.hadoop;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -58,7 +59,7 @@ public class SolrCloudPartitioner extends Partitioner<Text, SolrInputDocumentWri
public static final String ZKHOST = SolrCloudPartitioner.class.getName() + ".zkHost";
public static final String COLLECTION = SolrCloudPartitioner.class.getName() + ".collection";
- private static final Logger LOG = LoggerFactory.getLogger(SolrCloudPartitioner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public SolrCloudPartitioner() {}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
index 72936d3..4bbbce8 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
@@ -21,6 +21,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
public class SolrOutputFormat<K, V> extends FileOutputFormat<K, V> {
- private static final Logger LOG = LoggerFactory.getLogger(SolrOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The parameter used to pass the solr config zip file information. This will
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
index e34b32f..abca46d 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
class SolrRecordWriter<K, V> extends RecordWriter<K, V> {
- private static final Logger LOG = LoggerFactory.getLogger(SolrRecordWriter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public final static List<String> allowedConfigDirectories = new ArrayList<>(
Arrays.asList(new String[] { "conf", "lib", "solr.xml" }));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
index 939a414..5e10c97 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import org.apache.hadoop.io.Text;
@@ -51,7 +52,7 @@ public class SolrReducer extends Reducer<Text, SolrInputDocumentWritable, Text,
public static final String UPDATE_CONFLICT_RESOLVER = SolrReducer.class.getName() + ".updateConflictResolver";
- private static final Logger LOG = LoggerFactory.getLogger(SolrReducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void setup(Context context) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
index b0de2bc..ee34a9c 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
*/
public class TreeMergeMapper extends Mapper<LongWritable, Text, Text, NullWritable> {
- private static final Logger LOGGER = LoggerFactory.getLogger(TreeMergeMapper.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String MAX_SEGMENTS_ON_TREE_MERGE = "maxSegmentsOnTreeMerge";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
index bd804e0..207575d 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -50,7 +51,7 @@ import com.google.common.base.Preconditions;
* See {@link IndexMergeTool}.
*/
public class TreeMergeOutputFormat extends FileOutputFormat<Text, NullWritable> {
-
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public RecordWriter getRecordWriter(TaskAttemptContext context) throws IOException {
Utils.getLogConfigFile(context.getConfiguration());
@@ -69,7 +70,7 @@ public class TreeMergeOutputFormat extends FileOutputFormat<Text, NullWritable>
private final HeartBeater heartBeater;
private final TaskAttemptContext context;
- private static final Logger LOG = LoggerFactory.getLogger(TreeMergeRecordWriter.class);
+ private static final Logger LOG = log;
public TreeMergeRecordWriter(TaskAttemptContext context, Path workDir) {
this.workDir = new Path(workDir, "data/index");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
index 2a3a375..b71c7f1 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -49,7 +50,7 @@ import java.util.List;
*/
final class ZooKeeperInspector {
- private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperInspector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public List<List<String>> extractShardUrls(String zkHost, String collection) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
index 1994c16..c2637ce 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.hadoop.dedup;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -49,7 +50,7 @@ public class RetainMostRecentUpdateConflictResolver implements UpdateConflictRes
public static final String DUPLICATES_COUNTER_NAME = "Number of documents ignored as duplicates";
public static final String OUTDATED_COUNTER_NAME = "Number of documents ignored as outdated";
- private static final Logger LOG = LoggerFactory.getLogger(RetainMostRecentUpdateConflictResolver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void setConf(Configuration conf) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
index 1942221..9e46203 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
@@ -91,7 +92,7 @@ public final class MorphlineMapRunner {
*/
public static final String DISABLE_FILE_OPEN = "morphlineDisableFileOpen";
- private static final Logger LOG = LoggerFactory.getLogger(MorphlineMapRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
MorphlineContext getMorphlineContext() {
return morphlineContext;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
index 8ded604..8ba2ea6 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop.morphline;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Map;
@@ -57,7 +58,7 @@ public class MorphlineMapper extends SolrMapper<LongWritable, Text> {
private MorphlineMapRunner runner;
private HeartBeater heartBeater;
- private static final Logger LOG = LoggerFactory.getLogger(MorphlineMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected IndexSchema getSchema() {
return runner.getSchema();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
index 370dee1..9ba70d5 100644
--- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
@@ -27,7 +28,7 @@ import org.slf4j.LoggerFactory;
public class IdentityMapper extends Mapper<LongWritable, Text, Text, NullWritable> {
- private static final Logger LOGGER = LoggerFactory.getLogger(IdentityMapper.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void map(LongWritable key, Text value, Context context) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
index 104a882..1c248c6 100644
--- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
@@ -17,6 +17,7 @@
package org.apache.solr.hadoop;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
@@ -26,7 +27,7 @@ import org.slf4j.LoggerFactory;
public class IdentityReducer extends Reducer<Text, NullWritable, Text, NullWritable> {
- private static final Logger LOGGER = LoggerFactory.getLogger(IdentityReducer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void reduce(Text key, Iterable<NullWritable> values, Context context) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
index 269282d..1aebcf7 100644
--- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
@@ -37,8 +37,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MapReduceIndexerToolArgumentParserTest extends SolrTestCaseJ4 {
@@ -55,8 +53,6 @@ public class MapReduceIndexerToolArgumentParserTest extends SolrTestCaseJ4 {
private static final String MORPHLINE_FILE = RESOURCES_DIR + "/test-morphlines/solrCellDocumentTypes.conf";
- private static final Logger LOG = LoggerFactory.getLogger(MapReduceIndexerToolArgumentParserTest.class);
-
private final File solrHomeDirectory = createTempDir().toFile();
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrClient.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrClient.java
index 5a98e13..1d632f1 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrClient.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrClient.java
@@ -16,6 +16,8 @@
*/
package org.apache.solr.morphlines.solr;
+import java.lang.invoke.MethodHandles;
+
import org.apache.http.client.HttpClient;
import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;
import org.slf4j.Logger;
@@ -30,7 +32,7 @@ final class SafeConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
private Throwable currentException = null;
private final Object myLock = new Object();
- private static final Logger LOGGER = LoggerFactory.getLogger(SafeConcurrentUpdateSolrClient.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public SafeConcurrentUpdateSolrClient(String solrServerUrl, int queueSize, int threadCount) {
this(solrServerUrl, null, queueSize, threadCount);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrClientDocumentLoader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrClientDocumentLoader.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrClientDocumentLoader.java
index c52863f..ef9ea84 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrClientDocumentLoader.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrClientDocumentLoader.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -40,7 +41,7 @@ public class SolrClientDocumentLoader implements DocumentLoader {
private final int batchSize;
private final List<SolrInputDocument> batch = new ArrayList();
- private static final Logger LOGGER = LoggerFactory.getLogger(SolrClientDocumentLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public SolrClientDocumentLoader(SolrClient client, int batchSize) {
if (client == null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
index 7fe18f8..4acb9ac 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
@@ -19,6 +19,7 @@ package org.apache.solr.morphlines.solr;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Paths;
import com.google.common.base.Preconditions;
@@ -59,7 +60,7 @@ public class SolrLocator {
private String solrHomeDir;
private int batchSize = 1000;
- private static final Logger LOG = LoggerFactory.getLogger(SolrLocator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected SolrLocator(MorphlineContext context) {
Preconditions.checkNotNull(context);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
index 608766a..7185531 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
@@ -18,6 +18,7 @@ package org.apache.solr.morphlines.solr;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.solr.cloud.ZkController;
@@ -40,7 +41,7 @@ import com.google.common.io.Files;
*/
final class ZooKeeperDownloader {
- private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperDownloader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public SolrZkClient getZkClient(String zkHost) {
if (zkHost == null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
index 78adb2f..cf03128 100644
--- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
+++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
@@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
@@ -78,7 +79,7 @@ public class AbstractSolrMorphlineTestBase extends SolrTestCaseJ4 {
protected static final Object NON_EMPTY_FIELD = new Object();
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSolrMorphlineTestBase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected String tempDir;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
index a497393..3864e6d 100644
--- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
+++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.morphlines.solr;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +35,7 @@ class CollectingDocumentLoader implements DocumentLoader {
private final List<SolrInputDocument> batch = new ArrayList<> ();
private List<SolrInputDocument> results = new ArrayList<> ();
- private static final Logger LOGGER = LoggerFactory.getLogger(CollectingDocumentLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public CollectingDocumentLoader(int batchSize) {
if (batchSize <= 0) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
index a4b3e7a..03238c0 100644
--- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
+++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
@@ -27,6 +27,7 @@ import org.apache.uima.jcas.tcas.Annotation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
/**
@@ -36,7 +37,7 @@ import java.util.Map;
*/
public class UIMAToSolrMapper {
- private final Logger log = LoggerFactory.getLogger(UIMAToSolrMapper.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final SolrInputDocument document;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
index cebe6d1..31157ba 100644
--- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
+++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
@@ -18,6 +18,7 @@ package org.apache.solr.uima.processor;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Map.Entry;
@@ -42,8 +43,7 @@ import org.slf4j.LoggerFactory;
*/
public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor {
- private final Logger log = LoggerFactory
- .getLogger(UIMAUpdateRequestProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private SolrUIMAConfiguration solrUIMAConfiguration;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
index 5ef1f64..329db76 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
@@ -83,7 +84,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
private boolean solrResourceLoaderEnabled;
private String initPropertiesFileName; // used just to hold from init() to inform()
- private static final Logger log = LoggerFactory.getLogger(VelocityResponseWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final SolrVelocityLogger velocityLogger = new SolrVelocityLogger(log);
private Properties velocityInitProps = new Properties();
private Map<String,String> customTools = new HashMap<String,String>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 5ef57966..c9b5f78 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.EnumSet;
@@ -69,7 +70,7 @@ import org.slf4j.MDC;
*/
public class JettySolrRunner {
- private static final Logger logger = LoggerFactory.getLogger(JettySolrRunner.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
Server server;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java b/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java
index ac97998..97d6e3d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -24,7 +26,7 @@ import org.slf4j.LoggerFactory;
// this class may be accessed by multiple threads, but only one at a time
public class ActionThrottle {
- private static Logger log = LoggerFactory.getLogger(ActionThrottle.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private volatile Long lastActionStartedAt;
private volatile Long minMsBetweenActions;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/Assign.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Assign.java b/solr/core/src/java/org/apache/solr/cloud/Assign.java
index a71d1da..ff3b9ba 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Assign.java
@@ -39,8 +39,6 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.CoreContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.MAX_SHARDS_PER_NODE;
@@ -48,8 +46,6 @@ import static org.apache.solr.common.cloud.ZkStateReader.MAX_SHARDS_PER_NODE;
public class Assign {
private static Pattern COUNT = Pattern.compile("core_node(\\d+)");
- private static Logger log = LoggerFactory
- .getLogger(Assign.class);
public static String assignNode(String collection, ClusterState state) {
Map<String, Slice> sliceMap = state.getSlicesMap(collection);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
index da6850d..2b4883d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
public class CloudUtil {
- protected static Logger log = LoggerFactory.getLogger(CloudUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
index dc8dd5a..d407241 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java
@@ -31,6 +31,7 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.List;
/**
@@ -39,8 +40,7 @@ import java.util.List;
* don't have to be ordered i.e. DistributedQueue.
*/
public class DistributedMap {
- private static final Logger LOG = LoggerFactory
- .getLogger(DistributedMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static long DEFAULT_TIMEOUT = 5*60*1000;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
index fab74ac..bc85a5c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
@@ -18,6 +18,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
* A distributed queue.
*/
public class DistributedQueue {
- private static final Logger LOG = LoggerFactory.getLogger(DistributedQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final String PREFIX = "qn-";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
index 465ff51..9db75d7 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.Closeable;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -58,7 +59,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class ElectionContext implements Closeable {
- static Logger log = LoggerFactory.getLogger(ElectionContext.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
final String electionPath;
final ZkNodeProps leaderProps;
final String id;
@@ -105,8 +106,7 @@ public abstract class ElectionContext implements Closeable {
}
class ShardLeaderElectionContextBase extends ElectionContext {
- private static Logger log = LoggerFactory
- .getLogger(ShardLeaderElectionContextBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SolrZkClient zkClient;
protected String shardId;
protected String collection;
@@ -232,7 +232,7 @@ class ShardLeaderElectionContextBase extends ElectionContext {
// add core container and stop passing core around...
final class ShardLeaderElectionContext extends ShardLeaderElectionContextBase {
- private static Logger log = LoggerFactory.getLogger(ShardLeaderElectionContext.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final ZkController zkController;
private final CoreContainer cc;
@@ -650,7 +650,7 @@ final class ShardLeaderElectionContext extends ShardLeaderElectionContextBase {
}
final class OverseerElectionContext extends ElectionContext {
- private static Logger log = LoggerFactory.getLogger(OverseerElectionContext.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final SolrZkClient zkClient;
private Overseer overseer;
public static final String OVERSEER_ELECT = "/overseer_elect";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
index aa14949..2a8f84b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -56,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class LeaderElector {
- private static Logger log = LoggerFactory.getLogger(LeaderElector.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final String ELECTION_NODE = "/election";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
index e9751d2..44ec101 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
@@ -19,6 +19,7 @@ import org.apache.solr.util.RTimer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketException;
import java.util.List;
@@ -47,7 +48,7 @@ import java.util.List;
*/
public class LeaderInitiatedRecoveryThread extends Thread {
- public final static Logger log = LoggerFactory.getLogger(LeaderInitiatedRecoveryThread.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected ZkController zkController;
protected CoreContainer coreContainer;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index aa66e34..6ce0c15 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.Closeable;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -80,7 +81,7 @@ public class Overseer implements Closeable {
public static final int NUM_RESPONSES_TO_STORE = 10000;
- private static Logger log = LoggerFactory.getLogger(Overseer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
enum LeaderStatus {DONT_KNOW, NO, YES}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
index d26c156..9b0899d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -79,7 +80,7 @@ import java.util.concurrent.TimeUnit;
*/
public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
- private static Logger log = LoggerFactory.getLogger(OverseerAutoReplicaFailoverThread.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Integer lastClusterStateVersion;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index ddc0d6e..7ae985c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -160,8 +161,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
DocCollection.RULE, null,
SNITCH, null));
- private static Logger log = LoggerFactory
- .getLogger(OverseerCollectionMessageHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Overseer overseer;
private ShardHandlerFactory shardHandlerFactory;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
index 057a165..686d72b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
@@ -20,6 +20,7 @@ package org.apache.solr.cloud;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.HashSet;
@@ -81,8 +82,7 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
final private Set configSetWriteWip;
final private Set configSetReadWip;
- private static Logger log = LoggerFactory
- .getLogger(OverseerConfigSetMessageHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public OverseerConfigSetMessageHandler(ZkStateReader zkStateReader) {
this.zkStateReader = zkStateReader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
index dd27025..2e7c2fe 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -42,7 +44,7 @@ import org.slf4j.LoggerFactory;
*/
public class OverseerNodePrioritizer {
- private static Logger log = LoggerFactory.getLogger(OverseerNodePrioritizer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final ZkStateReader zkStateReader;
private final String adminPath;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
index e3793c1..ddaa5e2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -62,8 +63,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
public ExecutorService tpe ;
- private static Logger log = LoggerFactory
- .getLogger(OverseerTaskProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private OverseerTaskQueue workQueue;
private DistributedMap runningMap;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
index 4b44546..c307cc4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,7 +41,7 @@ import org.slf4j.LoggerFactory;
* This is inefficient! But the API on this class is kind of muddy..
*/
public class OverseerTaskQueue extends DistributedQueue {
- private static final Logger LOG = LoggerFactory.getLogger(OverseerTaskQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final String response_prefix = "qnr-" ;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 0c8d29e..507a833 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -72,7 +73,7 @@ public class RecoveryStrategy extends Thread implements ClosableThread {
private static final String REPLICATION_HANDLER = "/replication";
- private static Logger log = LoggerFactory.getLogger(RecoveryStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static interface RecoveryListener {
public void recovered();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
index 7351be4..b9d0dec 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java
@@ -25,8 +25,6 @@ import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A size limited distributed map maintained in zk.
@@ -34,9 +32,6 @@ import org.slf4j.LoggerFactory;
*/
public class SizeLimitedDistributedMap extends DistributedMap {
- protected static final Logger log = LoggerFactory
- .getLogger(DistributedMap.class);
-
private final int maxSize;
public SizeLimitedDistributedMap(SolrZkClient zookeeper, String dir, List<ACL> acl, int maxSize) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
index 09a4829..596de0f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -25,6 +25,7 @@ import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.apache.zookeeper.server.quorum.QuorumPeerMain;
import org.apache.zookeeper.server.quorum.flexible.QuorumHierarchical;
import org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
@@ -32,6 +33,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
@@ -42,7 +44,7 @@ import java.util.Properties;
public class SolrZkServer {
- static org.slf4j.Logger log = LoggerFactory.getLogger(SolrZkServer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
String zkRun;
String zkHost;
@@ -152,7 +154,7 @@ public class SolrZkServer {
// Allows us to set a default for the data dir before parsing
// zoo.cfg (which validates that there is a dataDir)
class SolrZkServerProps extends QuorumPeerConfig {
- protected static org.slf4j.Logger LOG = LoggerFactory.getLogger(QuorumPeerConfig.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
String solrPort; // port that Solr is listening on
String zkRun;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
index a88f7bc..463f195 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
@@ -1,6 +1,7 @@
package org.apache.solr.cloud;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
public class SyncStrategy {
- protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final boolean SKIP_AUTO_RECOVERY = Boolean.getBoolean("solrcloud.skip.autorecovery");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 3135ef0..d83cf81 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.URLEncoder;
@@ -118,7 +119,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.CORE_NODE_NAME_PROP;
*/
public final class ZkController {
- private static final Logger log = LoggerFactory.getLogger(ZkController.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final int WAIT_DOWN_STATES_TIMEOUT_SECONDS = 60;
private final boolean SKIP_AUTO_RECOVERY = Boolean.getBoolean("solrcloud.skip.autorecovery");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
index b979c3f..94780a6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.List;
import java.util.Properties;
@@ -34,6 +35,8 @@ import org.apache.solr.core.SolrResourceNotFoundException;
import org.apache.solr.schema.ZkIndexSchemaReader;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ResourceLoader that works with ZooKeeper.
@@ -45,6 +48,8 @@ public class ZkSolrResourceLoader extends SolrResourceLoader {
private ZkController zkController;
private ZkIndexSchemaReader zkIndexSchemaReader;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public ZkSolrResourceLoader(Path instanceDir, String configSet, ZkController zooKeeperController) {
super(instanceDir);
this.zkController = zooKeeperController;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
index c82558b..0e10ea2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -40,7 +42,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.NAME;
public class ClusterStateMutator {
- private static Logger log = LoggerFactory.getLogger(ClusterStateMutator.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final ZkStateReader zkStateReader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
index 93a9965..6bf5e2e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,7 +40,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
import static org.apache.solr.common.params.CommonParams.NAME;
public class CollectionMutator {
- private static Logger log = LoggerFactory.getLogger(CollectionMutator.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final ZkStateReader zkStateReader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
index d57b2e5..bfba78d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -46,7 +48,7 @@ import static org.apache.solr.cloud.overseer.CollectionMutator.checkKeyExistence
import static org.apache.solr.common.params.CommonParams.NAME;
public class ReplicaMutator {
- private static Logger log = LoggerFactory.getLogger(ReplicaMutator.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final ZkStateReader zkStateReader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
index e3350a9..a4e1876 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
@@ -1,5 +1,7 @@
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +45,7 @@ import static org.apache.solr.common.util.Utils.makeMap;
import static org.apache.solr.common.params.CommonParams.NAME;
public class SliceMutator {
- private static Logger log = LoggerFactory.getLogger(SliceMutator.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String PREFERRED_LEADER_PROP = COLL_PROP_PREFIX + "preferredleader";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 19be460..78418da 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -36,6 +36,8 @@ import org.slf4j.LoggerFactory;
import static java.util.Collections.singletonMap;
+import java.lang.invoke.MethodHandles;
+
/**
* ZkStateWriter is responsible for writing updates to the cluster state stored in ZooKeeper for
* both stateFormat=1 collection (stored in shared /clusterstate.json in ZK) and stateFormat=2 collections
@@ -53,7 +55,7 @@ import static java.util.Collections.singletonMap;
*/
public class ZkStateWriter {
private static final long MAX_FLUSH_INTERVAL = TimeUnit.NANOSECONDS.convert(Overseer.STATE_UPDATE_DELAY, TimeUnit.MILLISECONDS);
- private static Logger log = LoggerFactory.getLogger(ZkStateWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Represents a no-op {@link ZkWriteCommand} which will result in no modification to cluster state