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 11:51:52 UTC
svn commit: r1717604 [9/9] - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/
solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/
solr/contrib/analytics/src/java/org/apache/solr/analytics/request/
solr/contrib/analytics/src/...
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java Wed Dec 2 10:51:47 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/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java Wed Dec 2 10:51:47 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/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java Wed Dec 2 10:51:47 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/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Wed Dec 2 10:51:47 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/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java Wed Dec 2 10:51:47 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() {
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Wed Dec 2 10:51:47 2015
@@ -18,6 +18,9 @@
package org.apache.solr.client.solrj.embedded;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+
+import java.lang.invoke.MethodHandles;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
@@ -39,7 +42,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.3
*/
public class TestSolrProperties extends AbstractEmbeddedSolrServerTestCase {
- protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Rule
public TestRule solrTestRules =
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java Wed Dec 2 10:51:47 2015
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRes
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Collections;
@@ -79,7 +80,7 @@ import org.slf4j.LoggerFactory;
public class BasicHttpSolrClientTest extends SolrJettyTestBase {
- private static Logger log = LoggerFactory.getLogger(BasicHttpSolrClientTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static class RedirectServlet extends HttpServlet {
@Override
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java Wed Dec 2 10:51:47 2015
@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -79,7 +80,7 @@ import static org.apache.solr.common.clo
*/
@Slow
public class CloudSolrClientTest extends AbstractFullDistribZkTestBase {
- static Logger log = LoggerFactory.getLogger(CloudSolrClientTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SOLR_HOME = getFile("solrj" + File.separator + "solr").getAbsolutePath();
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java Wed Dec 2 10:51:47 2015
@@ -18,6 +18,7 @@
package org.apache.solr.client.solrj.request;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
@@ -46,7 +47,7 @@ import static org.hamcrest.core.Is.is;
@ThreadLeakFilters(defaultFilters = true, filters = {SolrIgnoredThreadsFilter.class})
public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
- protected static Logger log = LoggerFactory.getLogger(TestCoreAdmin.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static String tempDirProp;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Wed Dec 2 10:51:47 2015
@@ -57,6 +57,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -245,7 +246,7 @@ public abstract class BaseDistributedSea
protected Map<String, Integer> handle = new HashMap<>();
protected String id = "id";
- public static Logger log = LoggerFactory.getLogger(BaseDistributedSearchTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static RandVal rint = new RandVal() {
@Override
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Wed Dec 2 10:51:47 2015
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.OutputStreamWriter;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.Properties;
import java.util.SortedMap;
@@ -41,7 +42,7 @@ import java.util.SortedMap;
abstract public class SolrJettyTestBase extends SolrTestCaseJ4
{
- private static Logger log = LoggerFactory.getLogger(SolrJettyTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void beforeSolrJettyTestBase() throws Exception {
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java Wed Dec 2 10:51:47 2015
@@ -41,11 +41,13 @@ import org.apache.solr.servlet.DirectSol
import org.noggit.JSONUtil;
import org.noggit.ObjectBuilder;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
@@ -63,7 +65,8 @@ import java.util.Set;
@SolrTestCaseJ4.SuppressSSL
//@LuceneTestCase.SuppressCodecs({"Lucene3x","Lucene40","Lucene41","Lucene42","Lucene45","Appending","Asserting"})
public class SolrTestCaseHS extends SolrTestCaseJ4 {
-
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@SafeVarargs
public static <T> Set<T> set(T... a) {
LinkedHashSet<T> s = new LinkedHashSet<>();
@@ -378,7 +381,7 @@ public class SolrTestCaseHS extends Solr
// To manage multiple servers, see SolrInstances
//
public static class SolrInstance {
- private static Logger log = SolrTestCaseJ4.log;
+ private static Logger log = SolrTestCaseHS.log;
private String collection = "collection1";
private int port = 0;
private String solrconfigFile;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Wed Dec 2 10:51:47 2015
@@ -31,6 +31,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -121,6 +122,8 @@ import static com.google.common.base.Pre
@SuppressFileSystems("ExtrasFS") // might be ok, the failures with e.g. nightly runs might be "normal"
public abstract class SolrTestCaseJ4 extends LuceneTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static final String DEFAULT_TEST_COLLECTION_NAME = "collection1";
public static final String DEFAULT_TEST_CORENAME = DEFAULT_TEST_COLLECTION_NAME;
protected static final String CORE_PROPERTIES_FILENAME = "core.properties";
@@ -538,8 +541,6 @@ public abstract class SolrTestCaseJ4 ext
*
*/
- public static Logger log = LoggerFactory.getLogger(SolrTestCaseJ4.class);
-
private static String factoryProp;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java Wed Dec 2 10:51:47 2015
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -33,6 +34,8 @@ import org.apache.solr.core.Diagnostics;
import org.apache.solr.core.MockDirectoryFactory;
import org.apache.zookeeper.KeeperException;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractDistribZkTestBase extends BaseDistributedSearchTestCase {
@@ -45,6 +48,8 @@ public abstract class AbstractDistribZkT
protected ZkTestServer zkServer;
private AtomicInteger homeCount = new AtomicInteger();
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void beforeThisClass() throws Exception {
// Only For Manual Testing: this will force an fs based dir factory
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Wed Dec 2 10:51:47 2015
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.ServerSocket;
import java.net.URI;
import java.net.URL;
@@ -94,7 +95,7 @@ import static org.apache.solr.common.uti
*/
@Slow
public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTestBase {
- static Logger log = LoggerFactory.getLogger(AbstractFullDistribZkTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void beforeFullSolrCloudTest() {
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Wed Dec 2 10:51:47 2015
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
@@ -41,8 +42,7 @@ public abstract class AbstractZkTestCase
private static final boolean DEBUG = false;
- protected static Logger log = LoggerFactory
- .getLogger(AbstractZkTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static File SOLRHOME;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java Wed Dec 2 10:51:47 2015
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -54,7 +56,7 @@ import org.slf4j.LoggerFactory;
* TODO: chaosmonkey should be able to do cluster stop/start tests
*/
public class ChaosMonkey {
- private static Logger log = LoggerFactory.getLogger(ChaosMonkey.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int CONLOSS_PERCENT = 10; // 0 - 10 = 0 - 100%
private static final int EXPIRE_PERCENT = 10; // 0 - 10 = 0 - 100%
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java Wed Dec 2 10:51:47 2015
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -34,7 +35,7 @@ import java.util.Set;
*/
public class CloudInspectUtil {
- static Logger log = LoggerFactory.getLogger(CloudInspectUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* When a and b are known to be different, this method tells if the difference
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java Wed Dec 2 10:51:47 2015
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
* To use, tests must be able to run iptables, eg sudo chmod u+s iptables
*/
public class IpTables {
- static final Logger log = LoggerFactory.getLogger(IpTables.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final boolean ENABLED = Boolean.getBoolean("solr.tests.use.iptables");
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java Wed Dec 2 10:51:47 2015
@@ -20,6 +20,7 @@ package org.apache.solr.cloud;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
*/
public class SocketProxy {
- private static final transient Logger log = LoggerFactory.getLogger(SocketProxy.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final int ACCEPT_TIMEOUT_MILLIS = 100;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java Wed Dec 2 10:51:47 2015
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class StoppableSearchThread extends AbstractFullDistribZkTestBase.StoppableThread {
- static Logger log = LoggerFactory.getLogger(AbstractFullDistribZkTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final CloudSolrClient cloudClient;
private volatile boolean stop = false;
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java Wed Dec 2 10:51:47 2015
@@ -45,6 +45,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -62,7 +63,7 @@ import java.util.concurrent.TimeUnit;
public class ZkTestServer {
public static final int TICK_TIME = 1000;
- private static Logger log = LoggerFactory.getLogger(ZkTestServer.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final ZKServerMain zkServer = new ZKServerMain();
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java Wed Dec 2 10:51:47 2015
@@ -20,6 +20,7 @@ package org.apache.solr.util;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.util.HashSet;
import org.apache.lucene.util.QuickPatchThreadsFilter;
@@ -61,7 +62,7 @@ public abstract class AbstractSolrTestCa
return SolrTestCaseJ4.TEST_HOME();
}
- public static Logger log = LoggerFactory.getLogger(AbstractSolrTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Causes an exception matching the regex pattern to not be logged. */
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java Wed Dec 2 10:51:47 2015
@@ -18,6 +18,7 @@
package org.apache.solr.util;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import org.apache.lucene.index.IndexWriter;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
*/
public final class RandomMergePolicy extends MergePolicy {
- public static Logger log = LoggerFactory.getLogger(RandomMergePolicy.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Not private so tests can inspect it,
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java?rev=1717604&r1=1717603&r2=1717604&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java Wed Dec 2 10:51:47 2015
@@ -30,11 +30,12 @@ import org.xml.sax.SAXException;
import javax.xml.xpath.XPathExpressionException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.SortedMap;
abstract public class RestTestBase extends SolrJettyTestBase {
- private static final Logger log = LoggerFactory.getLogger(RestTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static RestTestHarness restTestHarness;
@AfterClass