lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject svn commit: r1717590 [6/9] - in /lucene/dev/trunk: ./ solr/ solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ solr/contrib/analytics/src/java/org/apache/solr/analytics/request/ solr/contrib/analytics/src/java/org/apache/solr/analyt...
Date Wed, 02 Dec 2015 09:22:27 GMT
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java Wed Dec  2 09:22:22 2015
@@ -21,6 +21,7 @@ import static org.apache.solr.update.pro
 import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.net.ConnectException;
 import java.net.SocketException;
 import java.util.ArrayList;
@@ -57,7 +58,7 @@ import org.slf4j.LoggerFactory;
 
 /** @lucene.experimental */
 public class PeerSync  {
-  public static Logger log = LoggerFactory.getLogger(PeerSync.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   public boolean debug = log.isDebugEnabled();
 
   private List<String> replicas;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Wed Dec  2 09:22:22 2015
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
 import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,7 +53,7 @@ import java.util.concurrent.Future;
 
 public class SolrCmdDistributor {
   private static final int MAX_RETRIES_ON_FORWARD = 25;
-  public static Logger log = LoggerFactory.getLogger(SolrCmdDistributor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   private StreamingSolrClients clients;
   

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCoreState.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCoreState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCoreState.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.update;
  */
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.locks.Lock;
 
 import org.apache.lucene.index.IndexWriter;
@@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory;
  * 
  */
 public abstract class SolrCoreState {
-  public static Logger log = LoggerFactory.getLogger(SolrCoreState.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   protected boolean closed = false;
   private final Object updateLock = new Object();

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Wed Dec  2 09:22:22 2015
@@ -17,6 +17,7 @@
 
 package org.apache.solr.update;
 
+import java.lang.invoke.MethodHandles;
 import java.util.List;
 import java.util.Map;
 
@@ -44,7 +45,7 @@ import static org.apache.solr.core.Confi
  * defined in the &lt;indexConfig&gt; section of solrconfig.xml
  */
 public class SolrIndexConfig implements MapSerializable {
-  public static final Logger log = LoggerFactory.getLogger(SolrIndexConfig.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   final String defaultMergePolicyClassName;
   public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,7 +50,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SolrIndexSplitter {
-  public static Logger log = LoggerFactory.getLogger(SolrIndexSplitter.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   SolrIndexSearcher searcher;
   SchemaField field;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.lucene.codecs.Codec;
@@ -41,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public class SolrIndexWriter extends IndexWriter {
-  private static Logger log = LoggerFactory.getLogger(SolrIndexWriter.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   // These should *only* be used for debugging or monitoring purposes
   public static final AtomicLong numOpens = new AtomicLong();
   public static final AtomicLong numCloses = new AtomicLong();

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java Wed Dec  2 09:22:22 2015
@@ -30,6 +30,7 @@ import org.apache.solr.update.processor.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -40,7 +41,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 public class StreamingSolrClients {
-  public static Logger log = LoggerFactory.getLogger(StreamingSolrClients.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   private HttpClient httpClient;
   

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/TransactionLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/TransactionLog.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/TransactionLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/TransactionLog.java Wed Dec  2 09:22:22 2015
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
+import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
@@ -62,7 +63,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class TransactionLog {
-  public static Logger log = LoggerFactory.getLogger(TransactionLog.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   final boolean debug = log.isDebugEnabled();
   final boolean trace = log.isTraceEnabled();
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateHandler.java Wed Dec  2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.update;
 
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Vector;
 
 import org.apache.solr.core.DirectoryFactory;
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public abstract class UpdateHandler implements SolrInfoMBean {
-  protected final static Logger log = LoggerFactory.getLogger(UpdateHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   protected final SolrCore core;
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Wed Dec  2 09:22:22 2015
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,7 +75,7 @@ public class UpdateLog implements Plugin
   public static String LOG_FILENAME_PATTERN = "%s.%019d";
   public static String TLOG_NAME="tlog";
 
-  public static Logger log = LoggerFactory.getLogger(UpdateLog.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   public boolean debug = log.isDebugEnabled();
   public boolean trace = log.isTraceEnabled();
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java Wed Dec  2 09:22:22 2015
@@ -34,12 +34,13 @@ import org.apache.solr.core.NodeConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class UpdateShardHandler {
   
-  private static Logger log = LoggerFactory.getLogger(UpdateShardHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   /*
    * A downside to configuring an upper bound will be big update reorders (when that upper bound is hit)

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/VersionInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/VersionInfo.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/VersionInfo.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/VersionInfo.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
 
 public class VersionInfo {
 
-  public static Logger log = LoggerFactory.getLogger(VersionInfo.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   public static final String VERSION_FIELD="_version_";
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -36,6 +36,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.Collections;
@@ -121,7 +122,7 @@ import static org.apache.solr.core.Confi
  * &lt;/processor&gt;</pre>
  */
 public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcessorFactory implements SolrCoreAware {
-  public final static Logger log = LoggerFactory.getLogger(AddSchemaFieldsUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String TYPE_MAPPING_PARAM = "typeMapping";
   private static final String VALUE_CLASS_PARAM = "valueClass";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java Wed Dec  2 09:22:22 2015
@@ -20,7 +20,8 @@ package org.apache.solr.update.processor
 import org.apache.solr.common.SolrInputField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-                   
+
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +40,7 @@ import java.util.Locale;
  */
 public abstract class AllValuesOrNoneFieldMutatingUpdateProcessor extends FieldMutatingUpdateProcessor {
 
-  private static final Logger log = LoggerFactory.getLogger(AllValuesOrNoneFieldMutatingUpdateProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   public static final Object DELETE_VALUE_SINGLETON = new Object() {
     @Override

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java Wed Dec  2 09:22:22 2015
@@ -1,5 +1,7 @@
 package org.apache.solr.update.processor;
 
+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 AtomicUpdateDocumentMerger {
   
-  private final static Logger log = LoggerFactory.getLogger(AtomicUpdateDocumentMerger.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   protected final IndexSchema schema;
   protected final SchemaField idField;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.update.processor
  */
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
@@ -26,6 +27,8 @@ import org.apache.solr.response.SolrQuer
 import org.apache.solr.update.AddUpdateCommand;
 import org.apache.solr.update.DeleteUpdateCommand;
 import org.apache.solr.update.UpdateCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -38,6 +41,8 @@ public class CdcrUpdateProcessor extends
 
   public static final String CDCR_UPDATE = "cdcr.update";
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   public CdcrUpdateProcessor(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
     super(req, rsp, next);
   }

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.update.processor
 import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -164,7 +165,7 @@ import org.slf4j.LoggerFactory;
 public class CloneFieldUpdateProcessorFactory 
   extends UpdateRequestProcessorFactory implements SolrCoreAware {
 
-  private final static Logger log = LoggerFactory.getLogger(CloneFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   public static final String SOURCE_PARAM = "source";
   public static final String DEST_PARAM = "dest";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.update.processor
  */
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -96,7 +97,7 @@ public class DistributedUpdateProcessor
   public static final String DISTRIB_FROM_PARENT = "distrib.from.parent";
   public static final String DISTRIB_FROM = "distrib.from";
   private static final String TEST_DISTRIB_SKIP_SERVERS = "test.distrib.skip.servers";
-  public final static Logger log = LoggerFactory.getLogger(DistributedUpdateProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   /**
    * Values this processor supports for the <code>DISTRIB_UPDATE_PARAM</code>.

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
 import static org.apache.solr.common.SolrException.ErrorCode.BAD_REQUEST;
@@ -91,7 +92,7 @@ import static org.apache.solr.update.pro
  * </ul>
  */
 public class DocBasedVersionConstraintsProcessorFactory extends UpdateRequestProcessorFactory implements SolrCoreAware, UpdateRequestProcessorFactory.RunAlways {
-  public final static Logger log = LoggerFactory.getLogger(DocBasedVersionConstraintsProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private boolean ignoreOldUpdates = false;
   private String versionField = null;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update.processor;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 
 import org.apache.solr.common.SolrException;
 
@@ -169,7 +170,7 @@ public final class DocExpirationUpdatePr
   extends UpdateRequestProcessorFactory 
   implements SolrCoreAware {
 
-  public final static Logger log = LoggerFactory.getLogger(DocExpirationUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String DEF_TTL_KEY = "_ttl_";
   private static final String EXP_FIELD_NAME_CONF = "expirationFieldName";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update.processor;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.regex.Pattern;
@@ -53,7 +54,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class FieldMutatingUpdateProcessor 
   extends UpdateRequestProcessor {
-  public final static Logger log = LoggerFactory.getLogger(FieldMutatingUpdateProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final FieldNameSelector selector;
   public FieldMutatingUpdateProcessor(FieldNameSelector selector,

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -32,8 +32,6 @@ import org.apache.solr.request.SolrQuery
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.update.AddUpdateCommand;
 import org.apache.solr.update.DeleteUpdateCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -49,7 +47,6 @@ import org.slf4j.LoggerFactory;
  */
 
 public class FieldNameMutatingUpdateProcessorFactory  extends UpdateRequestProcessorFactory{
-  public static final Logger log = LoggerFactory.getLogger(FieldNameMutatingUpdateProcessorFactory.class);
 
   private String sourcePattern, replacement;
   private Pattern pattern;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java Wed Dec  2 09:22:22 2015
@@ -17,6 +17,7 @@
 
 package org.apache.solr.update.processor;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 
 import org.apache.solr.common.SolrInputField;
@@ -34,7 +35,7 @@ import org.slf4j.LoggerFactory;
 public abstract class FieldValueMutatingUpdateProcessor 
   extends FieldMutatingUpdateProcessor {
 
-  private static final Logger log = LoggerFactory.getLogger(FieldValueMutatingUpdateProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   
   public static final Object DELETE_VALUE_SINGLETON = new Object() {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -20,6 +20,7 @@ package org.apache.solr.update.processor
 import static org.apache.solr.common.SolrException.ErrorCode;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.SolrParams;
@@ -39,8 +40,7 @@ import org.slf4j.LoggerFactory;
  * </p>
  */
 public class IgnoreCommitOptimizeUpdateProcessorFactory extends UpdateRequestProcessorFactory {
-
-  public final static Logger log = LoggerFactory.getLogger(IgnoreCommitOptimizeUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String DEFAULT_RESPONSE_MSG = "Explicit commit/optimize requests are forbidden!";
   
@@ -89,58 +89,58 @@ public class IgnoreCommitOptimizeUpdateP
   public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
     return new IgnoreCommitOptimizeUpdateProcessor(rsp, this, next);
   }
-}
-
-class IgnoreCommitOptimizeUpdateProcessor extends UpdateRequestProcessor {
+  
+  static class IgnoreCommitOptimizeUpdateProcessor extends UpdateRequestProcessor {
 
-  private final SolrQueryResponse rsp;
-  private final ErrorCode errorCode;
-  private final String responseMsg;
-  private final boolean ignoreOptimizeOnly;
-
-  IgnoreCommitOptimizeUpdateProcessor(SolrQueryResponse rsp,
-                                      IgnoreCommitOptimizeUpdateProcessorFactory factory,
-                                      UpdateRequestProcessor next)
-  {
-    super(next);
-    this.rsp = rsp;
-    this.errorCode = factory.errorCode;
-    this.responseMsg = factory.responseMsg;
-    this.ignoreOptimizeOnly = factory.ignoreOptimizeOnly;
-  }
+    private final SolrQueryResponse rsp;
+    private final ErrorCode errorCode;
+    private final String responseMsg;
+    private final boolean ignoreOptimizeOnly;
+
+    IgnoreCommitOptimizeUpdateProcessor(SolrQueryResponse rsp,
+                                        IgnoreCommitOptimizeUpdateProcessorFactory factory,
+                                        UpdateRequestProcessor next)
+    {
+      super(next);
+      this.rsp = rsp;
+      this.errorCode = factory.errorCode;
+      this.responseMsg = factory.responseMsg;
+      this.ignoreOptimizeOnly = factory.ignoreOptimizeOnly;
+    }
 
-  @Override
-  public void processCommit(CommitUpdateCommand cmd) throws IOException {
+    @Override
+    public void processCommit(CommitUpdateCommand cmd) throws IOException {
 
-    if (ignoreOptimizeOnly && !cmd.optimize) {
-      // we're setup to only ignore optimize requests so it's OK to pass this commit on down the line
-      if (next != null) next.processCommit(cmd);
-      return;
-    }
+      if (ignoreOptimizeOnly && !cmd.optimize) {
+        // we're setup to only ignore optimize requests so it's OK to pass this commit on down the line
+        if (next != null) next.processCommit(cmd);
+        return;
+      }
 
-    if (cmd.getReq().getParams().getBool(DistributedUpdateProcessor.COMMIT_END_POINT, false)) {
-      // this is a targeted commit from replica to leader needed for recovery, so can't be ignored
-      if (next != null) next.processCommit(cmd);
-      return;
-    }
+      if (cmd.getReq().getParams().getBool(DistributedUpdateProcessor.COMMIT_END_POINT, false)) {
+        // this is a targeted commit from replica to leader needed for recovery, so can't be ignored
+        if (next != null) next.processCommit(cmd);
+        return;
+      }
 
-    final String cmdType = cmd.optimize ? "optimize" : "commit";
-    if (errorCode != null) {
-      IgnoreCommitOptimizeUpdateProcessorFactory.log.info(
-          "{} from client application ignored with error code: {}", cmdType, errorCode.code);
-      rsp.setException(new SolrException(errorCode, responseMsg));
-    } else {
-      // errorcode is null, treat as a success with an optional message warning the commit request was ignored
-      IgnoreCommitOptimizeUpdateProcessorFactory.log.info(
-          "{} from client application ignored with status code: 200", cmdType);
-      if (responseMsg != null) {
-        NamedList<Object> responseHeader = rsp.getResponseHeader();
-        if (responseHeader != null) {
-          responseHeader.add("msg", responseMsg);
-        } else {
-          responseHeader = new SimpleOrderedMap<Object>();
-          responseHeader.add("msg", responseMsg);
-          rsp.add("responseHeader", responseHeader);
+      final String cmdType = cmd.optimize ? "optimize" : "commit";
+      if (errorCode != null) {
+        IgnoreCommitOptimizeUpdateProcessorFactory.log.info(
+            "{} from client application ignored with error code: {}", cmdType, errorCode.code);
+        rsp.setException(new SolrException(errorCode, responseMsg));
+      } else {
+        // errorcode is null, treat as a success with an optional message warning the commit request was ignored
+        IgnoreCommitOptimizeUpdateProcessorFactory.log.info(
+            "{} from client application ignored with status code: 200", cmdType);
+        if (responseMsg != null) {
+          NamedList<Object> responseHeader = rsp.getResponseHeader();
+          if (responseHeader != null) {
+            responseHeader.add("msg", responseMsg);
+          } else {
+            responseHeader = new SimpleOrderedMap<Object>();
+            responseHeader.add("msg", responseMsg);
+            rsp.add("responseHeader", responseHeader);
+          }
         }
       }
     }

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.update.processor;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,6 +48,7 @@ import org.slf4j.LoggerFactory;
  * @since solr 1.3
  */
 public class LogUpdateProcessorFactory extends UpdateRequestProcessorFactory implements UpdateRequestProcessorFactory.RunAlways {
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   int maxNumToLog = 10;
   int slowUpdateThresholdMillis = -1;
@@ -61,157 +63,156 @@ public class LogUpdateProcessorFactory e
 
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
-    return LogUpdateProcessor.log.isInfoEnabled() ? new LogUpdateProcessor(req, rsp, this, next) : null;
-  }
-}
-
-class LogUpdateProcessor extends UpdateRequestProcessor {
-  public final static Logger log = LoggerFactory.getLogger(LogUpdateProcessor.class);
-
-  private final SolrQueryRequest req;
-  private final SolrQueryResponse rsp;
-  private final NamedList<Object> toLog;
-
-  int numAdds;
-  int numDeletes;
-
-  // hold on to the added list for logging and the response
-  private List<String> adds;
-  private List<String> deletes;
-
-  private final int maxNumToLog;
-  private final int slowUpdateThresholdMillis;
-
-  private final boolean logDebug = log.isDebugEnabled();//cache to avoid volatile-read
-
-  public LogUpdateProcessor(SolrQueryRequest req, SolrQueryResponse rsp, LogUpdateProcessorFactory factory, UpdateRequestProcessor next) {
-    super( next );
-    this.req = req;
-    this.rsp = rsp;
-    maxNumToLog = factory.maxNumToLog;  // TODO: make configurable
-    // TODO: make log level configurable as well, or is that overkill?
-    // (ryan) maybe?  I added it mostly to show that it *can* be configurable
-    slowUpdateThresholdMillis = factory.slowUpdateThresholdMillis;
-
-    this.toLog = new SimpleOrderedMap<>();
+    return log.isInfoEnabled() ? new LogUpdateProcessor(req, rsp, this, next) : null;
   }
   
-  @Override
-  public void processAdd(AddUpdateCommand cmd) throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
-
-    // call delegate first so we can log things like the version that get set later
-    if (next != null) next.processAdd(cmd);
-
-    // Add a list of added id's to the response
-    if (adds == null) {
-      adds = new ArrayList<>();
-      toLog.add("add",adds);
-    }
-
-    if (adds.size() < maxNumToLog) {
-      long version = cmd.getVersion();
-      String msg = cmd.getPrintableId();
-      if (version != 0) msg = msg + " (" + version + ')';
-      adds.add(msg);
-    }
+  static class LogUpdateProcessor extends UpdateRequestProcessor {
 
-    numAdds++;
-  }
-
-  @Override
-  public void processDelete( DeleteUpdateCommand cmd ) throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
-    if (next != null) next.processDelete(cmd);
-
-    if (cmd.isDeleteById()) {
-      if (deletes == null) {
-        deletes = new ArrayList<>();
-        toLog.add("delete",deletes);
-      }
-      if (deletes.size() < maxNumToLog) {
-        long version = cmd.getVersion();
-        String msg = cmd.getId();
-        if (version != 0) msg = msg + " (" + version + ')';
-        deletes.add(msg);
+    private final SolrQueryRequest req;
+    private final SolrQueryResponse rsp;
+    private final NamedList<Object> toLog;
+
+    int numAdds;
+    int numDeletes;
+
+    // hold on to the added list for logging and the response
+    private List<String> adds;
+    private List<String> deletes;
+
+    private final int maxNumToLog;
+    private final int slowUpdateThresholdMillis;
+
+    private final boolean logDebug = log.isDebugEnabled();//cache to avoid volatile-read
+
+    public LogUpdateProcessor(SolrQueryRequest req, SolrQueryResponse rsp, LogUpdateProcessorFactory factory, UpdateRequestProcessor next) {
+      super( next );
+      this.req = req;
+      this.rsp = rsp;
+      maxNumToLog = factory.maxNumToLog;  // TODO: make configurable
+      // TODO: make log level configurable as well, or is that overkill?
+      // (ryan) maybe?  I added it mostly to show that it *can* be configurable
+      slowUpdateThresholdMillis = factory.slowUpdateThresholdMillis;
+
+      this.toLog = new SimpleOrderedMap<>();
+    }
+    
+    @Override
+    public void processAdd(AddUpdateCommand cmd) throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
+
+      // call delegate first so we can log things like the version that get set later
+      if (next != null) next.processAdd(cmd);
+
+      // Add a list of added id's to the response
+      if (adds == null) {
+        adds = new ArrayList<>();
+        toLog.add("add",adds);
       }
-    } else {
-      if (toLog.size() < maxNumToLog) {
+
+      if (adds.size() < maxNumToLog) {
         long version = cmd.getVersion();
-        String msg = cmd.query;
+        String msg = cmd.getPrintableId();
         if (version != 0) msg = msg + " (" + version + ')';
-        toLog.add("deleteByQuery", msg);
+        adds.add(msg);
       }
+
+      numAdds++;
     }
-    numDeletes++;
 
-  }
+    @Override
+    public void processDelete( DeleteUpdateCommand cmd ) throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
+      if (next != null) next.processDelete(cmd);
+
+      if (cmd.isDeleteById()) {
+        if (deletes == null) {
+          deletes = new ArrayList<>();
+          toLog.add("delete",deletes);
+        }
+        if (deletes.size() < maxNumToLog) {
+          long version = cmd.getVersion();
+          String msg = cmd.getId();
+          if (version != 0) msg = msg + " (" + version + ')';
+          deletes.add(msg);
+        }
+      } else {
+        if (toLog.size() < maxNumToLog) {
+          long version = cmd.getVersion();
+          String msg = cmd.query;
+          if (version != 0) msg = msg + " (" + version + ')';
+          toLog.add("deleteByQuery", msg);
+        }
+      }
+      numDeletes++;
 
-  @Override
-  public void processMergeIndexes(MergeIndexesCommand cmd) throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
-    if (next != null) next.processMergeIndexes(cmd);
+    }
 
-    toLog.add("mergeIndexes", cmd.toString());
-  }
+    @Override
+    public void processMergeIndexes(MergeIndexesCommand cmd) throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
+      if (next != null) next.processMergeIndexes(cmd);
 
-  @Override
-  public void processCommit( CommitUpdateCommand cmd ) throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
-    if (next != null) next.processCommit(cmd);
+      toLog.add("mergeIndexes", cmd.toString());
+    }
 
+    @Override
+    public void processCommit( CommitUpdateCommand cmd ) throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
+      if (next != null) next.processCommit(cmd);
 
-    final String msg = cmd.optimize ? "optimize" : "commit";
-    toLog.add(msg, "");
-  }
 
-  /**
-   * @since Solr 1.4
-   */
-  @Override
-  public void processRollback( RollbackUpdateCommand cmd ) throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
-    if (next != null) next.processRollback(cmd);
+      final String msg = cmd.optimize ? "optimize" : "commit";
+      toLog.add(msg, "");
+    }
 
-    toLog.add("rollback", "");
-  }
+    /**
+     * @since Solr 1.4
+     */
+    @Override
+    public void processRollback( RollbackUpdateCommand cmd ) throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
+      if (next != null) next.processRollback(cmd);
 
+      toLog.add("rollback", "");
+    }
 
-  @Override
-  public void finish() throws IOException {
-    if (logDebug) { log.debug("PRE_UPDATE FINISH " + req); }
-    if (next != null) next.finish();
 
-    // LOG A SUMMARY WHEN ALL DONE (INFO LEVEL)
+    @Override
+    public void finish() throws IOException {
+      if (logDebug) { log.debug("PRE_UPDATE FINISH " + req); }
+      if (next != null) next.finish();
 
-    if (log.isInfoEnabled()) {
-      log.info(getLogStringAndClearRspToLog());
-    }
+      // LOG A SUMMARY WHEN ALL DONE (INFO LEVEL)
 
-    if (log.isWarnEnabled() && slowUpdateThresholdMillis >= 0) {
-      final long elapsed = (long) req.getRequestTimer().getTime();
-      if (elapsed >= slowUpdateThresholdMillis) {
-        log.warn("slow: " + getLogStringAndClearRspToLog());
+      if (log.isInfoEnabled()) {
+        log.info(getLogStringAndClearRspToLog());
+      }
+
+      if (log.isWarnEnabled() && slowUpdateThresholdMillis >= 0) {
+        final long elapsed = (long) req.getRequestTimer().getTime();
+        if (elapsed >= slowUpdateThresholdMillis) {
+          log.warn("slow: " + getLogStringAndClearRspToLog());
+        }
       }
     }
-  }
 
-  private String getLogStringAndClearRspToLog() {
-    StringBuilder sb = new StringBuilder(rsp.getToLogAsString(req.getCore().getLogId()));
+    private String getLogStringAndClearRspToLog() {
+      StringBuilder sb = new StringBuilder(rsp.getToLogAsString(req.getCore().getLogId()));
 
-    rsp.getToLog().clear();   // make it so SolrCore.exec won't log this again
+      rsp.getToLog().clear();   // make it so SolrCore.exec won't log this again
 
-    // if id lists were truncated, show how many more there were
-    if (adds != null && numAdds > maxNumToLog) {
-      adds.add("... (" + numAdds + " adds)");
-    }
-    if (deletes != null && numDeletes > maxNumToLog) {
-      deletes.add("... (" + numDeletes + " deletes)");
-    }
-    final long elapsed = (long) req.getRequestTimer().getTime();
+      // if id lists were truncated, show how many more there were
+      if (adds != null && numAdds > maxNumToLog) {
+        adds.add("... (" + numAdds + " adds)");
+      }
+      if (deletes != null && numDeletes > maxNumToLog) {
+        deletes.add("... (" + numDeletes + " deletes)");
+      }
+      final long elapsed = (long) req.getRequestTimer().getTime();
 
-    sb.append(toLog).append(" 0 ").append(elapsed);
-    return sb.toString();
+      sb.append(toLog).append(" 0 ").append(elapsed);
+      return sb.toString();
+    }
   }
 }
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java Wed Dec  2 09:22:22 2015
@@ -21,11 +21,7 @@ import java.nio.charset.StandardCharsets
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class MD5Signature extends Signature {
-  protected final static Logger log = LoggerFactory.getLogger(MD5Signature.class);
   private static ThreadLocal<MessageDigest> DIGESTER_FACTORY = new ThreadLocal<MessageDigest>() {
     @Override
     protected MessageDigest initialValue() {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -32,6 +32,7 @@ import org.joda.time.format.DateTimeForm
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -96,7 +97,7 @@ import java.util.Map;
  * </p>
  */
 public class ParseDateFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
-  public static final Logger log = LoggerFactory.getLogger(ParseDateFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String FORMATS_PARAM = "format";
   private static final String DEFAULT_TIME_ZONE_PARAM = "defaultTimeZone";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -24,6 +24,7 @@ import org.apache.solr.schema.FieldType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -67,7 +68,7 @@ import java.util.Locale;
  */
 public class ParseDoubleFieldUpdateProcessorFactory extends ParseNumericFieldUpdateProcessorFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(ParseDoubleFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req,

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -24,6 +24,7 @@ import org.apache.solr.schema.FloatValue
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -67,7 +68,7 @@ import java.util.Locale;
  */
 public class ParseFloatFieldUpdateProcessorFactory extends ParseNumericFieldUpdateProcessorFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(ParseFloatFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req,

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -24,6 +24,7 @@ import org.apache.solr.schema.IntValueFi
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.Locale;
@@ -63,7 +64,7 @@ import java.util.Locale;
  */
 public class ParseIntFieldUpdateProcessorFactory extends ParseNumericFieldUpdateProcessorFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(ParseIntFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req,

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -24,6 +24,7 @@ import org.apache.solr.schema.LongValueF
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.Locale;
@@ -63,7 +64,7 @@ import java.util.Locale;
  */
 public class ParseLongFieldUpdateProcessorFactory extends ParseNumericFieldUpdateProcessorFactory {
   
-  private static final Logger log = LoggerFactory.getLogger(ParseLongFieldUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req,

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -1,5 +1,6 @@
 package org.apache.solr.update.processor;
 
+import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,6 +19,8 @@ import org.apache.solr.schema.PreAnalyze
 import org.apache.solr.schema.PreAnalyzedField.PreAnalyzedParser;
 import org.apache.solr.schema.SchemaField;
 import org.apache.solr.schema.SimplePreAnalyzedParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -134,6 +137,8 @@ class PreAnalyzedUpdateProcessor extends
   private PreAnalyzedField parser;
   private IndexSchema schema;
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   public PreAnalyzedUpdateProcessor(FieldNameSelector sel, UpdateRequestProcessor next, IndexSchema schema, PreAnalyzedField parser) {
     super(sel, next);
     this.schema = schema;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -29,8 +29,6 @@ import java.util.regex.PatternSyntaxExce
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An updated processor that applies a configured regex to any 
@@ -69,8 +67,6 @@ import org.slf4j.LoggerFactory;
  */
 public final class RegexReplaceProcessorFactory extends FieldMutatingUpdateProcessorFactory {
   
-  private static final Logger log = LoggerFactory.getLogger(RegexReplaceProcessorFactory.class);
-
   private static final String REPLACEMENT_PARAM = "replacement";
   private static final String PATTERN_PARAM = "pattern";
   private static final String LITERAL_REPLACEMENT_PARAM = "literalReplacement";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java Wed Dec  2 09:22:22 2015
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -60,7 +61,7 @@ public class RegexpBoostProcessor extend
   private static final String DEFAULT_INPUT_FIELDNAME = "url";
   private static final String DEFAULT_BOOST_FIELDNAME = "urlboost";
 
-  private static final Logger log = LoggerFactory.getLogger(RegexpBoostProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private boolean enabled = true;
   private String inputFieldname = DEFAULT_INPUT_FIELDNAME;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -40,6 +40,7 @@ import javax.script.ScriptException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.util.Set;
 import java.util.LinkedHashSet;
@@ -152,7 +153,7 @@ import org.slf4j.LoggerFactory;
  */
 public class StatelessScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory implements SolrCoreAware {
 
-  public static Logger log = LoggerFactory.getLogger(StatelessScriptUpdateProcessorFactory.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final static String SCRIPT_ARG = "script";
   private final static String PARAMS_ARG = "params";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java Wed Dec  2 09:22:22 2015
@@ -17,6 +17,7 @@
 package org.apache.solr.update.processor;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -55,7 +56,7 @@ public class URLClassifyProcessor extend
   private static final String DEFAULT_LEVELS_FIELDNAME = "url_levels";
   private static final String DEFAULT_TOPLEVEL_FIELDNAME = "url_toplevel";
   private static final String DEFAULT_LANDINGPAGE_FIELDNAME = "url_landingpage";
-  private final static Logger log = LoggerFactory.getLogger(URLClassifyProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private boolean enabled = true;
   private String urlFieldname = DEFAULT_URL_FIELDNAME;
   private String lengthFieldname = DEFAULT_LENGTH_FIELDNAME;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java Wed Dec  2 09:22:22 2015
@@ -33,9 +33,6 @@ import org.apache.solr.request.SolrQuery
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.update.AddUpdateCommand;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Removes duplicate values found in fields matching the specified conditions.  
  * The existing field values are iterated in order, and values are removed when 
@@ -58,8 +55,6 @@ import org.slf4j.LoggerFactory;
  */
 public class UniqFieldsUpdateProcessorFactory extends FieldValueSubsetUpdateProcessorFactory {
 
-  public final static Logger log = LoggerFactory.getLogger(UniqFieldsUpdateProcessorFactory.class);
-
   @Override
   public FieldMutatingUpdateProcessor.FieldNameSelector 
     getDefaultSelector(final SolrCore core) {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java Wed Dec  2 09:22:22 2015
@@ -18,8 +18,6 @@
 package org.apache.solr.update.processor;
 
 import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.apache.solr.update.AddUpdateCommand;
 import org.apache.solr.update.CommitUpdateCommand;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java Wed Dec  2 09:22:22 2015
@@ -35,6 +35,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -92,7 +93,7 @@ import java.util.Objects;
  */
 public final class UpdateRequestProcessorChain implements PluginInfoInitialized
 {
-  public final static Logger log = LoggerFactory.getLogger(UpdateRequestProcessorChain.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private List<UpdateRequestProcessorFactory> chain;
   private final SolrCore solrCore;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java Wed Dec  2 09:22:22 2015
@@ -21,6 +21,7 @@ import org.apache.solr.common.util.Cache
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -42,7 +43,7 @@ import java.util.concurrent.locks.Reentr
  * @since solr 1.6
  */
 public class ConcurrentLFUCache<K, V> implements Cache<K,V> {
-  private static Logger log = LoggerFactory.getLogger(ConcurrentLFUCache.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final ConcurrentHashMap<Object, CacheEntry<K, V>> map;
   private final int upperWaterMark, lowerWaterMark;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java Wed Dec  2 09:22:22 2015
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
+import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 
 /**
@@ -45,7 +46,7 @@ import java.lang.ref.WeakReference;
  * @since solr 1.4
  */
 public class ConcurrentLRUCache<K,V> implements Cache<K,V> {
-  private static Logger log = LoggerFactory.getLogger(ConcurrentLRUCache.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final ConcurrentHashMap<Object, CacheEntry<K,V>> map;
   private final int upperWaterMark, lowerWaterMark;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CryptoKeys.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CryptoKeys.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CryptoKeys.java Wed Dec  2 09:22:22 2015
@@ -22,6 +22,8 @@ import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+
+import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -50,7 +52,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public final class CryptoKeys {
-  private static final Logger log = LoggerFactory.getLogger(CryptoKeys.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final Map<String, PublicKey> keys;
   private Exception exception;
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java Wed Dec  2 09:22:22 2015
@@ -20,6 +20,7 @@ package org.apache.solr.util;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
@@ -38,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public class FSHDFSUtils {
-  public static Logger log = LoggerFactory.getLogger(FSHDFSUtils.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   // internal, for tests
   public static AtomicLong RECOVER_LEASE_SUCCESS_COUNT = new AtomicLong();

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java Wed Dec  2 09:22:22 2015
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.lang.invoke.MethodHandles;
 import java.net.ConnectException;
 import java.net.Socket;
 import java.net.SocketException;
@@ -185,7 +186,7 @@ public class SolrCLI {
         throws Exception;
   }
   
-  public static Logger log = LoggerFactory.getLogger(SolrCLI.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   public static final String DEFAULT_SOLR_URL = "http://localhost:8983/solr";  
   public static final String ZK_HOST = "localhost:9983";
   

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr.util;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -78,6 +79,8 @@ import org.apache.solr.search.SolrIndexS
 import org.apache.solr.search.SolrQueryParser;
 import org.apache.solr.search.SortSpecParsing;
 import org.apache.solr.search.SyntaxError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>Utilities that may be of use to RequestHandlers.</p>
@@ -101,6 +104,8 @@ public class SolrPluginUtils {
    */
   private static final Map<Integer, String> purposes;
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   static {
       Map<Integer, String> map = new TreeMap<>();
       map.put(ShardRequest.PURPOSE_PRIVATE, "PRIVATE");
@@ -917,7 +922,7 @@ public class SolrPluginUtils {
       /* we definitely had some sort of sort string from the user,
        * but no SortSpec came out of it
        */
-      SolrCore.log.warn("Invalid sort \""+sort+"\" was specified, ignoring", sortE);
+      log.warn("Invalid sort \""+sort+"\" was specified, ignoring", sortE);
       return null;
     }
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java Wed Dec  2 09:22:22 2015
@@ -27,6 +27,7 @@ import org.xml.sax.EntityResolver;
 import org.xml.sax.ext.EntityResolver2;
 import java.io.File;
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.net.URI;
 import java.net.URISyntaxException;
 import javax.xml.transform.Source;
@@ -55,7 +56,7 @@ import javax.xml.stream.XMLStreamExcepti
  * </pre>
  */
 public final class SystemIdResolver implements EntityResolver, EntityResolver2 {
-  private static final Logger log = LoggerFactory.getLogger(SystemIdResolver.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   public static final String RESOURCE_LOADER_URI_SCHEME = "solrres";
   public static final String RESOURCE_LOADER_AUTHORITY_ABSOLUTE = "@";

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Wed Dec  2 09:22:22 2015
@@ -17,6 +17,7 @@
 
 package org.apache.solr.util.plugin;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +40,7 @@ import static org.apache.solr.common.par
  */
 public abstract class AbstractPluginLoader<T>
 {
-  public static Logger log = LoggerFactory.getLogger(AbstractPluginLoader.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   private final String type;
   private final boolean preRegister;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java Wed Dec  2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.util.xslt;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.solr.util.TimeOut;
@@ -50,7 +51,7 @@ public class TransformerProvider {
   private Templates lastTemplates = null;
   private TimeOut cacheExpiresTimeout;
 
-  private static final Logger log = LoggerFactory.getLogger(TransformerProvider.class.getName());
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
   
   public static TransformerProvider instance = new TransformerProvider();

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Wed Dec  2 09:22:22 2015
@@ -18,6 +18,7 @@
 package org.apache.solr;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -55,6 +56,8 @@ import org.apache.solr.handler.component
 import org.apache.solr.handler.component.TrackingShardHandlerFactory.RequestTrackingQueue;
 import org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TODO? perhaps use:
@@ -67,6 +70,8 @@ import org.junit.Test;
 @Slow
 public class TestDistributedSearch extends BaseDistributedSearchTestCase {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   String t1="a_t";
   String i1="a_i1";
   String nint = "n_i";

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Wed Dec  2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -45,9 +46,13 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.noggit.JSONUtil;
 import org.noggit.ObjectBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestGroupingSearch extends SolrTestCaseJ4 {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   public static final String FOO_STRING_FIELD = "foo_s1";
   public static final String SMALL_STRING_FIELD = "small_s1";
   public static final String SMALL_INT_FIELD = "small_i";

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java Wed Dec  2 09:22:22 2015
@@ -23,7 +23,10 @@ import org.noggit.ObjectBuilder;
 import org.apache.solr.request.SolrQueryRequest;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,6 +39,8 @@ import java.util.Set;
 
 public class TestJoin extends SolrTestCaseJ4 {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   @BeforeClass
   public static void beforeTests() throws Exception {
     System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java Wed Dec  2 09:22:22 2015
@@ -17,6 +17,7 @@
 
 package org.apache.solr;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -30,6 +31,8 @@ import org.apache.solr.request.SolrQuery
 import org.apache.solr.schema.SchemaField;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is like TestRandomFaceting, except it does a copyField on each
@@ -39,6 +42,8 @@ import org.junit.Test;
 @Slow
 public class TestRandomDVFaceting extends SolrTestCaseJ4 {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   @BeforeClass
   public static void beforeTests() throws Exception {
     initCore("solrconfig-basic.xml","schema-docValuesFaceting.xml");

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java Wed Dec  2 09:22:22 2015
@@ -24,12 +24,17 @@ import org.apache.solr.request.SolrQuery
 import org.apache.solr.schema.SchemaField;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.lang.invoke.MethodHandles;
 import java.util.*;
 
 @Slow
 public class TestRandomFaceting extends SolrTestCaseJ4 {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   public static final String FOO_STRING_FIELD = "foo_s1";
   public static final String SMALL_STRING_FIELD = "small_s1";
   public static final String SMALL_INT_FIELD = "small_i";

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java Wed Dec  2 09:22:22 2015
@@ -24,11 +24,8 @@ import java.util.concurrent.TimeUnit;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.cloud.ActionThrottle.NanoTimeSource;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ActionThrottleTest extends SolrTestCaseJ4 {
-  protected static Logger log = LoggerFactory.getLogger(ActionThrottleTest.class);
   
   static class TestNanoTimeSource implements NanoTimeSource {
     

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java Wed Dec  2 09:22:22 2015
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,7 +51,7 @@ import java.util.List;
 @Slow
 public class AliasIntegrationTest extends AbstractFullDistribZkTestBase {
 
-  private static final Logger logger = LoggerFactory.getLogger(AliasIntegrationTest.class);
+  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
   public AliasIntegrationTest() {
     super();

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java Wed Dec  2 09:22:22 2015
@@ -34,12 +34,8 @@ import org.apache.solr.common.cloud.ZkSt
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class AssignTest extends SolrTestCaseJ4 {
-  protected static Logger log = LoggerFactory.getLogger(AssignTest.class);
-
   
   @Override
   @Before

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java Wed Dec  2 09:22:22 2015
@@ -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.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,6 +60,8 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.solr.cloud.OverseerCollectionMessageHandler.CREATE_NODE_SET;
 import static org.apache.solr.cloud.OverseerCollectionMessageHandler.NUM_SLICES;
@@ -97,6 +100,8 @@ import static org.apache.solr.common.clo
  */
 public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   protected int shardCount = 2;
   protected int replicationFactor = 2;
   protected boolean createTargetCollection = true;

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Wed Dec  2 09:22:22 2015
@@ -55,8 +55,11 @@ import org.apache.solr.util.DefaultSolrT
 import org.apache.solr.util.TimeOut;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -81,7 +84,9 @@ import java.util.concurrent.atomic.Atomi
 @Slow 
 @SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
-  
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   private static final String DEFAULT_COLLECTION = "collection1";
   protected static final boolean DEBUG = false;
   String t1="a_t";

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java Wed Dec  2 09:22:22 2015
@@ -22,8 +22,11 @@ import org.apache.solr.common.SolrInputD
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.handler.CdcrParams;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +34,8 @@ import java.util.Map;
 @Nightly
 public class CdcrReplicationDistributedZkTest extends BaseCdcrDistributedZkTest {
 
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   @Override
   public void distribSetUp() throws Exception {
     schemaString = "schema15.xml";      // we need a string id




Mime
View raw message