Apache Solr open-source search software
SOLR-16224: class level variables that can be safely made local, and are boilerpl… (#921)
Eric Pugh9bb62c1643c3
diff --git a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.javaindex f701968eaee..feea657ee8d 100644--- a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java+++ b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java@@ -37,7 +37,6 @@ import org.junit.BeforeClass;public class AnalysisAfterCoreReloadTest extends SolrTestCaseJ4 {- private static String tmpSolrHome;int port = 0;static final String context = "/solr";@@ -45,7 +44,7 @@ public class AnalysisAfterCoreReloadTest extends SolrTestCaseJ4 {@BeforeClasspublic static void beforeClass() throws Exception {- tmpSolrHome = createTempDir().toFile().getAbsolutePath();+ String tmpSolrHome = createTempDir().toFile().getAbsolutePath();FileUtils.copyDirectory(new File(TEST_HOME()), new File(tmpSolrHome).getAbsoluteFile());initCore("solrconfig.xml", "schema.xml", new File(tmpSolrHome).getAbsolutePath());}diff --git a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.javaindex db6f32bd4ea..5c2f1712789 100644--- a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java+++ b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java@@ -25,13 +25,11 @@ import org.junit.Test;public class SolrTestCaseJ4Test extends SolrTestCaseJ4 {- private static String tmpSolrHome;-@BeforeClasspublic static void beforeClass() throws Exception {// Create a temporary directory that holds a core NOT named "collection1". Use the smallest// configuration sets we can, so we don't copy that much junk around.- tmpSolrHome = createTempDir().toFile().getAbsolutePath();+ String tmpSolrHome = createTempDir().toFile().getAbsolutePath();File subHome = new File(new File(tmpSolrHome, "core0"), "conf");assertTrue("Failed to make subdirectory ", subHome.mkdirs());diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.javaindex fe4d77e69da..7665b112f00 100644--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java@@ -42,7 +42,6 @@ public class TestTolerantSearch extends SolrJettyTestBase {private static SolrClient collection2;private static String shard1;private static String shard2;- private static File solrHome;private static File createSolrHome() throws Exception {File workDir = createTempDir().toFile();@@ -57,7 +56,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {@BeforeClasspublic static void createThings() throws Exception {systemSetPropertySolrDisableUrlAllowList("true");- solrHome = createSolrHome();+ File solrHome = createSolrHome();createAndStartJetty(solrHome.getAbsolutePath());String url = jetty.getBaseUrl().toString();collection1 = getHttpSolrClient(url + "/collection1");diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.javaindex 65e5f33b3e0..879ee3a8ebf 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java@@ -63,9 +63,6 @@ public class TestSolrConfigHandler extends RestTestBase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- private static File tmpSolrHome;- private static File tmpConfDir;-private static final String collection = "collection1";private static final String confDir = collection + "/conf";@@ -117,8 +114,8 @@ public class TestSolrConfigHandler extends RestTestBase {@Beforepublic void before() throws Exception {- tmpSolrHome = createTempDir().toFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = createTempDir().toFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.javaindex 841539d1bd9..5de5f052808 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java@@ -49,7 +49,6 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {private static SolrClient collection2;private static String shard1;private static String shard2;- private static File solrHome;private static File createSolrHome() throws Exception {File workDir = createTempDir().toFile();@@ -61,7 +60,7 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {@BeforeClasspublic static void createThings() throws Exception {systemSetPropertySolrDisableUrlAllowList("true");- solrHome = createSolrHome();+ File solrHome = createSolrHome();createAndStartJetty(solrHome.getAbsolutePath());String url = jetty.getBaseUrl().toString();diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.javaindex c860b4677ee..fcec6dc25e6 100644--- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java+++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java@@ -45,12 +45,11 @@ import org.junit.Test;/** See SOLR-2854. */@SuppressSSL // does not yet work with ssl yet - uses raw java.net.URL API rather than HttpClientpublic class TestRemoteStreaming extends SolrJettyTestBase {- private static File solrHomeDirectory;@BeforeClasspublic static void beforeTest() throws Exception {// this one has handleSelect=true which a test here needs- solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();+ File solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();setupJettyTestHome(solrHomeDirectory, "collection1");createAndStartJetty(solrHomeDirectory.getAbsolutePath());}diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.javaindex 61c8128dee0..d944341c9c2 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java@@ -56,11 +56,9 @@ import org.slf4j.LoggerFactory;public class TestBulkSchemaAPI extends RestTestBase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- private static File tmpSolrHome;-@Beforepublic void before() throws Exception {- tmpSolrHome = createTempDir().toFile();+ File tmpSolrHome = createTempDir().toFile();FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());System.setProperty("managed.schema.mutable", "true");diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.javaindex f7edadc1e68..7f7a12cc216 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java@@ -36,16 +36,14 @@ import org.junit.Test;* <p>PUT: add some words to the current list*/public class TestManagedStopFilterFactory extends RestTestBase {- private static File tmpSolrHome;- private static File tmpConfDir;private static final String collection = "collection1";private static final String confDir = collection + "/conf";@Beforepublic void before() throws Exception {- tmpSolrHome = createTempDir().toFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = createTempDir().toFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.javaindex f83dd87ee33..af908951be8 100644--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java@@ -49,9 +49,6 @@ public class TestUseDocValuesAsStored extends AbstractBadConfigTestBase {private int id = 1;- private static File tmpSolrHome;- private static File tmpConfDir;-private static final String collection = "collection1";private static final String confDir = collection + "/conf";@@ -98,8 +95,8 @@ public class TestUseDocValuesAsStored extends AbstractBadConfigTestBase {@Beforeprivate void initManagedSchemaCore() throws Exception {- tmpSolrHome = createTempDir().toFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = createTempDir().toFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);diff --git a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.javaindex 81f67c387ba..719e3e502d8 100644--- a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java+++ b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java@@ -25,17 +25,14 @@ import org.junit.Before;public class TestAddFieldRealTimeGet extends TestRTGBase {- private static File tmpSolrHome;- private static File tmpConfDir;-private static final String collection = "collection1";private static final String confDir = collection + "/conf";@Beforeprivate void initManagedSchemaCore() throws Exception {final String tmpSolrHomePath = createTempDir().toFile().getAbsolutePath();- tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);final String configFileName = "solrconfig-managed-schema.xml";final String schemaFileName = "schema-id-and-version-fields-only.xml";diff --git a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.javaindex 070437f9787..2062edcf2f4 100644--- a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java@@ -36,11 +36,10 @@ import org.junit.Test;/** A test case for the several HTTP cache headers emitted by Solr */public class CacheHeaderTest extends CacheHeaderTestBase {- private static File solrHomeDirectory;@BeforeClasspublic static void beforeTest() throws Exception {- solrHomeDirectory = createTempDir().toFile();+ File solrHomeDirectory = createTempDir().toFile();setupJettyTestHome(solrHomeDirectory, "collection1");createAndStartJetty(solrHomeDirectory.getAbsolutePath());}diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.javaindex 1418fbf854d..389ee320778 100644--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java@@ -91,7 +91,6 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {private static final AtomicInteger counter = new AtomicInteger();private static ExecutorService exe;- private static boolean cachedMode;private static XMLInputFactory inputFactory;@@ -103,9 +102,9 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {@BeforeClasspublic static void beforeClass() throws Exception {String oldCacheNamePropValue = System.getProperty("blockJoinParentFilterCache");+ final boolean cachedMode = random().nextBoolean();System.setProperty(- "blockJoinParentFilterCache",- (cachedMode = random().nextBoolean()) ? "blockJoinParentFilterCache" : "don't cache");+ "blockJoinParentFilterCache", cachedMode ? "blockJoinParentFilterCache" : "don't cache");if (oldCacheNamePropValue != null) {System.setProperty("blockJoinParentFilterCache", oldCacheNamePropValue);}diff --git a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.javaindex 844fa618074..d8cf69c623b 100644--- a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java+++ b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java@@ -23,16 +23,14 @@ import org.junit.Before;import org.junit.Test;public class DataDrivenBlockJoinTest extends SolrTestCaseJ4 {- private File tmpSolrHome;- private File tmpConfDir;private static final String collection = "collection1";private static final String confDir = collection + "/conf";@Beforepublic void before() throws Exception {- tmpSolrHome = createTempDir().toFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = createTempDir().toFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-schemaless.xml"), tmpConfDir);diff --git a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.javaindex e641c08561c..81c88b1892b 100644--- a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java@@ -39,16 +39,13 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe"solrconfig-add-schema-fields-update-processor-chains.xml";private static final String SCHEMA_XML = "schema-add-schema-fields-update-processor.xml";- private static File tmpSolrHome;- private static File tmpConfDir;-private static final String collection = "collection1";private static final String confDir = collection + "/conf";@Beforeprivate void initManagedSchemaCore() throws Exception {- tmpSolrHome = createTempDir().toFile();- tmpConfDir = new File(tmpSolrHome, confDir);+ File tmpSolrHome = createTempDir().toFile();+ File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);FileUtils.copyFileToDirectory(new File(testHomeConfDir, SOLRCONFIG_XML), tmpConfDir);FileUtils.copyFileToDirectory(new File(testHomeConfDir, SCHEMA_XML), tmpConfDir);