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:48 UTC
[13/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/core/src/java/org/apache/solr/search/function/FileFloatSource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
index 0f556ba..7382fdc 100644
--- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
+++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
@@ -38,6 +38,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.StandardCharsets;
import java.util.*;
@@ -55,7 +56,7 @@ public class FileFloatSource extends ValueSource {
private final float defVal;
private final String dataDir;
- private static final Logger log = LoggerFactory.getLogger(FileFloatSource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Creates a new FileFloatSource
@@ -248,7 +249,7 @@ public class FileFloatSource extends ValueSource {
is = VersionedFile.getLatestFile(ffs.dataDir, fname);
} catch (IOException e) {
// log, use defaults
- SolrCore.log.error("Error opening external value source file: " +e);
+ log.error("Error opening external value source file: " +e);
return vals;
}
@@ -290,7 +291,7 @@ public class FileFloatSource extends ValueSource {
fval=Float.parseFloat(val);
} catch (Exception e) {
if (++otherErrors<=10) {
- SolrCore.log.error( "Error loading external value source + fileName + " + e
+ log.error( "Error loading external value source + fileName + " + e
+ (otherErrors<10 ? "" : "\tSkipping future errors for this file.")
);
}
@@ -314,14 +315,14 @@ public class FileFloatSource extends ValueSource {
} catch (IOException e) {
// log, use defaults
- SolrCore.log.error("Error loading external value source: " +e);
+ log.error("Error loading external value source: " +e);
} finally {
// swallow exceptions on close so we don't override any
// exceptions that happened in the loop
try{r.close();}catch(Exception e){}
}
- SolrCore.log.info("Loaded external value source " + fname
+ log.info("Loaded external value source " + fname
+ (notFoundCount==0 ? "" : " :"+notFoundCount+" missing keys "+notFound)
);
@@ -329,8 +330,7 @@ public class FileFloatSource extends ValueSource {
}
public static class ReloadCacheRequestHandler extends RequestHandlerBase {
-
- static final Logger log = LoggerFactory.getLogger(ReloadCacheRequestHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
index cad085c..df3f03a 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
@@ -18,6 +18,7 @@ package org.apache.solr.search.grouping;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -113,7 +114,7 @@ public class CommandHandler {
}
- private final static Logger logger = LoggerFactory.getLogger(CommandHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final SolrIndexSearcher.QueryCommand queryCommand;
private final List<Command> commands;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
index 8b78065..fc71eaf 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
@@ -17,6 +17,8 @@ package org.apache.solr.search.grouping.distributed.shardresultserializer;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.search.FieldDoc;
@@ -56,7 +58,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
private final ResponseBuilder rb;
- private static final Logger log = LoggerFactory.getLogger(TopGroupsResultTransformer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public TopGroupsResultTransformer(ResponseBuilder rb) {
this.rb = rb;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java b/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java
index 3de5212..81aa5c2 100644
--- a/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java
@@ -39,8 +39,6 @@ import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.QParser;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.util.SolrPluginUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -58,8 +56,6 @@ public class CloudMLTQParser extends QParser {
super(qstr, localParams, params, req);
}
- private static Logger log = LoggerFactory
- .getLogger(CloudMLTQParser.class);
public Query parse() {
String id = localParams.get(QueryParsing.V);
// Do a Real Time Get for the document
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
index e3b18f5..43ecac4 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
@@ -16,7 +16,7 @@ package org.apache.solr.search.similarities;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.lucene.search.similarities.Similarity;
+import java.lang.invoke.MethodHandles;
import org.apache.solr.common.params.SolrParams;
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
*/
@Deprecated
public class DefaultSimilarityFactory extends ClassicSimilarityFactory {
-
- public static final Logger log = LoggerFactory.getLogger(DefaultSimilarityFactory.class);
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(SolrParams params) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
index 663ce9f..04156cf 100644
--- a/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
@@ -28,9 +28,6 @@ import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SimilarityFactory;
import org.apache.solr.util.plugin.SolrCoreAware;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* <code>SimilarityFactory</code> that returns a global {@link PerFieldSimilarityWrapper}
* that delegates to the field type, if it's configured. For field type's that
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
index 8d6e221..d51bf09 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
@@ -23,14 +23,14 @@ import org.apache.solr.request.SolrQueryRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
public class ExactSharedStatsCache extends ExactStatsCache {
- private static final Logger LOG = LoggerFactory
- .getLogger(ExactSharedStatsCache.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// local stats obtained from shard servers
private final Map<String,Map<String,TermStats>> perShardTermStats = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
index f39a359..0e55b94 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -54,7 +55,7 @@ import java.util.Set;
* query terms (and collection statistics for term fields).
*/
public class ExactStatsCache extends StatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(ExactStatsCache.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// experimenting with strategy that takes more RAM, but also doesn't share memory
// across threads
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
index 631b413..45e49b0 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
@@ -18,6 +18,7 @@ package org.apache.solr.search.stats;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -54,7 +55,7 @@ import org.slf4j.LoggerFactory;
* that is updated with the global statistics on every request.
*/
public class LRUStatsCache extends ExactStatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(LRUStatsCache.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// local stats obtained from shard servers
private final Map<String,SolrCache<String,TermStats>> perShardTermStats = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
index 411e5a5..8e908ed 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
@@ -1,5 +1,7 @@
package org.apache.solr.search.stats;
+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
@@ -33,7 +35,7 @@ import org.slf4j.LoggerFactory;
* uses local term statistics.
*/
public class LocalStatsCache extends StatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(LocalStatsCache.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public StatsSource get(SolrQueryRequest req) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
index 4e79842..08c6a50 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
@@ -1,5 +1,7 @@
package org.apache.solr.search.stats;
+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
@@ -32,7 +34,7 @@ import org.slf4j.LoggerFactory;
*/
public class StatsUtil {
- private static final Logger LOG = LoggerFactory.getLogger(StatsSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Make a String representation of {@link CollectionStats}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
index 384b438..e28ba76 100644
--- a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
@@ -44,11 +44,8 @@ import org.apache.solr.client.solrj.impl.HttpClientConfigurer;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.CommandOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BasicAuthPlugin extends AuthenticationPlugin implements ConfigEditablePlugin {
- protected static final Logger log = LoggerFactory.getLogger(BasicAuthPlugin.class);
private AuthenticationProvider zkAuthentication;
private final static ThreadLocal<Header> authHeader = new ThreadLocal<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/KerberosFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/KerberosFilter.java b/solr/core/src/java/org/apache/solr/security/KerberosFilter.java
index 1689f30..cc6cd18 100644
--- a/solr/core/src/java/org/apache/solr/security/KerberosFilter.java
+++ b/solr/core/src/java/org/apache/solr/security/KerberosFilter.java
@@ -1,6 +1,7 @@
package org.apache.solr.security;
import java.io.IOException;
+
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
@@ -9,8 +10,6 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,8 +30,6 @@ import org.slf4j.LoggerFactory;
public class KerberosFilter extends AuthenticationFilter {
- static final Logger log = LoggerFactory.getLogger(KerberosFilter.class);
-
@Override
public void init(FilterConfig conf) throws ServletException {
super.init(conf);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java
index d0f03fb..ba27f09 100644
--- a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java
@@ -1,6 +1,7 @@
package org.apache.solr.security;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -51,7 +52,7 @@ import org.slf4j.LoggerFactory;
*/
public class KerberosPlugin extends AuthenticationPlugin implements HttpClientInterceptorPlugin {
- static final Logger log = LoggerFactory.getLogger(KerberosPlugin.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
HttpClientConfigurer kerberosConfigurer = new Krb5HttpClientConfigurer();
Filter kerberosFilter = new KerberosFilter();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
index 1dc7c14..7570808 100644
--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
@@ -23,6 +23,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
import java.security.Principal;
import java.security.PublicKey;
@@ -60,7 +61,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
public class PKIAuthenticationPlugin extends AuthenticationPlugin implements HttpClientInterceptorPlugin {
- static private final Logger log = LoggerFactory.getLogger(PKIAuthenticationPlugin.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Map<String, PublicKey> keyCache = new ConcurrentHashMap<>();
private final CryptoKeys.RSAKeyPair keyPair = new CryptoKeys.RSAKeyPair();
private final CoreContainer cores;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
index f6ca00d..d328631 100644
--- a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
@@ -18,6 +18,7 @@ package org.apache.solr.security;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
@@ -46,7 +47,7 @@ import static org.apache.solr.common.util.Utils.getDeepCopy;
public class RuleBasedAuthorizationPlugin implements AuthorizationPlugin, ConfigEditablePlugin {
- static final Logger log = LoggerFactory.getLogger(RuleBasedAuthorizationPlugin.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Map<String, Set<String>> usersVsRoles = new HashMap<>();
private final Map<String, WildCardSupportMap> mapping = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
index b38b01b..b8558ff 100644
--- a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
+++ b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
@@ -17,6 +17,7 @@ package org.apache.solr.security;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -31,6 +32,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.codec.binary.Base64;
import org.apache.solr.util.CommandOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.solr.handler.admin.SecurityConfHandler.getMapValue;
@@ -39,6 +42,8 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basi
private String realm;
private Map<String, String> promptHeader;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
static void putUser(String user, String pwd, Map credentials) {
if (user == null || pwd == null) return;
@@ -60,13 +65,13 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basi
credentials = new LinkedHashMap<>();
Map<String,String> users = (Map<String,String>) pluginConfig.get("credentials");
if (users == null) {
- BasicAuthPlugin.log.warn("No users configured yet");
+ log.warn("No users configured yet");
return;
}
for (Map.Entry<String, String> e : users.entrySet()) {
String v = e.getValue();
if (v == null) {
- BasicAuthPlugin.log.warn("user has no password " + e.getKey());
+ log.warn("user has no password " + e.getKey());
continue;
}
credentials.put(e.getKey(), v);
@@ -99,7 +104,7 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basi
try {
digest = MessageDigest.getInstance("SHA-256");
} catch (NoSuchAlgorithmException e) {
- BasicAuthPlugin.log.error(e.getMessage(), e);
+ log.error(e.getMessage(), e);
return null;//should not happen
}
if (saltKey != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 7ceafab..3256c5e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
@@ -117,7 +118,7 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETURN;
* This class represents a call made to Solr
**/
public class HttpSolrCall {
- protected static Logger log = LoggerFactory.getLogger(HttpSolrCall.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final Random random;
static {
@@ -309,7 +310,7 @@ public class HttpSolrCall {
return; // we are done with a valid handler
}
}
- SolrDispatchFilter.log.debug("no handler or core retrieved for " + path + ", follow through...");
+ log.debug("no handler or core retrieved for " + path + ", follow through...");
action = PASSTHROUGH;
}
@@ -474,7 +475,7 @@ public class HttpSolrCall {
while (t != null) {
if (t instanceof Error) {
if (t != ex) {
- SolrDispatchFilter.log.error("An Error was wrapped in another exception - please report complete stacktrace on SOLR-6161", ex);
+ log.error("An Error was wrapped in another exception - please report complete stacktrace on SOLR-6161", ex);
}
throw (Error) t;
}
@@ -501,7 +502,7 @@ public class HttpSolrCall {
void destroy() {
try {
if (solrReq != null) {
- SolrDispatchFilter.log.debug("Closing out SolrRequest: {}", solrReq);
+ log.debug("Closing out SolrRequest: {}", solrReq);
solrReq.close();
}
} finally {
@@ -630,7 +631,7 @@ public class HttpSolrCall {
try {
if (exp != null) {
SimpleOrderedMap info = new SimpleOrderedMap();
- int code = ResponseUtils.getErrorInfo(ex, info, SolrDispatchFilter.log);
+ int code = ResponseUtils.getErrorInfo(ex, info, log);
sendError(code, info.toString());
}
} finally {
@@ -645,7 +646,7 @@ public class HttpSolrCall {
try {
response.sendError(code, message);
} catch (EOFException e) {
- SolrDispatchFilter.log.info("Unable to write error response, client closed connection or we are shutting down", e);
+ log.info("Unable to write error response, client closed connection or we are shutting down", e);
}
}
@@ -662,8 +663,8 @@ public class HttpSolrCall {
SolrCore.preDecorateResponse(solrReq, solrResp);
handler.handleRequest(solrReq, solrResp);
SolrCore.postDecorateResponse(handler, solrReq, solrResp);
- if (SolrDispatchFilter.log.isInfoEnabled() && solrResp.getToLog().size() > 0) {
- SolrDispatchFilter.log.info(solrResp.getToLogAsString("[admin] "));
+ if (log.isInfoEnabled() && solrResp.getToLog().size() > 0) {
+ log.info(solrResp.getToLogAsString("[admin] "));
}
QueryResponseWriter respWriter = SolrCore.DEFAULT_RESPONSE_WRITERS.get(solrReq.getParams().get(CommonParams.WT));
if (respWriter == null) respWriter = SolrCore.DEFAULT_RESPONSE_WRITERS.get("standard");
@@ -721,7 +722,7 @@ public class HttpSolrCall {
if (solrRsp.getException() != null) {
NamedList info = new SimpleOrderedMap();
- int code = ResponseUtils.getErrorInfo(solrRsp.getException(), info, SolrDispatchFilter.log);
+ int code = ResponseUtils.getErrorInfo(solrRsp.getException(), info, log);
solrRsp.add("error", info);
response.setStatus(code);
}
@@ -731,7 +732,7 @@ public class HttpSolrCall {
}
//else http HEAD request, nothing to write out, waited this long just to get ContentType
} catch (EOFException e) {
- SolrDispatchFilter.log.info("Unable to write response, client closed connection or we are shutting down", e);
+ log.info("Unable to write response, client closed connection or we are shutting down", e);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 93975eb..fa2cb4c 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -58,7 +59,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.2
*/
public class SolrDispatchFilter extends BaseSolrFilter {
- static final Logger log = LoggerFactory.getLogger(SolrDispatchFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected volatile CoreContainer cores;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 9af8239..d8f9134 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -58,16 +58,12 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.util.RTimer;
import org.apache.solr.util.RTimerTree;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.PATH;
public class SolrRequestParsers
{
- final static Logger log = LoggerFactory.getLogger(SolrRequestParsers.class);
-
// Should these constants be in a more public place?
public static final String MULTIPART = "multipart";
public static final String FORMDATA = "formdata";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
index 248dc70..35da535 100644
--- a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
@@ -29,8 +29,6 @@ import org.apache.lucene.search.spell.SuggestMode;
import org.apache.lucene.search.spell.SuggestWord;
import org.apache.lucene.search.spell.SuggestWordFrequencyComparator;
import org.apache.lucene.search.spell.SuggestWordQueue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
@@ -62,7 +60,6 @@ import org.apache.solr.search.SolrIndexSearcher;
* @since solr 1.3
*/
public abstract class AbstractLuceneSpellChecker extends SolrSpellChecker {
- public static final Logger log = LoggerFactory.getLogger(AbstractLuceneSpellChecker.class);
public static final String SPELLCHECKER_ARG_NAME = "spellchecker";
public static final String LOCATION = "sourceLocation";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
index 14e26f1..71cff72 100644
--- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
@@ -18,6 +18,7 @@ package org.apache.solr.spelling;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -65,7 +66,7 @@ import org.slf4j.LoggerFactory;
* @see DirectSpellChecker
*/
public class DirectSolrSpellChecker extends SolrSpellChecker {
- private static final Logger LOG = LoggerFactory.getLogger(DirectSolrSpellChecker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// configuration params shared with other spellcheckers
public static final String COMPARATOR_CLASS = AbstractLuceneSpellChecker.COMPARATOR_CLASS;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
index fe24a74..fd9ca21 100644
--- a/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
@@ -18,6 +18,7 @@ package org.apache.solr.spelling;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.lucene.document.Field;
@@ -50,7 +51,7 @@ import org.apache.solr.search.SolrIndexSearcher;
**/
public class FileBasedSpellChecker extends AbstractLuceneSpellChecker {
- private static final Logger log = LoggerFactory.getLogger(FileBasedSpellChecker.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SOURCE_FILE_CHAR_ENCODING = "characterEncoding";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
index 5726166..343d973 100644
--- a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
@@ -28,9 +28,6 @@ import org.apache.solr.search.SolrIndexSearcher;
import java.io.File;
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* <p>
@@ -45,7 +42,6 @@ import org.slf4j.LoggerFactory;
* @since solr 1.3
**/
public class IndexBasedSpellChecker extends AbstractLuceneSpellChecker {
- private static final Logger log = LoggerFactory.getLogger(IndexBasedSpellChecker.class);
public static final String THRESHOLD_TOKEN_FREQUENCY = "thresholdTokenFrequency";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
index e422d6c..3c142fc 100644
--- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
+++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
@@ -16,6 +16,7 @@ package org.apache.solr.spelling;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -41,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SpellCheckCollator {
- private static final Logger LOG = LoggerFactory.getLogger(SpellCheckCollator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private int maxCollations = 1;
private int maxCollationTries = 0;
private int maxCollationEvaluations = 10000;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
index 5272b1b..54fefe5 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -56,7 +57,7 @@ import static org.apache.solr.spelling.suggest.fst.AnalyzingInfixLookupFactory.C
* {@link Dictionary}
* */
public class SolrSuggester implements Accountable {
- private static final Logger LOG = LoggerFactory.getLogger(SolrSuggester.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Name used when an unnamed suggester config is passed */
public static final String DEFAULT_DICT_NAME = "default";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
index a7c9964..d822da9 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
@@ -24,6 +24,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
@@ -54,7 +55,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Suggester extends SolrSpellChecker {
- private static final Logger LOG = LoggerFactory.getLogger(Suggester.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Location of the source data - either a path to a file, or null for the
* current IndexReader.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
index 4662da1..996347f 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
@@ -1,5 +1,7 @@
package org.apache.solr.spelling.suggest.jaspell;
+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
@@ -30,7 +32,7 @@ import org.slf4j.LoggerFactory;
* <b>Note:</b> This Suggester is not very RAM efficient.
*/
public class JaspellLookupFactory extends LookupFactory {
- private static final Logger LOG = LoggerFactory.getLogger(JaspellLookup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String FILENAME = "jaspell.dat";
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java
index 5389ede..bfec448 100644
--- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java
+++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java
@@ -20,6 +20,7 @@ package org.apache.solr.store.blockcache;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Set;
import org.apache.lucene.index.IndexFileNames;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
* @lucene.experimental
*/
public class BlockDirectory extends FilterDirectory {
- public static Logger LOG = LoggerFactory.getLogger(BlockDirectory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final long BLOCK_SHIFT = 13; // 2^13 = 8,192 bytes per block
public static final long BLOCK_MOD = 0x1FFF;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
index 454927e..e42e4c2 100644
--- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
+++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java
@@ -18,6 +18,7 @@ package org.apache.solr.store.hdfs;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -41,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HdfsDirectory extends BaseDirectory {
- public static Logger LOG = LoggerFactory.getLogger(HdfsDirectory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final int BUFFER_SIZE = 8192;
@@ -189,8 +190,7 @@ public class HdfsDirectory extends BaseDirectory {
}
static class HdfsIndexInput extends CustomBufferedIndexInput {
- public static Logger LOG = LoggerFactory
- .getLogger(HdfsIndexInput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Path path;
private final FSDataInputStream inputStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java
index 0294496..953b2c3 100644
--- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java
+++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java
@@ -19,6 +19,7 @@ package org.apache.solr.store.hdfs;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
@@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
*/
public class HdfsFileReader extends DataInput {
- public static Logger LOG = LoggerFactory.getLogger(HdfsFileReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Path path;
private FSDataInputStream inputStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
index 56d97b3..fa0dacb 100644
--- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
+++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
@@ -18,6 +18,7 @@ package org.apache.solr.store.hdfs;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.Arrays;
import java.util.Iterator;
@@ -44,7 +45,7 @@ public class HdfsLocalityReporter implements SolrInfoMBean {
public static final String LOCALITY_BLOCKS_LOCAL = "locality.blocks.local";
public static final String LOCALITY_BLOCKS_RATIO = "locality.blocks.ratio";
- public static final Logger logger = LoggerFactory.getLogger(HdfsLocalityReporter.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String hostname;
private final ConcurrentMap<HdfsDirectory,ConcurrentMap<FileStatus,BlockLocation[]>> cache;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
index 940c78c..7d704d2 100644
--- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
+++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java
@@ -18,6 +18,7 @@ package org.apache.solr.store.hdfs;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -35,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HdfsLockFactory extends LockFactory {
- public static Logger log = LoggerFactory.getLogger(HdfsLockFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final HdfsLockFactory INSTANCE = new HdfsLockFactory();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/CommitTracker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
index a99b3dc..93e9f32 100644
--- a/solr/core/src/java/org/apache/solr/update/CommitTracker.java
+++ b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
@@ -1,5 +1,7 @@
package org.apache.solr.update;
+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
@@ -44,7 +46,7 @@ import org.slf4j.LoggerFactory;
* Public for tests.
*/
public final class CommitTracker implements Runnable {
- protected final static Logger log = LoggerFactory.getLogger(CommitTracker.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// scheduler delay for maxDoc-triggered autocommits
public final int DOC_COMMIT_DELAY_MS = 1;
@@ -80,7 +82,7 @@ public final class CommitTracker implements Runnable {
this.softCommit = softCommit;
this.openSearcher = openSearcher;
- SolrCore.log.info(name + " AutoCommit: " + this);
+ log.info(name + " AutoCommit: " + this);
}
public boolean getOpenSearcher() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
index c3ef447..f9eb28c 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -18,6 +18,7 @@ package org.apache.solr.update;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -40,7 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class DefaultSolrCoreState extends SolrCoreState implements RecoveryStrategy.RecoveryListener {
- public static Logger log = LoggerFactory.getLogger(DefaultSolrCoreState.class);
+ 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/update/DirectUpdateHandler2.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index c2ecad1..a37b785 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -51,8 +51,11 @@ import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SyntaxError;
import org.apache.solr.search.function.ValueSourceRangeFilter;
import org.apache.solr.util.RefCounted;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -95,6 +98,8 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
protected boolean commitWithinSoftCommit;
protected boolean indexWriterCloseWaitsForMerges;
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public DirectUpdateHandler2(SolrCore core) {
super(core);
@@ -143,7 +148,7 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
}
private void deleteAll() throws IOException {
- SolrCore.log.info(core.getLogId() + "REMOVING ALL DOCUMENTS FROM INDEX");
+ log.info(core.getLogId() + "REMOVING ALL DOCUMENTS FROM INDEX");
RefCounted<IndexWriter> iw = solrCoreState.getIndexWriter(core);
try {
iw.get().deleteAll();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java
index b6787e6..4427479 100644
--- a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java
+++ b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java
@@ -18,6 +18,7 @@
package org.apache.solr.update;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -57,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class HdfsTransactionLog extends TransactionLog {
- public static Logger log = LoggerFactory.getLogger(HdfsTransactionLog.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
Path tlogFile;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
index 6a0b6bd..8cb8b06 100644
--- a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
@@ -19,6 +19,7 @@ package org.apache.solr.update;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -38,6 +39,8 @@ import org.apache.solr.common.util.IOUtils;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.HdfsUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** @lucene.experimental */
public class HdfsUpdateLog extends UpdateLog {
@@ -47,6 +50,8 @@ public class HdfsUpdateLog extends UpdateLog {
private volatile Path tlogDir;
private final String confDir;
private Integer tlogDfsReplication;
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// used internally by tests to track total count of failed tran log loads in init
public static AtomicLong INIT_FAILED_LOGS_COUNT = new AtomicLong();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java b/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java
index e710c0a..35c5cc8 100644
--- a/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java
+++ b/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java
@@ -22,12 +22,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
/**
* An {@link InfoStream} implementation which passes messages on to Solr's logging.
*/
public class LoggingInfoStream extends InfoStream {
- public static final Logger log = LoggerFactory.getLogger(LoggingInfoStream.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void message(String component, String message) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/PeerSync.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java
index 88ce821..5161c2e 100644
--- a/solr/core/src/java/org/apache/solr/update/PeerSync.java
+++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java
@@ -21,6 +21,7 @@ import static org.apache.solr.update.processor.DistributedUpdateProcessor.Distri
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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index 12293aa..0c81bb0 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCoreState.java b/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
index 086c8ce..03e897f 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index 4744a9b..f4d73eb 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -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.Config.assertWarnOrFail;
* defined in the <indexConfig> 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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
index fd03f42..b0531d4 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
index 036d0ad..c337825 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
index 1e9d6dd..3ccc98d 100644
--- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
+++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
@@ -30,6 +30,7 @@ import org.apache.solr.update.processor.DistributingUpdateProcessorFactory;
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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/TransactionLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/TransactionLog.java b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
index 0b829a3..4cdfd99 100644
--- a/solr/core/src/java/org/apache/solr/update/TransactionLog.java
+++ b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
index 9059605..9defc33 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 22188a9..490fb3f 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -24,6 +24,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 PluginInfoInitialized {
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();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index f51d030..ad9606d 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -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)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/VersionInfo.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/VersionInfo.java b/solr/core/src/java/org/apache/solr/update/VersionInfo.java
index f40b131..f07798b 100644
--- a/solr/core/src/java/org/apache/solr/update/VersionInfo.java
+++ b/solr/core/src/java/org/apache/solr/update/VersionInfo.java
@@ -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;
@@ -44,7 +45,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_";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
index d388e7e..b71c1a2 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
@@ -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.ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG;
* </processor></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";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
index 7884fb3..30a7158 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
@@ -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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
index e65458a..95376f5 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
index 290cf9d..ad5c772 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
@@ -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";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index 4a647bb..54249ed 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@ -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 extends UpdateRequestProcessor {
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>.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
index fcade66..cd5db4f 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
@@ -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.processor.DistributingUpdateProcessorFactor
* </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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
index e6b134e..533b92f 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
@@ -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 DocExpirationUpdateProcessorFactory
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";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
index 1fa3c5d..7ea704b 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
@@ -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,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
index 373558d..b72475a 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
@@ -32,8 +32,6 @@ import org.apache.solr.request.SolrQueryRequest;
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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
index cc8b5b9..e174d7a 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
@@ -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() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
index d3eea4f..c8dbba6 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
@@ -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 IgnoreCommitOptimizeUpdateProcessorFactory extends UpdateRequestPro
public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
return new IgnoreCommitOptimizeUpdateProcessor(rsp, this, next);
}
-}
-
-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;
- }
+
+ 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;
+ }
- @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);
+ }
}
}
}