Apache Solr open-source search software
SOLR-16314: fix warnings about method visibility (#954)
Eric Pugh32b7e0efa8f5
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.javaindex 6c8d8c33c64..12c4c6f7aa1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java@@ -103,7 +103,7 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {}@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {+ public static void createMiniSolrCloudCluster() throws Exception {final String configName = "solrCloudCollectionConfig";final Path configDir = TEST_COLL1_CONF();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.javaindex c2666db605c..2f2fd10799c 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java@@ -55,7 +55,7 @@ public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {+ public static void createMiniSolrCloudCluster() throws Exception {// multi replicas should not matter...final int repFactor = usually() ? 1 : 2;@@ -110,7 +110,7 @@ public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.javaindex 51a74a05a5c..98ac3baa314 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java@@ -60,7 +60,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {+ public static void createMiniSolrCloudCluster() throws Exception {// multi replicas should matter...final int repFactor = usually() ? 1 : 2;// ... but we definitely want to ensure forwarded requests to other shards work ...@@ -118,7 +118,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {}@Before- private void addUncommittedDoc99() throws Exception {+ public void addUncommittedDoc99() throws Exception {// uncommitted doc in transaction log at start of every test// Even if an RTG causes ulog to re-open realtime searcher, next test method// will get another copy of doc 99 in the ulog@@ -130,7 +130,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex bedcfeab03e..b763a353828 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -181,7 +181,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.javaindex 510021eba79..d4138a8cd84 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java@@ -108,7 +108,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {@BeforeClass@SuppressWarnings({"unchecked"})- private static void createMiniSolrCloudCluster() throws Exception {+ public static void createMiniSolrCloudCluster() throws Exception {// NOTE: numDocsToCheck uses atLeast, so nightly & multiplier are already a factor in index size// no need to redundantly factor them in here as wellDOC_ID_INCR = TestUtil.nextInt(random(), 1, 7);@@ -158,7 +158,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {}@AfterClass- private static void afterClass() {+ public static void afterClass() {TestInjection.reset();if (null != EXEC_SERVICE) {ExecutorUtil.shutdownAndAwaitTermination(EXEC_SERVICE);@@ -178,7 +178,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {}@Before- private void clearCloudCollection() throws Exception {+ public void clearCloudCollection() throws Exception {TestInjection.reset();waitForRecoveriesToFinish(CLOUD_CLIENT);diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.javaindex fabdab37952..7675753c8d9 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java@@ -59,7 +59,7 @@ public class TestStressLiveNodes extends SolrCloudTestCase {private static final int WAIT_TIME = TEST_NIGHTLY ? 60 : 30;@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {+ public static void createMiniSolrCloudCluster() throws Exception {// we only need 1 node, and we don't care about any configs or collections// we're going to fake all the live_nodes changes we want to fake.@@ -72,7 +72,7 @@ public class TestStressLiveNodes extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.javaindex 47a2e3bb6b8..f02249e034b 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java@@ -230,7 +230,7 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {}@Before- private void clearCollection() throws Exception {+ public void clearCollection() throws Exception {assertEquals(0, CLOUD_CLIENT.deleteByQuery("*:*").getStatus());assertEquals(0, CLOUD_CLIENT.commit().getStatus());}diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.javaindex 89ed412906a..ffd62949e89 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java@@ -123,7 +123,7 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {}@Before- private void deleteAllDocs() throws Exception {+ public void deleteAllDocs() throws Exception {assertEquals(0, update(params("commit", "true")).deleteByQuery("*:*").process(CLOUD_CLIENT).getStatus());assertEquals("index should be empty", 0L, countDocs(CLOUD_CLIENT));diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.javaindex 87f290f2481..5dccdde4f70 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java@@ -119,7 +119,7 @@ public class TestRawTransformer extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (JSR != null) {JSR.stop();}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 f9861d69692..fb6633e2848 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@@ -60,7 +60,7 @@ public class TestManagedStopFilterFactory extends RestTestBase {}@After- private void after() throws Exception {+ public void after() throws Exception {if (null != jetty) {jetty.stop();jetty = null;diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.javaindex 4fb10d69e48..87cba4ae404 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java@@ -58,7 +58,7 @@ public class TestManagedSynonymFilterFactory extends RestTestBase {}@After- private void after() throws Exception {+ public void after() throws Exception {if (null != jetty) {jetty.stop();jetty = null;diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.javaindex e2fcbda70b2..f93482a00d0 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java@@ -62,7 +62,7 @@ public class TestManagedSynonymGraphFilterFactory extends RestTestBase {}@After- private void after() throws Exception {+ public void after() throws Exception {if (null != jetty) {jetty.stop();jetty = null;diff --git a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.javaindex 14bbcec28fd..b99555f42f3 100644--- a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java+++ b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java@@ -36,7 +36,7 @@ public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {private static final String confDir = collection + "/conf";@Before- private void initManagedSchemaCore() throws Exception {+ public void initManagedSchemaCore() throws Exception {tmpSolrHome = createTempDir().toFile();tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);@@ -61,7 +61,7 @@ public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {}@After- private void afterClass() {+ public void afterClass() {deleteCore();System.clearProperty("managed.schema.mutable");System.clearProperty("enable.update.log");diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.javaindex 7290192dafc..c4090b1897b 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java@@ -50,7 +50,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {private static final String confDir = collection + "/conf";@Before- private void initManagedSchemaCore() throws Exception {+ public void initManagedSchemaCore() throws Exception {tmpSolrHome = createTempDir().toFile();tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);@@ -77,7 +77,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {}@After- private void afterClass() {+ public void afterClass() {deleteCore();System.clearProperty("managed.schema.mutable");System.clearProperty("enable.update.log");diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.javaindex 2bb9d09adb4..51cab8a55a7 100644--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java@@ -94,7 +94,7 @@ public class TestUseDocValuesAsStored extends AbstractBadConfigTestBase {}@Before- private void initManagedSchemaCore() throws Exception {+ public void initManagedSchemaCore() throws Exception {File tmpSolrHome = createTempDir().toFile();File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);@@ -117,7 +117,7 @@ public class TestUseDocValuesAsStored extends AbstractBadConfigTestBase {}@After- private void afterTest() {+ public void afterTest() {clearIndex();deleteCore();System.clearProperty("managed.schema.mutable");diff --git a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.javaindex 719e3e502d8..756c3e3d7cc 100644--- a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java+++ b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java@@ -29,7 +29,7 @@ public class TestAddFieldRealTimeGet extends TestRTGBase {private static final String confDir = collection + "/conf";@Before- private void initManagedSchemaCore() throws Exception {+ public void initManagedSchemaCore() throws Exception {final String tmpSolrHomePath = createTempDir().toFile().getAbsolutePath();File tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();File tmpConfDir = new File(tmpSolrHome, confDir);diff --git a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.javaindex edc6db65d41..c6c7c155a39 100644--- a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java+++ b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java@@ -54,7 +54,7 @@ public class TestPseudoReturnFields extends SolrTestCaseJ4 {}@Before- private void addUncommittedDoc99() {+ public void addUncommittedDoc99() {// uncommitted doc in transaction log at start of every test// Even if an RTG causes ulog to re-open realtime searcher, next test method// will get another copy of doc 99 in the ulogdiff --git a/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java b/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.javaindex 89c3dab7893..e3924b3d2ea 100644--- a/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java+++ b/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java@@ -46,7 +46,7 @@ public class TestSearcherReuse extends SolrTestCaseJ4 {* modification results in getting a new searcher with the new schema linked to it.*/@BeforeClass- private static void setupTempDirAndCoreWithManagedSchema() throws Exception {+ public static void setupTempDirAndCoreWithManagedSchema() throws Exception {solrHome = createTempDir().toFile();solrHome = solrHome.getAbsoluteFile();@@ -69,7 +69,7 @@ public class TestSearcherReuse extends SolrTestCaseJ4 {}@AfterClass- private static void afterClass() {+ public static void afterClass() {solrHome = null;}diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.javaindex f64f78a4a6a..02ef05727e4 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java@@ -88,8 +88,8 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {- // sanity check constants+ public static void createMiniSolrCloudCluster() throws Exception {+ // check constantsassertTrue("bad test constants: some suffixes will never be tested",(STR_FIELD_SUFFIXES.length < MAX_FIELD_NUM) && (INT_FIELD_SUFFIXES.length < MAX_FIELD_NUM));@@ -189,7 +189,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.javaindex df2f544330d..93cdab162fa 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java@@ -112,8 +112,8 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {- // sanity check constants+ public static void createMiniSolrCloudCluster() throws Exception {+ // check constantsassertTrue("bad test constants: some suffixes will never be tested",(MULTI_STR_FIELD_SUFFIXES.length < MAX_FIELD_NUM)@@ -241,7 +241,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.javaindex 45a5013fae9..5efe02a2664 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java@@ -103,8 +103,8 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);@BeforeClass- private static void createMiniSolrCloudCluster() throws Exception {- // sanity check constants+ public static void createMiniSolrCloudCluster() throws Exception {+ // check constantsassertTrue("bad test constants: some suffixes will never be tested",(MULTI_STR_FIELD_SUFFIXES.length < MAX_FIELD_NUM)@@ -231,7 +231,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {}@AfterClass- private static void afterClass() throws Exception {+ public static void afterClass() throws Exception {if (null != CLOUD_CLIENT) {CLOUD_CLIENT.close();CLOUD_CLIENT = null;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 156615637ce..ca19cd3505c 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@@ -43,7 +43,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTeprivate static final String confDir = collection + "/conf";@Before- private void initManagedSchemaCore() throws Exception {+ public void initManagedSchemaCore() throws Exception {File tmpSolrHome = createTempDir().toFile();File tmpConfDir = new File(tmpSolrHome, confDir);File testHomeConfDir = new File(TEST_HOME(), confDir);@@ -342,7 +342,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe}@After- private void deleteCoreAndTempSolrHomeDirectory() {+ public void deleteCoreAndTempSolrHomeDirectory() {deleteCore();}}diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.javaindex 6b2745e09f3..b1b8f5984f0 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TestCloudDeduplication.java@@ -74,7 +74,7 @@ public class TestCloudDeduplication extends SolrCloudTestCase {}@AfterClass- private static void closeClients() throws Exception {+ public static void closeClients() throws Exception {try {IOUtils.close(NODE_CLIENTS);} finally {