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 [8/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/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Wed Dec 2 09:22:22 2015
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
@@ -68,6 +69,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Test for ReplicationHandler
@@ -79,6 +82,7 @@ import org.junit.Test;
@SuppressSSL // Currently unknown why SSL does not work with this test
public class TestReplicationHandler extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String CONF_DIR = "solr"
+ File.separator + "collection1" + File.separator + "conf"
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java Wed Dec 2 09:22:22 2015
@@ -18,8 +18,6 @@ import org.apache.solr.core.TestSolrConf
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static java.util.Arrays.asList;
import static org.apache.solr.handler.TestSolrConfigHandlerCloud.compareValues;
@@ -43,7 +41,6 @@ import static org.apache.solr.handler.Te
@LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-7362")
public class TestReqParamsAPI extends AbstractFullDistribZkTestBase {
- static final Logger log = LoggerFactory.getLogger(TestSolrConfigHandlerCloud.class);
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java Wed Dec 2 09:22:22 2015
@@ -41,14 +41,11 @@ import org.apache.solr.core.TestSolrConf
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static java.util.Arrays.asList;
import static org.apache.solr.handler.TestBlobHandler.getAsString;
public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
- static final Logger log = LoggerFactory.getLogger(TestSolrConfigHandlerCloud.class);
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import static org.apache.solr.common.uti
import static org.noggit.ObjectBuilder.getVal;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
@@ -56,8 +57,7 @@ import org.slf4j.LoggerFactory;
public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBase {
-
- static final Logger log = LoggerFactory.getLogger(TestSolrConfigHandlerConcurrent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Wed Dec 2 09:22:22 2015
@@ -32,11 +32,14 @@ import org.apache.solr.request.LocalSolr
import org.apache.solr.request.SolrQueryRequest;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -44,6 +47,7 @@ import java.util.Map;
public class QueryElevationComponentTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Before
@Override
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.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
@@ -41,8 +43,7 @@ import org.slf4j.LoggerFactory;
@Slow
public class TestDistributedStatsComponentCardinality extends BaseDistributedSearchTestCase {
- public static final Logger log
- = LoggerFactory.getLogger(TestDistributedStatsComponentCardinality.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
final static HashFunction HASHER = Hashing.murmur3_128();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java Wed Dec 2 09:22:22 2015
@@ -16,56 +16,61 @@
*/
package org.apache.solr.highlight;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.apache.solr.handler.component.HighlightComponent;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.TestHarness;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HighlighterConfigTest extends AbstractSolrTestCase {
- @BeforeClass
- public static void beforeClass() throws Exception {
- initCore("solrconfig-highlight.xml", "schema.xml");
- }
-
- @Override
- public void setUp() throws Exception {
- // if you override setUp or tearDown, you better call
- // the super classes version
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception {
- // if you override setUp or tearDown, you better call
- // the super classes version
- super.tearDown();
- }
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public void testConfig()
- {
- SolrHighlighter highlighter = HighlightComponent.getHighlighter(h.getCore());
- log.info( "highlighter" );
-
- assertTrue( highlighter instanceof DummyHighlighter );
-
- // check to see that doHighlight is called from the DummyHighlighter
- HashMap<String,String> args = new HashMap<>();
- args.put("hl", "true");
- args.put("df", "t_text");
- args.put("hl.fl", "");
- TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
-
- assertU(adoc("t_text", "a long day's night", "id", "1"));
- assertU(commit());
- assertU(optimize());
- assertQ("Basic summarization",
- sumLRF.makeRequest("long"),
- "//lst[@name='highlighting']/str[@name='dummy']"
- );
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig-highlight.xml", "schema.xml");
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ // if you override setUp or tearDown, you better call
+ // the super classes version
+ super.setUp();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ // if you override setUp or tearDown, you better call
+ // the super classes version
+ super.tearDown();
+ }
+
+ public void testConfig()
+ {
+ SolrHighlighter highlighter = HighlightComponent.getHighlighter(h.getCore());
+ log.info( "highlighter" );
+
+ assertTrue( highlighter instanceof DummyHighlighter );
+
+ // check to see that doHighlight is called from the DummyHighlighter
+ HashMap<String,String> args = new HashMap<>();
+ args.put("hl", "true");
+ args.put("df", "t_text");
+ args.put("hl.fl", "");
+ TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
+ "standard", 0, 200, args);
+
+ assertU(adoc("t_text", "a long day's night", "id", "1"));
+ assertU(commit());
+ assertU(optimize());
+ assertQ("Basic summarization",
+ sumLRF.makeRequest("long"),
+ "//lst[@name='highlighting']/str[@name='dummy']"
+ );
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java Wed Dec 2 09:22:22 2015
@@ -24,13 +24,14 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class TestLogWatcher {
-
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private LogWatcherConfig config;
@Before
@@ -40,8 +41,6 @@ public class TestLogWatcher {
@Test
public void testLog4jWatcher() {
-
- Logger log = LoggerFactory.getLogger("testlogger");
LogWatcher watcher = LogWatcher.newRegisteredLogWatcher(config, null);
assertEquals(watcher.getLastEvent(), -1);
@@ -54,9 +53,8 @@ public class TestLogWatcher {
assertEquals(events.size(), 1);
SolrDocument event = events.get(0);
- assertEquals(event.get("logger"), "testlogger");
+ assertEquals(event.get("logger"), "org.apache.solr.logging.TestLogWatcher");
assertEquals(event.get("message"), "This is a test message");
}
-
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.request;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -41,10 +42,13 @@ import org.apache.solr.util.TimeZoneUtil
import org.junit.BeforeClass;
import org.junit.Test;
import org.noggit.ObjectBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SimpleFacetsTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java Wed Dec 2 09:22:22 2015
@@ -35,12 +35,17 @@ import org.apache.solr.search.SyntaxErro
import org.apache.solr.util.RefCounted;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Comparator;
public class TestIntervalFaceting extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeTests() throws Exception {
initCore("solrconfig-basic.xml", "schema-docValuesFaceting.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java Wed Dec 2 09:22:22 2015
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -39,8 +40,7 @@ import org.slf4j.LoggerFactory;
public class TestWriterPerf extends AbstractSolrTestCase {
- public static final Logger log
- = LoggerFactory.getLogger(TestWriterPerf.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.commons.codec.Charsets;
import org.apache.commons.io.FileUtils;
@@ -41,8 +42,12 @@ import org.apache.solr.update.UpdateHand
import org.apache.solr.util.plugin.SolrCoreAware;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ChangedSchemaMergeTest extends SolrTestCaseJ4 {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static Class<? extends SimilarityFactory> simfac1;
public static Class<? extends SimilarityFactory> simfac2;
@@ -144,7 +149,7 @@ public class ChangedSchemaMergeTest exte
changed.getUpdateHandler().commit(new CommitUpdateCommand(req, false));
changed.getUpdateHandler().commit(new CommitUpdateCommand(req, true));
} catch (Throwable e) {
- SolrCore.log.error("Test exception, logging so not swallowed if there is a (finally) shutdown exception: " + e.getMessage(), e);
+ log.error("Test exception, logging so not swallowed if there is a (finally) shutdown exception: " + e.getMessage(), e);
throw e;
} finally {
if (cc != null) cc.shutdown();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import static org.apache.solr.rest.schem
import static org.apache.solr.rest.schema.TestBulkSchemaAPI.getObj;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
@@ -46,7 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase {
- static final Logger log = LoggerFactory.getLogger(TestBulkSchemaConcurrent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
@BeforeClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java Wed Dec 2 09:22:22 2015
@@ -16,6 +16,7 @@ package org.apache.solr.schema;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedMap;
@@ -43,7 +44,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestBase {
- private static final Logger log = LoggerFactory.getLogger(TestCloudManagedSchemaConcurrent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SUCCESS_XPATH = "/response/lst[@name='responseHeader']/int[@name='status'][.='0']";
private static final String PUT_DYNAMIC_FIELDNAME = "newdynamicfieldPut";
private static final String POST_DYNAMIC_FIELDNAME = "newdynamicfieldPost";
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java Wed Dec 2 09:22:22 2015
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.Math;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -47,7 +48,7 @@ import java.util.TreeMap;
*/
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
public class TestCloudSchemaless extends AbstractFullDistribZkTestBase {
- private static final Logger log = LoggerFactory.getLogger(TestCloudSchemaless.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SUCCESS_XPATH = "/response/lst[@name='responseHeader']/int[@name='status'][.='0']";
@After
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import java.io.File;
import java.io.FileInputStream;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.util.Collections;
import java.util.HashMap;
@@ -36,9 +37,13 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.response.SolrQueryResponse;
import org.junit.After;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestManagedSchema extends AbstractBadConfigTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private static File tmpSolrHome;
private static File tmpConfDir;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java Wed Dec 2 09:22:22 2015
@@ -27,11 +27,16 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.request.SolrQueryRequest;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.*;
public class TestFiltering extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeTests() throws Exception {
System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java Wed Dec 2 09:22:22 2015
@@ -25,8 +25,11 @@ import org.apache.solr.util.DefaultSolrT
import org.apache.solr.util.RefCounted;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -43,6 +46,8 @@ import java.util.concurrent.atomic.Atomi
*/
public class TestLFUCache extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-caching.xml", "schema.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java Wed Dec 2 09:22:22 2015
@@ -26,6 +26,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -44,7 +45,7 @@ import static org.apache.solr.update.pro
@TimeoutSuite(millis = 5 * TimeUnits.MINUTE)
@Nightly
public class TestReloadDeadlock extends TestRTGBase {
- public static Logger log = LoggerFactory.getLogger(TestStressReorder.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.search;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -57,8 +58,13 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestSort extends SolrTestCaseJ4 {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml","schema-minimal.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressReorder.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressReorder.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressReorder.java Wed Dec 2 09:22:22 2015
@@ -25,6 +25,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -36,7 +37,7 @@ import java.util.concurrent.atomic.Atomi
import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
public class TestStressReorder extends TestRTGBase {
- public static Logger log = LoggerFactory.getLogger(TestStressReorder.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java Wed Dec 2 09:22:22 2015
@@ -23,7 +23,10 @@ import org.apache.solr.util.TestHarness;
import org.junit.BeforeClass;
import org.junit.Test;
import org.noggit.ObjectBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,6 +38,8 @@ import java.util.concurrent.atomic.Atomi
public class TestStressUserVersions extends TestRTGBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-externalversionconstraint.xml","schema15.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.search.join;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -43,9 +44,13 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.noggit.JSONUtil;
import org.noggit.ObjectBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeTests() throws Exception {
System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java Wed Dec 2 09:22:22 2015
@@ -30,13 +30,9 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class CloudMLTQParserTest extends AbstractFullDistribZkTestBase {
- static Logger log = LoggerFactory.getLogger(CloudMLTQParserTest.class);
-
public CloudMLTQParserTest() {
sliceCount = 2;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.search.stats;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
@@ -38,9 +39,13 @@ import org.apache.solr.common.cloud.Impl
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.ShardParams;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestDistribIDF extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private MiniSolrCloudCluster solrCluster;
@Override
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.security;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -66,7 +67,7 @@ import static org.apache.solr.common.clo
public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase {
- private static final Logger log = LoggerFactory.getLogger(BasicAuthIntegrationTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void doExtraTests(MiniSolrCloudCluster miniCluster, SolrZkClient zkClient, ZkStateReader zkStateReader,
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.security;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashSet;
import java.util.Map;
import java.util.function.Predicate;
@@ -28,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class MockAuthorizationPlugin implements AuthorizationPlugin{
- private Logger log = LoggerFactory.getLogger(MockAuthorizationPlugin.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final HashSet<String> denyUsers = new HashSet<>();
static Predicate<AuthorizationContext> predicate;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java Wed Dec 2 09:22:22 2015
@@ -20,6 +20,8 @@ package org.apache.solr.security;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
+
+import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
@@ -43,7 +45,7 @@ import static org.apache.solr.security.T
@SolrTestCaseJ4.SuppressSSL
public class PKIAuthenticationIntegrationTest extends AbstractFullDistribZkTestBase {
- final private Logger log = LoggerFactory.getLogger(PKIAuthenticationIntegrationTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final int TIMEOUT = 10000;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.security;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,7 +41,7 @@ import org.slf4j.LoggerFactory;
@LuceneTestCase.Slow
public class TestAuthorizationFramework extends AbstractFullDistribZkTestBase {
- final private Logger log = LoggerFactory.getLogger(TestAuthorizationFramework.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final int TIMEOUT = 10000;
public void distribSetUp() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Wed Dec 2 09:22:22 2015
@@ -27,6 +27,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -57,9 +58,13 @@ import org.apache.solr.servlet.SolrReque
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SolrRequestParserTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml", "schema.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.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.StringReader;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -64,9 +65,13 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
public class AddBlockUpdateTest extends SolrTestCaseJ4 {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String child = "child_s";
private static final String parent = "parent_s";
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.update;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -37,6 +38,8 @@ import org.apache.solr.util.AbstractSolr
import org.apache.solr.util.RefCounted;
import org.apache.solr.util.TimeOut;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class NewSearcherListener implements SolrEventListener {
@@ -111,6 +114,8 @@ class NewSearcherListener implements Sol
@Slow
public class AutoCommitTest extends AbstractSolrTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml", "schema.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Wed Dec 2 09:22:22 2015
@@ -17,6 +17,7 @@
package org.apache.solr.update;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -39,6 +40,8 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -46,6 +49,8 @@ import org.junit.Test;
*/
public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
static String savedFactory;
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java Wed Dec 2 09:22:22 2015
@@ -22,16 +22,12 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.util.NamedList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketException;
public class MockStreamingSolrClients extends StreamingSolrClients {
- public static Logger log = LoggerFactory
- .getLogger(MockStreamingSolrClients.class);
public enum Exp {CONNECT_EXCEPTION, SOCKET_EXCEPTION};
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.update;
import java.io.File;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -40,8 +41,12 @@ import org.apache.solr.request.LocalSolr
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SolrIndexSplitterTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
File indexDir1 = null, indexDir2 = null, indexDir3 = null;
@BeforeClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java Wed Dec 2 09:22:22 2015
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
/** Bypass the normal Solr pipeline and just text indexing performance
@@ -56,8 +57,7 @@ public class TestIndexingPerformance ext
}
}
- public static final Logger log
- = LoggerFactory.getLogger(TestIndexingPerformance.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public void testIndexingPerf() throws IOException {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java Wed Dec 2 09:22:22 2015
@@ -45,11 +45,8 @@ import org.apache.solr.util.RESTfulServe
import org.apache.solr.util.RestTestHarness;
import org.apache.solr.util.SimplePostTool;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestNamedUpdateProcessors extends AbstractFullDistribZkTestBase {
- static final Logger log = LoggerFactory.getLogger(TestNamedUpdateProcessors.class);
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.update.processor
import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -27,12 +28,16 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class UpdateRequestProcessorFactoryTest extends AbstractSolrTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-transformers.xml", "schema.xml");
@@ -79,8 +84,7 @@ public class UpdateRequestProcessorFacto
//
// TODO: maybe create a new mock Processor w/ @RunAlways annot if folks feel requiring INFO is evil.
assertTrue("Tests must be run with INFO level logging "+
- "otherwise LogUpdateProcessor isn't used and can't be tested.",
- LogUpdateProcessor.log.isInfoEnabled());
+ "otherwise LogUpdateProcessor isn't used and can't be tested.", log.isInfoEnabled());
final int EXPECTED_CHAIN_LENGTH = 5;
SolrCore core = h.getCore();
@@ -118,8 +122,8 @@ public class UpdateRequestProcessorFacto
assertTrue(name + " second proc isn't LogUpdateProcessor: " + procs.toString(),
( // compare them both just because i'm going insane and the more checks the better
- proc.next instanceof LogUpdateProcessor
- && procs.get(1) instanceof LogUpdateProcessor));
+ proc.next instanceof LogUpdateProcessorFactory.LogUpdateProcessor
+ && procs.get(1) instanceof LogUpdateProcessorFactory.LogUpdateProcessor));
// fetch the distributed version of this chain
proc = chain.createProcessor(req(DISTRIB_UPDATE_PARAM, "non_blank_value"),
@@ -132,8 +136,8 @@ public class UpdateRequestProcessorFacto
assertTrue(name + " (distrib) first proc should be LogUpdateProcessor because of @RunAllways: "
+ procs.toString(),
( // compare them both just because i'm going insane and the more checks the better
- proc instanceof LogUpdateProcessor
- && procs.get(0) instanceof LogUpdateProcessor));
+ proc instanceof LogUpdateProcessorFactory.LogUpdateProcessor
+ && procs.get(0) instanceof LogUpdateProcessorFactory.LogUpdateProcessor));
// for these 3 (distrib) chains, the last proc should always be RunUpdateProcessor
assertTrue(name + " (distrib) last processor isn't a RunUpdateProcessor: " + procs.toString(),
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java Wed Dec 2 09:22:22 2015
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
+import java.lang.invoke.MethodHandles;
import java.net.ServerSocket;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -59,7 +60,7 @@ import org.slf4j.LoggerFactory;
@SolrTestCaseJ4.SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
- protected static final transient Logger log = LoggerFactory.getLogger(TestSolrCLIRunExample.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Overrides the call to exec bin/solr to start Solr nodes to start them using the Solr test-framework
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.imp
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketException;
import java.nio.file.Path;
@@ -98,7 +99,7 @@ import static org.apache.solr.common.par
@SuppressWarnings("serial")
public class CloudSolrClient extends SolrClient {
- protected static final Logger log = LoggerFactory.getLogger(CloudSolrClient.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private volatile ZkStateReader zkStateReader;
private String zkHost; // the zk server connect string
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java Wed Dec 2 09:22:22 2015
@@ -46,6 +46,7 @@ import org.slf4j.MDC;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.Locale;
@@ -75,8 +76,7 @@ import java.util.concurrent.locks.Reentr
*/
public class ConcurrentUpdateSolrClient extends SolrClient {
private static final long serialVersionUID = 1L;
- static final Logger log = LoggerFactory
- .getLogger(ConcurrentUpdateSolrClient.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private HttpSolrClient client;
final BlockingQueue<UpdateRequest> queue;
final ExecutorService scheduler;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.imp
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -87,8 +88,7 @@ public class HttpClientUtil {
public static final String SYS_PROP_CHECK_PEER_NAME = "solr.ssl.checkPeerName";
- private static final Logger logger = LoggerFactory
- .getLogger(HttpClientUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final DefaultHttpRequestRetryHandler NO_RETRY = new DefaultHttpRequestRetryHandler(
0, false);
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java Wed Dec 2 09:22:22 2015
@@ -62,6 +62,7 @@ import org.slf4j.MDC;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.nio.charset.StandardCharsets;
@@ -110,7 +111,7 @@ public class HttpSolrClient extends Solr
*/
public static final String AGENT = "Solr[" + HttpSolrClient.class.getName() + "] 1.0";
- private static Logger log = LoggerFactory.getLogger(HttpSolrClient.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The URL of the Solr server.
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.imp
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.Arrays;
import java.util.HashSet;
@@ -50,7 +51,7 @@ import org.apache.http.entity.BufferedHt
public class Krb5HttpClientConfigurer extends HttpClientConfigurer {
public static final String LOGIN_CONFIG_PROP = "java.security.auth.login.config";
- private static final Logger logger = LoggerFactory.getLogger(Krb5HttpClientConfigurer.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Configuration jaasConfig = new SolrJaasConfiguration();
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java Wed Dec 2 09:22:22 2015
@@ -36,6 +36,7 @@ import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -49,7 +50,7 @@ import java.util.Locale;
public class XMLResponseParser extends ResponseParser
{
public static final String XML_CONTENT_TYPE = "application/xml; charset=UTF-8";
- public static Logger log = LoggerFactory.getLogger(XMLResponseParser.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
// reuse the factory among all parser instances so things like string caches
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.io;
import java.io.IOException;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
@@ -35,7 +36,7 @@ import org.slf4j.LoggerFactory;
public class SolrClientCache implements Serializable {
- protected static final Logger log = LoggerFactory.getLogger(SolrClientCache.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map<String, SolrClient> solrClients = new HashMap();
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@
package org.apache.solr.client.solrj.io.stream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@ public class ExceptionStream extends Tup
private TupleStream stream;
private Exception openException;
- private Logger log = LoggerFactory.getLogger(ExceptionStream.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ExceptionStream(TupleStream stream) {
this.stream = stream;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Wed Dec 2 09:22:22 2015
@@ -31,8 +31,6 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.Watcher;
import org.noggit.JSONWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Immutable state of the cloud. Normally you can get the state by using
@@ -40,7 +38,6 @@ import org.slf4j.LoggerFactory;
* @lucene.experimental
*/
public class ClusterState implements JSONWriter.Writable {
- private static Logger log = LoggerFactory.getLogger(ClusterState.class);
private final Integer znodeVersion;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.common.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
@@ -28,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ClusterStateUtil {
- private static Logger log = LoggerFactory.getLogger(ClusterStateUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int TIMEOUT_POLL_MS = 1000;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,7 @@
package org.apache.solr.common.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,8 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ConnectionManager implements Watcher {
- protected static final Logger log = LoggerFactory
- .getLogger(ConnectionManager.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final String name;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.common.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
*/
public class DefaultConnectionStrategy extends ZkClientConnectionStrategy {
- private static Logger log = LoggerFactory.getLogger(DefaultConnectionStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void connect(String serverAddress, int timeout, Watcher watcher, ZkUpdate updater) throws IOException, InterruptedException, TimeoutException {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java Wed Dec 2 09:22:22 2015
@@ -20,8 +20,6 @@ package org.apache.solr.common.cloud;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Collections;
@@ -34,9 +32,6 @@ public class ImplicitDocRouter extends D
public static final String NAME = "implicit";
- private static Logger log = LoggerFactory
- .getLogger(ImplicitDocRouter.class);
-
@Override
public Slice getTargetSlice(String id, SolrInputDocument sdoc, String route, SolrParams params, DocCollection collection) {
String shard = null;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Wed Dec 2 09:22:22 2015
@@ -50,6 +50,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -67,8 +68,7 @@ public class SolrZkClient implements Clo
static final int DEFAULT_CLIENT_CONNECT_TIMEOUT = 30000;
- private static final Logger log = LoggerFactory
- .getLogger(SolrZkClient.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ConnectionManager connManager;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.common.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
@@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
*
*/
public abstract class ZkClientConnectionStrategy {
- private static Logger log = LoggerFactory.getLogger(ZkClientConnectionStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private volatile ZkCredentialsProvider zkCredentialsToAddAutomatically;
private volatile boolean zkCredentialsToAddAutomaticallyUsed;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java Wed Dec 2 09:22:22 2015
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -36,7 +37,7 @@ import java.util.Set;
*/
public class ZkConfigManager {
- private static final Logger logger = LoggerFactory.getLogger(ZkConfigManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** ZkNode where named configs are stored */
public static final String CONFIGS_ZKNODE = "/configs";
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Wed Dec 2 09:22:22 2015
@@ -19,6 +19,7 @@ package org.apache.solr.common.cloud;
import java.io.Closeable;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
@@ -55,7 +56,7 @@ import static java.util.Collections.unmo
import static org.apache.solr.common.util.Utils.fromJSON;
public class ZkStateReader implements Closeable {
- private static Logger log = LoggerFactory.getLogger(ZkStateReader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String BASE_URL_PROP = "base_url";
public static final String NODE_NAME_PROP = "node_name";
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,6 @@
package org.apache.solr.common.util;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,7 +45,7 @@ import org.slf4j.MDC;
public class ExecutorUtil {
- public static Logger log = LoggerFactory.getLogger(ExecutorUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static volatile List<InheritableThreadLocalProvider> providers = new ArrayList<>();
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java Wed Dec 2 09:22:22 2015
@@ -1,6 +1,7 @@
package org.apache.solr.common.util;
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,7 +24,7 @@ import org.slf4j.LoggerFactory;
*/
public class IOUtils {
- public static Logger LOG = LoggerFactory.getLogger(IOUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static void closeQuietly(Closeable closeable) {
try {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java Wed Dec 2 09:22:22 2015
@@ -1,5 +1,6 @@
package org.apache.solr.common.util;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.Set;
@@ -28,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RetryUtil {
- private static final Logger log = LoggerFactory.getLogger(RetryUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static interface RetryCmd {
public void execute() throws Throwable;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java Wed Dec 2 09:22:22 2015
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +37,7 @@ import java.util.List;
*/
public abstract class LargeVolumeTestBase extends SolrJettyTestBase
{
- private static Logger log = LoggerFactory.getLogger(LargeVolumeTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// for real load testing, make these numbers bigger
static final int numdocs = 100; //1000 * 1000;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java Wed Dec 2 09:22:22 2015
@@ -28,9 +28,12 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
/**
@@ -46,6 +49,8 @@ public abstract class MergeIndexesExampl
private File dataDir1;
private File dataDir2;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Override
public String getSolrHome() {
return SolrTestCaseJ4.getFile("solrj/solr/multicore").getAbsolutePath();
@@ -76,7 +81,7 @@ public abstract class MergeIndexesExampl
System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
setupCoreContainer();
- SolrCore.log.info("CORES=" + cores + " : " + cores.getCoreNames());
+ log.info("CORES=" + cores + " : " + cores.getCoreNames());
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Wed Dec 2 09:22:22 2015
@@ -59,6 +59,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -81,7 +82,7 @@ import static org.junit.internal.matcher
@SuppressSSL
abstract public class SolrExampleTests extends SolrExampleTestsBase
{
- private static Logger log = LoggerFactory.getLogger(SolrExampleTests.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static {
ignoreException("uniqueKey");
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java Wed Dec 2 09:22:22 2015
@@ -28,8 +28,6 @@ import org.apache.solr.common.SolrInputD
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.util.TimeOut;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,8 +36,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
abstract public class SolrExampleTestsBase extends SolrJettyTestBase {
- private static Logger log = LoggerFactory
- .getLogger(SolrExampleTestsBase.class);
/**
* query the example
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java Wed Dec 2 09:22:22 2015
@@ -30,8 +30,6 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -43,7 +41,6 @@ import java.util.Properties;
import java.util.Set;
public class SolrSchemalessExampleTest extends SolrExampleTestsBase {
- private static Logger log = LoggerFactory.getLogger(SolrSchemalessExampleTest.class);
@BeforeClass
public static void beforeClass() throws Exception {
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.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.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashSet;
@@ -63,7 +64,7 @@ import java.util.concurrent.TimeUnit;
})
public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
- private static final Logger log = LoggerFactory.getLogger(TestLBHttpSolrClient.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
SolrInstance[] solr = new SolrInstance[3];
CloseableHttpClient httpClient;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Wed Dec 2 09:22:22 2015
@@ -25,13 +25,9 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.core.CoreContainer;
import org.junit.After;
import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractEmbeddedSolrServerTestCase extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory.getLogger(AbstractEmbeddedSolrServerTestCase.class);
-
protected static final Path SOLR_HOME = getFile("solrj/solr/shared").toPath().toAbsolutePath();
protected CoreContainer cores = null;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1717590&r1=1717589&r2=1717590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java Wed Dec 2 09:22:22 2015
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.emb
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +37,7 @@ public class TestEmbeddedSolrServer exte
public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule());
- protected static Logger log = LoggerFactory.getLogger(TestEmbeddedSolrServer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected EmbeddedSolrServer getSolrCore1() {