You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/12/02 10:22:27 UTC
svn commit: r1717590 [4/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...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -89,7 +90,7 @@ import static org.apache.solr.core.SolrC
import static org.apache.solr.schema.FieldType.CLASS_NAME;
public class SolrConfigHandler extends RequestHandlerBase {
- public static final Logger log = LoggerFactory.getLogger(SolrConfigHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String CONFIGSET_EDITING_DISABLED_ARG = "disable.configEdit";
public static final boolean configEditing_disabled = Boolean.getBoolean(CONFIGSET_EDITING_DISABLED_ARG);
private static final Map<String, SolrConfig.SolrPluginInfo> namedPlugins;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/StreamHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/StreamHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/StreamHandler.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
+import java.lang.invoke.MethodHandles;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.HashMap;
@@ -70,7 +71,7 @@ public class StreamHandler extends Reque
static SolrClientCache clientCache = new SolrClientCache();
private StreamFactory streamFactory = new StreamFactory();
- private Logger logger = LoggerFactory.getLogger(StreamHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public void inform(SolrCore core) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java Wed Dec 2 09:22:22 2015
@@ -38,8 +38,6 @@ import org.apache.solr.handler.loader.XM
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.PATH;
@@ -47,7 +45,6 @@ import static org.apache.solr.common.par
* UpdateHandler that uses content-type to pick the right Loader
*/
public class UpdateRequestHandler extends ContentStreamHandlerBase {
- public static Logger log = LoggerFactory.getLogger(UpdateRequestHandler.class);
// XML Constants
public static final String ADD = "add";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.handler.admin;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.Map;
@@ -41,7 +42,7 @@ import org.slf4j.LoggerFactory;
@Deprecated
public class AdminHandlers extends RequestHandlerBase implements SolrCoreAware
{
- public static Logger log = LoggerFactory.getLogger(AdminHandlers.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
NamedList initArgs = null;
private static class StandardHandler {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.handler.admin;
+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
@@ -111,7 +113,7 @@ import static org.apache.solr.common.par
import static org.apache.solr.common.util.StrUtils.formatString;
public class CollectionsHandler extends RequestHandlerBase {
- protected static Logger log = LoggerFactory.getLogger(CollectionsHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final CoreContainer coreContainer;
public CollectionsHandler() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.handler.admin;
+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
@@ -58,7 +60,7 @@ import static org.apache.solr.cloud.Over
* A {@link org.apache.solr.request.SolrRequestHandler} for ConfigSets API requests.
*/
public class ConfigSetsHandler extends RequestHandlerBase {
- protected static Logger log = LoggerFactory.getLogger(ConfigSetsHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final CoreContainer coreContainer;
public static long DEFAULT_ZK_TIMEOUT = 300*1000;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.admin;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
@@ -95,7 +96,7 @@ import static org.apache.solr.common.par
* @since solr 1.3
*/
public class CoreAdminHandler extends RequestHandlerBase {
- protected static Logger log = LoggerFactory.getLogger(CoreAdminHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final CoreContainer coreContainer;
protected final Map<String, Map<String, TaskObject>> requestStatusMap;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java Wed Dec 2 09:22:22 2015
@@ -25,13 +25,10 @@ import org.apache.solr.handler.RequestHa
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.PATH;
public class InfoHandler extends RequestHandlerBase {
- protected static Logger log = LoggerFactory.getLogger(InfoHandler.class);
protected final CoreContainer coreContainer;
private ThreadDumpHandler threadDumpHandler = new ThreadDumpHandler();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.handler.admin;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -35,6 +36,7 @@ import org.apache.solr.logging.LoggerInf
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.SolrCoreAware;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +46,7 @@ import org.slf4j.LoggerFactory;
* @since 4.0
*/
public class LoggingHandler extends RequestHandlerBase implements SolrCoreAware {
- static final org.slf4j.Logger log = LoggerFactory.getLogger(LoggingHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private LogWatcher watcher;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.handler.admin;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -95,7 +96,7 @@ import static org.apache.lucene.index.In
*/
public class LukeRequestHandler extends RequestHandlerBase
{
- private static Logger log = LoggerFactory.getLogger(LukeRequestHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String NUMTERMS = "numTerms";
public static final String INCLUDE_INDEX_FIELD_FLAGS = "includeIndexFieldFlags";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java Wed Dec 2 09:22:22 2015
@@ -13,6 +13,8 @@ import static org.apache.solr.common.clo
import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS;
import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
+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
@@ -56,7 +58,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class RebalanceLeaders {
- private static Logger log = LoggerFactory.getLogger(RebalanceLeaders.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
final SolrQueryRequest req;
final SolrQueryResponse rsp;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java Wed Dec 2 09:22:22 2015
@@ -18,8 +18,6 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.NAME;
@@ -44,7 +42,6 @@ import static org.apache.solr.common.par
* This handler exposes information about last commit generation segments
*/
public class SegmentsInfoRequestHandler extends RequestHandlerBase {
- private static Logger log = LoggerFactory.getLogger(SegmentsInfoRequestHandler.class);
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Wed Dec 2 09:22:22 2015
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.URISyntaxException;
import java.util.Date;
import java.util.HashSet;
@@ -96,8 +97,7 @@ public class ShowFileRequestHandler exte
protected Set<String> hiddenFiles;
- protected static final Logger log = LoggerFactory
- .getLogger(ShowFileRequestHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ShowFileRequestHandler()
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Dec 2 09:22:22 2015
@@ -25,6 +25,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.lang.management.PlatformManagedObject;
@@ -63,7 +64,7 @@ import static org.apache.solr.common.par
*/
public class SystemInfoHandler extends RequestHandlerBase
{
- private static Logger log = LoggerFactory.getLogger(SystemInfoHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// on some platforms, resolving canonical hostname can cause the thread
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -81,7 +82,7 @@ import static org.apache.solr.common.par
public final class ZookeeperInfoHandler extends RequestHandlerBase {
private final CoreContainer cores;
- static final Logger log = LoggerFactory.getLogger(ZookeeperInfoHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// used for custom sorting collection names looking like prefix##
// only go out to 7 digits (which safely fits in an int)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.handler.component;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -60,7 +61,7 @@ import org.slf4j.LoggerFactory;
*/
@SuppressWarnings("rawtypes")
public class FacetComponent extends SearchComponent {
- public static Logger log = LoggerFactory.getLogger(FacetComponent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_NAME = "facet";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Wed Dec 2 09:22:22 2015
@@ -16,6 +16,7 @@ package org.apache.solr.handler.componen
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.util.Arrays;
import java.util.Collection;
@@ -68,7 +69,7 @@ public class HttpShardHandler extends Sh
private Map<String,List<String>> shardToURLs;
private HttpClient httpClient;
- protected static Logger log = LoggerFactory.getLogger(HttpShardHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public HttpShardHandler(HttpShardHandlerFactory httpShardHandlerFactory, HttpClient httpClient) {
this.httpClient = httpClient;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java Wed Dec 2 09:22:22 2015
@@ -37,6 +37,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.List;
import java.util.Random;
@@ -50,7 +51,7 @@ import java.util.concurrent.TimeUnit;
public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.apache.solr.util.plugin.PluginInfoInitialized {
- protected static Logger log = LoggerFactory.getLogger(HttpShardHandlerFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String DEFAULT_SCHEME = "http";
// We want an executor that doesn't take up any resources if
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.handler.component;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -60,8 +61,7 @@ import org.slf4j.LoggerFactory;
public class MoreLikeThisComponent extends SearchComponent {
public static final String COMPONENT_NAME = "mlt";
public static final String DIST_DOC_ID = "mlt.dist.id";
- static final Logger log = LoggerFactory
- .getLogger(MoreLikeThisComponent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void prepare(ResponseBuilder rb) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Wed Dec 2 09:22:22 2015
@@ -20,6 +20,7 @@ package org.apache.solr.handler.componen
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -121,7 +122,7 @@ import org.slf4j.LoggerFactory;
public class QueryComponent extends SearchComponent
{
public static final String COMPONENT_NAME = "query";
- private static final Logger LOG = LoggerFactory.getLogger(QueryComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void prepare(ResponseBuilder rb) throws IOException
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Dec 2 09:22:22 2015
@@ -82,6 +82,7 @@ import javax.xml.xpath.XPathFactory;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -100,7 +101,7 @@ import java.util.WeakHashMap;
* @since solr 1.3
*/
public class QueryElevationComponent extends SearchComponent implements SolrCoreAware {
- private static Logger log = LoggerFactory.getLogger(QueryElevationComponent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// Constants used in solrconfig.xml
static final String FIELD_TYPE = "queryFieldType";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java Wed Dec 2 09:22:22 2015
@@ -40,14 +40,10 @@ import org.apache.solr.schema.TrieField;
import org.apache.solr.search.DocSet;
import org.apache.solr.search.SyntaxError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Processor for Range Facets
*/
public class RangeFacetProcessor extends SimpleFacets {
- private final static Logger log = LoggerFactory.getLogger(RangeFacetProcessor.class);
public RangeFacetProcessor(SolrQueryRequest req, DocSet docs, SolrParams params, ResponseBuilder rb) {
super(req, docs, params, rb);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.handler.component;
+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
@@ -48,7 +50,7 @@ import org.slf4j.LoggerFactory;
* calculates all the ranges (gaps) required to be counted.
*/
public class RangeFacetRequest extends FacetComponent.FacetBase {
- private final static Logger log = LoggerFactory.getLogger(RangeFacetRequest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SchemaField schemaField;
protected final String start;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.handler.componen
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -70,7 +71,7 @@ import org.slf4j.LoggerFactory;
public class RealTimeGetComponent extends SearchComponent
{
- public static Logger log = LoggerFactory.getLogger(UpdateLog.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_NAME = "get";
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.componen
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedList;
@@ -64,11 +65,7 @@ public class SearchHandler extends Reque
static final String INIT_FIRST_COMPONENTS = "first-components";
static final String INIT_LAST_COMPONENTS = "last-components";
-
-
-
-
- protected static Logger log = LoggerFactory.getLogger(SearchHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected volatile List<SearchComponent> components;
private ShardHandlerFactory shardHandlerFactory ;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.handler.component;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -83,7 +84,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.3
*/
public class SpellCheckComponent extends SearchComponent implements SolrCoreAware, SpellingParams {
- private static final Logger LOG = LoggerFactory.getLogger(SpellCheckComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final boolean DEFAULT_ONLY_MORE_POPULAR = false;
@@ -754,7 +755,7 @@ public class SpellCheckComponent extends
+ checker.getDictionaryName());
checker.reload(core, newSearcher);
} catch (IOException e) {
- log.error( "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
+ LOG.error( "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
} else {
// newSearcher event
@@ -776,7 +777,7 @@ public class SpellCheckComponent extends
LOG.info("Building spell index for spell checker: " + checker.getDictionaryName());
checker.build(core, newSearcher);
} catch (Exception e) {
- log.error(
+ LOG.error(
"Exception in building spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.componen
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -62,7 +63,7 @@ import org.slf4j.LoggerFactory;
* and for initializing them as specified by SolrConfig
*/
public class SuggestComponent extends SearchComponent implements SolrCoreAware, SuggesterParams, Accountable {
- private static final Logger LOG = LoggerFactory.getLogger(SuggestComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Name used to identify whether the user query concerns this component */
public static final String COMPONENT_NAME = "suggest";
@@ -523,7 +524,7 @@ public class SuggestComponent extends Se
try {
suggester.build(core, newSearcher);
} catch (Exception e) {
- log.error("Exception in building suggester index for: " + suggester.getName(), e);
+ LOG.error("Exception in building suggester index for: " + suggester.getName(), e);
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java Wed Dec 2 09:22:22 2015
@@ -36,8 +36,6 @@ import java.util.List;
import java.util.HashMap;
import java.util.Iterator;
import java.io.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
abstract class CSVLoaderBase extends ContentStreamLoader {
public static final String SEPARATOR="separator";
@@ -59,8 +57,6 @@ abstract class CSVLoaderBase extends Con
private static Pattern colonSplit = Pattern.compile(":");
private static Pattern commaSplit = Pattern.compile(",");
- public static Logger log = LoggerFactory.getLogger(CSVLoaderBase.class);
-
final SolrParams params;
final CSVStrategy strategy;
final UpdateRequestProcessor processor;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java Wed Dec 2 09:22:22 2015
@@ -31,8 +31,6 @@ import org.apache.solr.response.SolrQuer
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.EOFException;
import java.io.IOException;
@@ -48,7 +46,6 @@ import java.util.Set;
* @see org.apache.solr.common.util.JavaBinCodec
*/
public class JavabinLoader extends ContentStreamLoader {
- public static Logger log = LoggerFactory.getLogger(JavabinLoader.class);
@Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream, UpdateRequestProcessor processor) throws Exception {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.loader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -62,7 +63,7 @@ import static org.apache.solr.common.par
* @since solr 4.0
*/
public class JsonLoader extends ContentStreamLoader {
- final static Logger log = LoggerFactory.getLogger(JsonLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String CHILD_DOC_KEY = "_childDocuments_";
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java Wed Dec 2 09:22:22 2015
@@ -30,6 +30,7 @@ import javax.xml.transform.sax.SAXSource
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -70,7 +71,7 @@ import static org.apache.solr.common.par
public class XMLLoader extends ContentStreamLoader {
- public static Logger log = LoggerFactory.getLogger(XMLLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
public static final String CONTEXT_TRANSFORMER_KEY = "xsltupdater.transformer";
@@ -163,11 +164,11 @@ public class XMLLoader extends ContentSt
else {
try {
is = stream.getStream();
- if (UpdateRequestHandler.log.isTraceEnabled()) {
+ if (log.isTraceEnabled()) {
final byte[] body = IOUtils.toByteArray(is);
// TODO: The charset may be wrong, as the real charset is later
// determined by the XML parser, the content-type is only used as a hint!
- UpdateRequestHandler.log.trace("body", new String(body, (charset == null) ?
+ log.trace("body", new String(body, (charset == null) ?
ContentStreamBase.DEFAULT_CHARSET : charset));
IOUtils.closeQuietly(is);
is = new ByteArrayInputStream(body);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.highlight;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -82,7 +83,7 @@ import org.slf4j.LoggerFactory;
public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInfoInitialized
{
- public static Logger log = LoggerFactory.getLogger(DefaultSolrHighlighter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SolrCore solrCore;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java Wed Dec 2 09:22:22 2015
@@ -23,8 +23,6 @@ import org.apache.solr.common.util.Named
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocList;
import org.apache.solr.util.SolrPluginUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,7 +33,6 @@ public abstract class SolrHighlighter
{
public static int DEFAULT_PHRASE_LIMIT = 5000;
- public static Logger log = LoggerFactory.getLogger(SolrHighlighter.class);
/**
* Check whether Highlighting is enabled for this request.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/LogWatcher.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/LogWatcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/LogWatcher.java Wed Dec 2 09:22:22 2015
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.StaticLoggerBinder;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -38,7 +39,7 @@ import java.util.concurrent.atomic.Atomi
*/
public abstract class LogWatcher<E> {
- private static final Logger log = LoggerFactory.getLogger(LogWatcher.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected CircularList<E> history;
protected long last = -1;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Wed Dec 2 09:22:22 2015
@@ -73,8 +73,6 @@ import org.apache.solr.search.SyntaxErro
import org.apache.solr.search.grouping.GroupingSpecification;
import org.apache.solr.util.BoundedTreeSet;
import org.apache.solr.util.DefaultSolrThreadFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -101,8 +99,6 @@ import java.util.concurrent.TimeUnit;
*/
public class SimpleFacets {
- private final static Logger log = LoggerFactory.getLogger(SimpleFacets.class);
-
/** The main set of documents all facet counts should be relative to */
protected DocSet docsOrig;
/** Configuration params behavior should be driven by */
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.request;
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -31,6 +32,8 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.ResponseBuilder;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.TimeZoneUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SolrRequestInfo {
@@ -43,6 +46,7 @@ public class SolrRequestInfo {
protected ResponseBuilder rb;
protected List<Closeable> closeHooks;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static SolrRequestInfo getRequestInfo() {
return threadLocal.get();
@@ -52,8 +56,8 @@ public class SolrRequestInfo {
// TODO: temporary sanity check... this can be changed to just an assert in the future
SolrRequestInfo prev = threadLocal.get();
if (prev != null) {
- SolrCore.log.error("Previous SolrRequestInfo was not closed! req=" + prev.req.getOriginalParams().toString());
- SolrCore.log.error("prev == info : {}", prev.req == info.req);
+ log.error("Previous SolrRequestInfo was not closed! req=" + prev.req.getOriginalParams().toString());
+ log.error("prev == info : {}", prev.req == info.req);
}
assert prev == null;
@@ -68,7 +72,7 @@ public class SolrRequestInfo {
try {
hook.close();
} catch (Exception e) {
- SolrException.log(SolrCore.log, "Exception during close hook", e);
+ SolrException.log(log, "Exception during close hook", e);
}
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
public class BinaryResponseWriter implements BinaryQueryResponseWriter {
- private static final Logger LOG = LoggerFactory.getLogger(BinaryResponseWriter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void write(OutputStream out, SolrQueryRequest req, SolrQueryResponse response) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +43,7 @@ import static org.apache.solr.common.par
* @lucene.internal
*/
public class SchemaXmlWriter extends TextResponseWriter {
- private static final Logger log = LoggerFactory.getLogger(SchemaXmlWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final char[] XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>".toCharArray();
private static final char[] MANAGED_SCHEMA_DO_NOT_EDIT_WARNING
= "<!-- Solr managed schema - automatically generated - DO NOT EDIT -->".toCharArray();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java Wed Dec 2 09:22:22 2015
@@ -20,6 +20,7 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.lucene.index.LeafReader;
@@ -59,7 +60,7 @@ import org.slf4j.LoggerFactory;
public class SortingResponseWriter implements QueryResponseWriter {
- private final static Logger logger = LoggerFactory.getLogger(SortingResponseWriter.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public void init(NamedList args) {
/* NOOP */
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java Wed Dec 2 09:22:22 2015
@@ -23,6 +23,7 @@ import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class XSLTResponseWriter implemen
public static final int XSLT_CACHE_DEFAULT = 60;
private static final String XSLT_CACHE_PARAM = "xsltCacheLifetimeSeconds";
- private static final Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResource.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -42,8 +43,8 @@ import org.slf4j.LoggerFactory;
* needs to be managed using the REST API.
*/
public abstract class ManagedResource {
-
- public static final Logger log = LoggerFactory.getLogger(ManagedResource.class);
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Marker interface to indicate a ManagedResource implementation class also supports
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java Wed Dec 2 09:22:22 2015
@@ -28,6 +28,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -450,7 +451,7 @@ public abstract class ManagedResourceSto
}
} // end JsonStorage
- public static final Logger log = LoggerFactory.getLogger(ManagedResourceStorage.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final Charset UTF_8 = StandardCharsets.UTF_8;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/RestManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/RestManager.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/RestManager.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/RestManager.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collection;
@@ -58,7 +59,7 @@ import org.slf4j.LoggerFactory;
*/
public class RestManager {
- public static final Logger log = LoggerFactory.getLogger(RestManager.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SCHEMA_BASE_PATH = "/schema";
public static final String MANAGED_ENDPOINT = "/managed";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java Wed Dec 2 09:22:22 2015
@@ -31,6 +31,7 @@ import org.restlet.routing.Router;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
@@ -40,7 +41,7 @@ import java.util.Set;
* Restlet servlet handling /<context>/<collection>/schema/* URL paths
*/
public class SolrSchemaRestApi extends Application {
- public static final Logger log = LoggerFactory.getLogger(SolrSchemaRestApi.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String FIELDS_PATH = "/" + IndexSchema.FIELDS;
public static final String DYNAMIC_FIELDS = IndexSchema.DYNAMIC_FIELDS.toLowerCase(Locale.ROOT);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java Wed Dec 2 09:22:22 2015
@@ -30,6 +30,7 @@ import org.restlet.resource.ResourceExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -59,7 +60,7 @@ import static org.apache.solr.common.Sol
* in dest.fl and also match any of the sources in source.fl.
*/
public class CopyFieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(CopyFieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SOURCE_FIELD_LIST = IndexSchema.SOURCE + "." + CommonParams.FL;
private static final String DESTINATION_FIELD_LIST = IndexSchema.DESTINATION + "." + CommonParams.FL;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java Wed Dec 2 09:22:22 2015
@@ -32,6 +32,7 @@ import org.restlet.resource.ResourceExce
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;
@@ -47,7 +48,7 @@ import java.util.Map;
* parameter.
*/
public class DynamicFieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(DynamicFieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public DynamicFieldCollectionResource() {
super();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java Wed Dec 2 09:22:22 2015
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -46,7 +47,7 @@ import static java.util.Collections.sing
* where pattern is a field name pattern (with an asterisk at the beginning or the end).
*/
public class DynamicFieldResource extends BaseFieldResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(DynamicFieldResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String fieldNamePattern;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java Wed Dec 2 09:22:22 2015
@@ -35,6 +35,7 @@ import org.restlet.resource.ResourceExce
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;
@@ -64,7 +65,7 @@ import java.util.TreeSet;
* </ul>
*/
public class FieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(FieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean includeDynamic;
public FieldCollectionResource() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java Wed Dec 2 09:22:22 2015
@@ -34,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -52,7 +53,7 @@ import java.util.Map;
* The PUT method accepts field addition requests in JSON format.
*/
public class FieldResource extends BaseFieldResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(FieldResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean includeDynamic;
private String fieldName;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java Wed Dec 2 09:22:22 2015
@@ -32,6 +32,7 @@ import org.restlet.resource.ResourceExce
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;
@@ -45,7 +46,7 @@ import java.util.TreeMap;
* The GET method returns properties for all field types defined in the schema.
*/
public class FieldTypeCollectionResource extends BaseFieldTypeResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(FieldTypeCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map<String,List<String>> fieldsByFieldType;
private Map<String,List<String>> dynamicFieldsByFieldType;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java Wed Dec 2 09:22:22 2015
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,7 +45,7 @@ import java.util.Map;
* The GET method returns properties for the named field type.
*/
public class FieldTypeResource extends BaseFieldTypeResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(FieldTypeResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String typeName;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java Wed Dec 2 09:22:22 2015
@@ -25,8 +25,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.rest.ManagedResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* TokenFilterFactory that uses the ManagedWordSetResource implementation
@@ -34,8 +32,6 @@ import org.slf4j.LoggerFactory;
*/
public class ManagedStopFilterFactory extends BaseManagedTokenFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(ManagedStopFilterFactory.class);
-
// this only gets changed once during core initialization and not every
// time an update is made to the underlying managed word set.
private CharArraySet stopWords = null;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest.schema.anal
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
@@ -52,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class ManagedSynonymFilterFactory extends BaseManagedTokenFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(ManagedSynonymFilterFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SYNONYM_MAPPINGS = "synonymMappings";
public static final String IGNORE_CASE_INIT_ARG = "ignoreCase";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java Wed Dec 2 09:22:22 2015
@@ -16,6 +16,7 @@ package org.apache.solr.rest.schema.anal
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,6 +34,8 @@ import org.apache.solr.response.SolrQuer
import org.apache.solr.rest.BaseSolrResource;
import org.apache.solr.rest.ManagedResource;
import org.apache.solr.rest.ManagedResourceStorage.StorageIO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ManagedResource implementation for managing a set of words using the REST API;
@@ -45,7 +48,9 @@ public class ManagedWordSetResource exte
public static final String WORD_SET_JSON_FIELD = "wordSet";
public static final String IGNORE_CASE_INIT_ARG = "ignoreCase";
- private SortedSet<String> managedWords = null;
+ private SortedSet<String> managedWords = null;
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ManagedWordSetResource(String resourceId, SolrResourceLoader loader, StorageIO storageIO)
throws SolrException {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -82,7 +83,7 @@ public abstract class AbstractSpatialFie
public static final String RECIP_DISTANCE = "recipDistance";
public static final String NONE = "none";
- protected final Logger log = LoggerFactory.getLogger( getClass() );
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected SpatialContext ctx;
protected SpatialArgsParser argsParser;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import org.apache.commons.io.IOUtils;
@@ -32,6 +33,8 @@ import org.apache.lucene.spatial.query.S
import org.apache.solr.util.MapListener;
import com.spatial4j.core.shape.Shape;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @see PrefixTreeStrategy
@@ -46,6 +49,8 @@ public abstract class AbstractSpatialPre
private Double distErrPct;
private Integer defaultFieldValuesArrayLen;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Override
protected void init(IndexSchema schema, Map<String, String> args) {
super.init(schema, args);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BinaryField.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BinaryField.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.schema;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
import org.apache.lucene.document.Field;
@@ -27,10 +28,14 @@ import org.apache.lucene.uninverting.Uni
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.Base64;
import org.apache.solr.response.TextResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BinaryField extends FieldType {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private String toBase64String(ByteBuffer buf) {
return Base64.byteArrayToBase64(buf.array(), buf.position(), buf.limit()-buf.position());
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java Wed Dec 2 09:22:22 2015
@@ -16,6 +16,8 @@ package org.apache.solr.schema;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
+
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.NamedList;
@@ -23,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ClassicIndexSchemaFactory extends IndexSchemaFactory {
- private static final Logger log = LoggerFactory.getLogger(ClassicIndexSchemaFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(NamedList args) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Currency;
import java.util.HashMap;
@@ -82,7 +83,7 @@ public class CurrencyField extends Field
private String exchangeRateProviderClass;
private String defaultCurrency;
private ExchangeRateProvider provider;
- public static Logger log = LoggerFactory.getLogger(CurrencyField.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* A wrapper arround <code>Currency.getInstance</code> that returns null
@@ -670,7 +671,7 @@ public class CurrencyField extends Field
* Configuration for currency. Provides currency exchange rates.
*/
class FileExchangeRateProvider implements ExchangeRateProvider {
- public static Logger log = LoggerFactory.getLogger(FileExchangeRateProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final String PARAM_CURRENCY_CONFIG = "currencyConfig";
// Exchange rate map, maps Currency Code -> Currency Code -> Rate
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/EnumField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/EnumField.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/EnumField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/EnumField.java Wed Dec 2 09:22:22 2015
@@ -25,6 +25,7 @@ import javax.xml.xpath.XPathExpressionEx
import javax.xml.xpath.XPathFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -66,7 +67,7 @@ import org.xml.sax.SAXException;
*/
public class EnumField extends PrimitiveFieldType {
- public static final Logger log = LoggerFactory.getLogger(EnumField.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final Locale LOCALE = Locale.getDefault();
protected static final String PARAM_ENUMS_CONFIG = "enumsConfig";
protected static final String PARAM_ENUM_NAME = "enumName";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java Wed Dec 2 09:22:22 2015
@@ -26,6 +26,7 @@ import org.apache.solr.search.function.F
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -53,7 +54,7 @@ public class ExternalFileFieldReloader e
private String datadir;
private List<FileFloatSource> fieldSources = new ArrayList<>();
- private static final Logger log = LoggerFactory.getLogger(ExternalFileFieldReloader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ExternalFileFieldReloader(SolrCore core) {
super(core);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.schema;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -78,7 +79,7 @@ import static org.apache.lucene.analysis
*
*/
public abstract class FieldType extends FieldProperties {
- public static final Logger log = LoggerFactory.getLogger(FieldType.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The default poly field separator.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Wed Dec 2 09:22:22 2015
@@ -21,6 +21,8 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -55,8 +57,7 @@ public final class FieldTypePluginLoader
private static final String LUCENE_MATCH_VERSION_PARAM
= IndexSchema.LUCENE_MATCH_VERSION_PARAM;
- protected final static Logger log
- = LoggerFactory.getLogger(FieldTypePluginLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final XPath xpath = XPathFactory.newInstance().newXPath();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import java.io.IOException;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import java.util.regex.Pattern;
@@ -108,7 +109,7 @@ public class IndexSchema {
private static final String TEXT_FUNCTION = "text()";
private static final String XPATH_OR = " | ";
- final static Logger log = LoggerFactory.getLogger(IndexSchema.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SolrConfig solrConfig;
protected String resourceName;
protected String name;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java Wed Dec 2 09:22:22 2015
@@ -29,10 +29,11 @@ import org.xml.sax.InputSource;
import java.io.File;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
/** Base class for factories for IndexSchema implementations */
public abstract class IndexSchemaFactory implements NamedListInitializedPlugin {
- private static final Logger log = LoggerFactory.getLogger(IndexSchemaFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Returns an index schema created from a local resource */
public IndexSchema create(String resourceName, SolrConfig config) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java Wed Dec 2 09:22:22 2015
@@ -2,6 +2,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public class JsonPreAnalyzedParser implements PreAnalyzedParser {
- private static final Logger LOG = LoggerFactory.getLogger(JsonPreAnalyzedParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String VERSION = "1";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java Wed Dec 2 09:22:22 2015
@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -72,6 +73,8 @@ import org.apache.solr.util.RTimer;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
/** Solr-managed schema - non-user-editable, but can be mutable via internal and external REST API requests. */
@@ -86,6 +89,8 @@ public final class ManagedIndexSchema ex
int schemaZkVersion;
final Object schemaUpdateLock;
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Constructs a schema using the specified resource name and stream.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java Wed Dec 2 09:22:22 2015
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import org.apache.commons.io.IOUtils;
import org.apache.solr.cloud.ZkController;
@@ -43,7 +44,7 @@ import org.xml.sax.InputSource;
/** Factory for ManagedIndexSchema */
public class ManagedIndexSchemaFactory extends IndexSchemaFactory implements SolrCoreAware {
- private static final Logger log = LoggerFactory.getLogger(ManagedIndexSchemaFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String UPGRADED_SCHEMA_EXTENSION = ".bak";
private static final String SCHEMA_DOT_XML = "schema.xml";