You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/06/17 21:52:07 UTC

[lucene-solr] branch branch_8x updated: SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 1)

This is an automated email from the ASF dual-hosted git repository.

erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 102fc9d  SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 1)
102fc9d is described below

commit 102fc9d7e01966220927b90b13c72f3240890173
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Wed Jun 17 17:48:22 2020 -0400

    SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 1)
---
 solr/CHANGES.txt                                   |  2 ++
 .../dataimport/TestMailEntityProcessor.java        | 13 ++++---
 .../src/test/org/apache/solr/OutputWriterTest.java |  2 +-
 .../src/test/org/apache/solr/SolrInfoBeanTest.java |  6 +++-
 .../org/apache/solr/TestDistributedGrouping.java   |  3 ++
 .../test/org/apache/solr/TestRandomDVFaceting.java |  3 +-
 .../test/org/apache/solr/TestRandomFaceting.java   | 15 ++++++--
 .../org/apache/solr/TestSolrCoreProperties.java    |  1 +
 .../apache/solr/analysis/TokenizerChainTest.java   |  1 +
 .../apache/solr/cloud/AliasIntegrationTest.java    |  1 +
 .../apache/solr/cloud/BasicDistributedZkTest.java  |  9 +++++
 .../test/org/apache/solr/cloud/CloudTestUtils.java |  6 ++++
 .../org/apache/solr/cloud/ConfigSetsAPITest.java   |  1 +
 .../org/apache/solr/cloud/HttpPartitionTest.java   |  3 ++
 .../apache/solr/cloud/KerberosTestServices.java    |  4 +--
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |  2 ++
 .../org/apache/solr/cloud/OverseerStatusTest.java  |  1 +
 .../apache/solr/cloud/OverseerTaskQueueTest.java   |  1 +
 .../org/apache/solr/cloud/SSLMigrationTest.java    |  1 +
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |  1 +
 .../solr/cloud/TestQueryingOnDownCollection.java   |  2 ++
 .../org/apache/solr/cloud/TestTlogReplica.java     |  2 +-
 .../org/apache/solr/cloud/TestUtilizeNode.java     |  1 +
 .../solr/cloud/api/collections/ShardSplitTest.java |  1 +
 .../solr/core/BlobRepositoryMockingTest.java       |  8 ++++-
 .../test/org/apache/solr/core/CoreSorterTest.java  |  4 +++
 .../solr/core/CountUsageValueSourceParser.java     |  3 +-
 .../org/apache/solr/core/DirectoryFactoryTest.java |  1 +
 .../apache/solr/core/DummyValueSourceParser.java   |  3 +-
 .../solr/core/ExitableDirectoryReaderTest.java     |  6 ++++
 .../org/apache/solr/core/FakeDeletionPolicy.java   |  6 ++--
 .../apache/solr/core/HdfsDirectoryFactoryTest.java |  1 +
 .../org/apache/solr/core/MockEventListener.java    |  2 +-
 .../core/MockQuerySenderListenerReqHandler.java    |  2 +-
 .../apache/solr/core/MockShardHandlerFactory.java  |  1 +
 .../org/apache/solr/core/RequestHandlersTest.java  |  1 +
 .../org/apache/solr/core/ResourceLoaderTest.java   |  3 +-
 .../org/apache/solr/core/TestConfigOverlay.java    |  1 +
 .../apache/solr/core/TestConfigSetImmutable.java   |  3 ++
 .../apache/solr/core/TestConfigSetProperties.java  |  4 +++
 .../org/apache/solr/core/TestCoreDiscovery.java    |  1 +
 .../org/apache/solr/core/TestDirectoryFactory.java |  1 +
 .../org/apache/solr/core/TestDynamicLoading.java   |  9 +++--
 .../apache/solr/core/TestDynamicLoadingUrl.java    |  1 +
 .../test/org/apache/solr/core/TestInitParams.java  | 12 ++++++-
 .../org/apache/solr/core/TestJmxIntegration.java   |  1 +
 .../test/org/apache/solr/core/TestLazyCores.java   |  4 +++
 .../apache/solr/core/TestShardHandlerFactory.java  |  1 +
 .../apache/solr/core/TestSolrConfigHandler.java    | 14 ++++++++
 .../core/snapshots/TestSolrCloudSnapshots.java     |  4 +++
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |  2 ++
 .../solr/filestore/TestDistribPackageStore.java    | 16 +++++++--
 .../handler/AnalysisRequestHandlerTestBase.java    |  2 +-
 .../apache/solr/handler/BackupStatusChecker.java   |  4 +++
 .../handler/BinaryUpdateRequestHandlerTest.java    |  1 +
 .../DocumentAnalysisRequestHandlerTest.java        |  2 ++
 .../handler/FieldAnalysisRequestHandlerTest.java   | 32 ++++++++++++++++-
 .../org/apache/solr/handler/JsonLoaderTest.java    |  4 +++
 .../solr/handler/PingRequestHandlerTest.java       |  3 ++
 .../org/apache/solr/handler/TestBlobHandler.java   |  1 +
 .../org/apache/solr/handler/TestConfigReload.java  |  1 +
 .../org/apache/solr/handler/TestCoreBackup.java    |  4 +--
 .../solr/handler/TestReplicationHandler.java       | 34 ++++++++++++++++--
 .../TestReplicationHandlerDiskOverFlow.java        |  1 +
 .../org/apache/solr/handler/TestReqParamsAPI.java  |  2 ++
 .../org/apache/solr/handler/TestSQLHandler.java    |  3 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |  4 ++-
 .../handler/TestSolrConfigHandlerConcurrent.java   | 12 +++++--
 .../handler/ThrowErrorOnInitRequestHandler.java    |  2 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |  6 ++++
 .../org/apache/solr/handler/V2StandaloneTest.java  |  2 ++
 .../admin/AutoscalingHistoryHandlerTest.java       |  1 +
 .../handler/admin/CoreAdminCreateDiscoverTest.java |  2 ++
 .../solr/handler/admin/CoreAdminHandlerTest.java   |  1 +
 .../solr/handler/admin/HealthCheckHandlerTest.java |  1 +
 .../solr/handler/admin/IndexSizeEstimatorTest.java | 10 ++++++
 .../solr/handler/admin/MBeansHandlerTest.java      |  1 +
 .../solr/handler/admin/MetricsHandlerTest.java     | 13 +++++++
 .../admin/PropertiesRequestHandlerTest.java        |  1 +
 .../handler/admin/SecurityConfHandlerTest.java     |  2 ++
 .../solr/handler/admin/StatsReloadRaceTest.java    |  2 ++
 .../solr/handler/admin/TestApiFramework.java       |  6 +++-
 .../solr/handler/admin/TestCollectionAPIs.java     |  6 ++--
 .../apache/solr/handler/admin/TestConfigsApi.java  |  1 +
 .../solr/handler/admin/TestCoreAdminApis.java      |  2 ++
 .../handler/admin/ZookeeperStatusHandlerTest.java  |  3 ++
 .../component/CustomHighlightComponentTest.java    | 21 +++++++++---
 .../component/CustomTermsComponentTest.java        |  2 +-
 .../component/DistributedDebugComponentTest.java   |  8 ++---
 .../component/DistributedFacetPivotLargeTest.java  |  3 +-
 .../DistributedFacetPivotLongTailTest.java         |  2 ++
 .../component/DistributedFacetPivotSmallTest.java  | 14 +++++---
 .../component/DistributedMLTComponentTest.java     |  2 +-
 .../DistributedQueryComponentOptimizationTest.java |  1 +
 .../handler/component/InfixSuggestersTest.java     |  2 ++
 .../PhrasesIdentificationComponentTest.java        |  4 +++
 .../handler/component/SpellCheckComponentTest.java |  6 +++-
 .../solr/handler/component/StatsComponentTest.java |  5 ++-
 .../solr/handler/export/TestExportWriter.java      |  6 ++++
 .../apache/solr/handler/tagger/TaggerTestCase.java |  5 ++-
 .../apache/solr/highlight/DummyHighlighter.java    |  1 +
 .../apache/solr/metrics/SolrMetricManagerTest.java |  2 ++
 .../solr/metrics/SolrMetricsIntegrationTest.java   |  2 +-
 .../reporters/SolrGraphiteReporterTest.java        |  2 +-
 .../metrics/reporters/SolrSlf4jReporterTest.java   |  1 +
 .../org/apache/solr/response/JSONWriterTest.java   |  2 ++
 .../org/apache/solr/response/SmileWriterTest.java  | 11 ++++++
 .../solr/response/TestBinaryResponseWriter.java    |  2 ++
 .../solr/response/TestGeoJSONResponseWriter.java   |  4 +++
 .../solr/response/TestGraphMLResponseWriter.java   | 17 ++++++---
 .../response/TestJavabinTupleStreamParser.java     |  7 +++-
 .../org/apache/solr/response/TestPushWriter.java   |  3 +-
 .../solr/response/TestRawResponseWriter.java       |  2 ++
 .../solr/response/TestRetrieveFieldsOptimizer.java |  3 ++
 .../solr/response/TestSolrQueryResponse.java       |  1 +
 .../TestChildDocTransformerHierarchy.java          |  1 +
 .../apache/solr/rest/schema/TestBulkSchemaAPI.java | 31 ++++++++++++++++-
 .../schema/OpenExchangeRatesOrgProviderTest.java   |  2 +-
 .../solr/schema/SpatialRPTFieldTypeTest.java       |  2 ++
 .../solr/schema/TestBulkSchemaConcurrent.java      | 21 ++++++++++--
 .../apache/solr/schema/TestCloudManagedSchema.java |  3 ++
 .../org/apache/solr/schema/TestManagedSchema.java  |  3 ++
 .../solr/schema/TestManagedSchemaThreadSafety.java |  1 +
 .../org/apache/solr/schema/TestPointFields.java    |  1 +
 .../solr/schema/TestUseDocValuesAsStored2.java     |  1 +
 .../solr/search/AnalyticsMergeStrategyTest.java    |  4 +++
 .../solr/search/AnalyticsTestQParserPlugin.java    | 11 ++++++
 .../solr/search/CurrencyRangeFacetCloudTest.java   | 28 +++++++++++++--
 .../org/apache/solr/search/LargeFieldTest.java     |  1 +
 .../org/apache/solr/search/MergeStrategyTest.java  |  1 +
 .../apache/solr/search/MockSearchComponent.java    |  2 +-
 .../org/apache/solr/search/QueryEqualityTest.java  |  3 ++
 .../apache/solr/search/RankQueryTestPlugin.java    | 25 ++++++++++----
 .../solr/search/TestCollapseQParserPlugin.java     |  8 ++---
 .../solr/search/TestExtendedDismaxParser.java      |  1 +
 .../apache/solr/search/TestHashQParserPlugin.java  |  5 ++-
 .../org/apache/solr/search/TestIndexSearcher.java  |  8 +++--
 .../solr/search/TestMaxScoreQueryParser.java       |  1 +
 .../org/apache/solr/search/TestRealTimeGet.java    |  2 ++
 .../test/org/apache/solr/search/TestRecovery.java  | 10 ++++++
 .../org/apache/solr/search/TestRecoveryHdfs.java   |  5 +++
 .../org/apache/solr/search/TestSmileRequest.java   |  2 ++
 .../org/apache/solr/search/TestSolrCachePerf.java  |  3 ++
 .../src/test/org/apache/solr/search/TestSolrJ.java |  2 ++
 .../apache/solr/search/TestSolrQueryParser.java    |  1 +
 .../org/apache/solr/search/TestStressRecovery.java |  2 ++
 .../org/apache/solr/search/TestStressReorder.java  |  2 ++
 .../apache/solr/search/TestStressUserVersions.java |  2 ++
 .../org/apache/solr/search/TestStressVersions.java |  2 ++
 .../org/apache/solr/search/facet/DebugAgg.java     |  2 +-
 ...stributedFacetSimpleRefinementLongTailTest.java | 11 +++++-
 .../solr/search/facet/RangeFacetCloudTest.java     | 40 +++++++++++++++++++++-
 .../search/facet/SpatialHeatmapFacetsTest.java     |  5 +++
 .../search/facet/TestCloudJSONFacetJoinDomain.java |  9 +++--
 .../solr/search/facet/TestCloudJSONFacetSKG.java   | 11 ++++--
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |  5 +++
 .../solr/search/facet/TestJsonFacetRefinement.java |  3 ++
 .../search/facet/TestJsonFacetsStatsParsing.java   |  2 ++
 .../solr/search/function/NvlValueSourceParser.java |  2 +-
 .../function/TestMinMaxOnMultiValuedField.java     | 13 ++++---
 .../solr/search/join/TestCloudNestedDocsSort.java  |  4 +--
 .../solr/search/join/TestNestedDocsSort.java       |  1 +
 .../solr/search/mlt/CloudMLTQParserTest.java       |  1 +
 .../solr/security/AuditLoggerIntegrationTest.java  |  2 +-
 .../BaseTestRuleBasedAuthorizationPlugin.java      |  6 ++++
 .../solr/security/BasicAuthIntegrationTest.java    |  3 ++
 .../security/HttpParamDelegationTokenPlugin.java   |  2 +-
 .../security/JWTVerificationkeyResolverTest.java   |  2 ++
 .../solr/security/TestAuthorizationFramework.java  |  3 ++
 .../security/TestSha256AuthenticationProvider.java |  4 +++
 .../solr/security/hadoop/ImpersonationUtil.java    |  1 +
 .../hadoop/TestDelegationWithHadoopAuth.java       |  7 +++-
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |  1 +
 .../apache/solr/servlet/SolrRequestParserTest.java |  2 ++
 .../org/apache/solr/update/CdcrUpdateLogTest.java  |  8 +++++
 .../solr/update/DirectUpdateHandlerTest.java       |  3 +-
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |  2 +-
 .../solr/update/MockStreamingSolrClients.java      |  2 +-
 .../apache/solr/update/MockingHttp2SolrClient.java |  7 ++--
 .../test/org/apache/solr/update/PeerSyncTest.java  |  1 +
 .../solr/update/PeerSyncWithBufferUpdatesTest.java |  1 +
 .../PeerSyncWithIndexFingerprintCachingTest.java   |  2 ++
 ...ncWithLeaderAndIndexFingerprintCachingTest.java |  1 +
 .../apache/solr/update/PeerSyncWithLeaderTest.java |  1 +
 .../org/apache/solr/update/SoftAutoCommitTest.java |  2 +-
 .../apache/solr/update/SolrCmdDistributorTest.java |  2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java     |  8 ++---
 .../solr/update/TestInPlaceUpdatesStandalone.java  |  1 +
 .../solr/update/TestNestedUpdateProcessor.java     |  2 ++
 .../test/org/apache/solr/update/TestUpdate.java    |  2 +-
 .../test/org/apache/solr/update/UpdateLogTest.java |  1 +
 .../ClassificationUpdateProcessorFactoryTest.java  |  4 +++
 ...assificationUpdateProcessorIntegrationTest.java |  2 --
 .../ClassificationUpdateProcessorTest.java         |  5 +++
 .../CustomUpdateRequestProcessorFactory.java       |  3 +-
 .../IgnoreLargeDocumentProcessorFactoryTest.java   |  1 +
 .../update/processor/NestedAtomicUpdateTest.java   |  1 +
 .../processor/RoutedAliasUpdateProcessorTest.java  |  1 +
 .../SignatureUpdateProcessorFactoryTest.java       |  1 +
 .../SkipExistingDocumentsProcessorFactoryTest.java |  1 +
 .../processor/TestNamedUpdateProcessors.java       |  7 ++--
 .../TimeRoutedAliasUpdateProcessorTest.java        |  2 +-
 .../processor/TolerantUpdateProcessorTest.java     |  2 +-
 .../processor/TrackingUpdateProcessorFactory.java  |  2 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |  2 +-
 .../org/apache/solr/util/SolrPluginUtilsTest.java  |  2 +-
 .../test/org/apache/solr/util/TestRTimerTree.java  |  3 ++
 .../apache/solr/util/TestSolrCLIRunExample.java    |  1 +
 .../solr/util/TestSolrJacksonAnnotation.java       |  2 ++
 .../src/test/org/apache/solr/util/TestUtils.java   | 10 +++++-
 .../apache/solr/util/stats/MetricUtilsTest.java    | 10 ++++++
 .../solr/util/tracing/TestHttpServletCarrier.java  |  1 +
 212 files changed, 823 insertions(+), 135 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f1c44f5..c90f4e0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -275,6 +275,8 @@ Other Changes
 
 * SOLR-14573: Fix or suppress warnings in solrj/src/test (Erick Erickson)
 
+* SOLR-14574: Fix or suppress warnings in solr/core/src/test (Erick Erickson)
+
 ==================  8.5.2 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
index 0b00be6..027a8d7 100644
--- a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
@@ -17,7 +17,6 @@
 package org.apache.solr.handler.dataimport;
 
 import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.handler.dataimport.config.Entity;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -65,7 +64,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("processAttachement", "false");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
+    @SuppressWarnings({"unchecked"})
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
@@ -80,7 +79,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("processAttachement", "false");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
+    @SuppressWarnings({"unchecked"})
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
@@ -96,7 +95,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("exclude", ".*grandchild.*");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
+    @SuppressWarnings({"unchecked"})
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
@@ -112,7 +111,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("include", ".*grandchild.*");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
+    @SuppressWarnings({"unchecked"})
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
@@ -129,7 +128,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("include", ".*grandchild.*");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
+    @SuppressWarnings({"unchecked"})
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
@@ -138,6 +137,7 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
 
   @Test
   @Ignore("Needs a Mock Mail Server to work")
+  @SuppressWarnings({"unchecked"})
   public void testFetchTimeSince() throws ParseException {
     paramMap.put("folders", "top1/child11");
     paramMap.put("recurse", "true");
@@ -145,7 +145,6 @@ public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
     paramMap.put("fetchMailsSince", "2008-12-26 00:00:00");
     DataImporter di = new DataImporter();
     di.loadAndInit(getConfigFromMap(paramMap));
-    Entity ent = di.getConfig().getEntities().get(0);
     RequestInfo rp = new RequestInfo(null, createMap("command", "full-import"), null);
     SolrWriterImpl swi = new SolrWriterImpl();
     di.runCmd(rp, swi);
diff --git a/solr/core/src/test/org/apache/solr/OutputWriterTest.java b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
index 3df9459..eb144e8 100644
--- a/solr/core/src/test/org/apache/solr/OutputWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
@@ -107,7 +107,7 @@ public class OutputWriterTest extends SolrTestCaseJ4 {
         public UselessOutputWriter() {}
 
         @Override
-        public void init(NamedList n) {}
+        public void init(@SuppressWarnings({"rawtypes"})NamedList n) {}
         
         @Override
         public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response)
diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
index 5f286f4..dc2f89f 100644
--- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
+++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
@@ -47,7 +47,9 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
    * Gets a list of everything we can find in the classpath and makes sure it has
    * a name, description, etc...
    */
+  @SuppressWarnings({"unchecked"})
   public void testCallMBeanInfo() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     List<Class> classes = new ArrayList<>();
     classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName()));
     classes.addAll(getClassesForPackage(SearchComponent.class.getPackage().getName()));
@@ -60,7 +62,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
     SolrMetricManager metricManager = h.getCoreContainer().getMetricManager();
     String registry = h.getCore().getCoreMetricManager().getRegistryName();
     String scope = TestUtil.randomSimpleString(random(), 2, 10);
-    for( Class clazz : classes ) {
+    for(@SuppressWarnings({"rawtypes"})Class clazz : classes ) {
       if( SolrInfoBean.class.isAssignableFrom( clazz ) ) {
         try {
           SolrInfoBean info = (SolrInfoBean)clazz.newInstance();
@@ -89,6 +91,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
     assertTrue( "there are at least 10 SolrInfoBean that should be found in the classpath, found " + checked, checked > 10 );
   }
   
+  @SuppressWarnings({"rawtypes"})
   private static List<Class> getClassesForPackage(String pckgname) throws Exception {
     ArrayList<File> directories = new ArrayList<>();
     ClassLoader cld = h.getCore().getResourceLoader().getClassLoader();
@@ -102,6 +105,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
       directories.add(f);
     }
       
+    @SuppressWarnings({"rawtypes"})
     ArrayList<Class> classes = new ArrayList<>();
     for (File directory : directories) {
       if (directory.exists()) {
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index 7b759d0..11220e4 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -45,6 +45,7 @@ import static org.hamcrest.CoreMatchers.containsString;
 @SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-10844")
 public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
 
+  @SuppressWarnings({"unchecked"})
   public TestDistributedGrouping() {
     // SOLR-10844: Even with points suppressed, this test breaks if we (randomize) docvalues="true" on trie fields?!?!?!!?
     System.setProperty(NUMERIC_DOCVALUES_SYSPROP,"false");
@@ -62,6 +63,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
   String oddField="oddField_s1";
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void test() throws Exception {
     del("*:*");
     commit();
@@ -309,6 +311,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
     int which = r.nextInt(clients.size());
     SolrClient client = clients.get(which);
     QueryResponse rsp = client.query(params);
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList<?>) rsp.getResponse().get("grouped");
     nl = (NamedList<?>) nl.getVal(0);
     int matches = (Integer) nl.getVal(0);
diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
index a8a86d3..f8bb93e 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
@@ -75,6 +75,7 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
 
   int indexSize;
   List<FldType> types;
+  @SuppressWarnings({"rawtypes"})
   Map<Comparable, Doc> model = null;
   boolean validateResponses = true;
 
@@ -123,7 +124,7 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
     int percent = rand.nextInt(100);
     if (model == null) return;
     ArrayList<String> ids = new ArrayList<>(model.size());
-    for (Comparable id : model.keySet()) {
+    for (@SuppressWarnings({"rawtypes"})Comparable id : model.keySet()) {
       if (rand.nextInt(100) < percent) {
         ids.add(id.toString());
       }
diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
index 406d526..f026bb7 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
@@ -66,6 +66,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
 
   int indexSize;
   List<FldType> types;
+  @SuppressWarnings({"rawtypes"})
   Map<Comparable, Doc> model = null;
   boolean validateResponses = true;
 
@@ -109,6 +110,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
     
     types.add(new FldType("bool_b",ZERO_ONE, new Vals(){
       @Override
+      @SuppressWarnings({"rawtypes"})
       public Comparable get() {
         return random().nextBoolean();
       }
@@ -125,7 +127,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
     int percent = rand.nextInt(100);
     if (model == null) return;
     ArrayList<String> ids = new ArrayList<>(model.size());
-    for (Comparable id : model.keySet()) {
+    for (@SuppressWarnings({"rawtypes"})Comparable id : model.keySet()) {
       if (rand.nextInt(100) < percent) {
         ids.add(id.toString());
       }
@@ -327,6 +329,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
    * then all vals with 0 , and then missing count with null label,
    * in the implementation below they are called three stratas 
    * */
+  @SuppressWarnings({"unchecked"})
   private String getExpectationForSortByCount( ModifiableSolrParams params, List<String> methods) throws Exception {
     String indexSortedResponse = getIndexSortedAllFacetValues(params, methods);
     
@@ -342,8 +345,8 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
         }
       };
       
-      for (Iterator iterator = facetSortedByIndex.iterator(); iterator.hasNext();) {
-        Object label = (Object) iterator.next();
+      for (@SuppressWarnings({"rawtypes"})Iterator iterator = facetSortedByIndex.iterator(); iterator.hasNext();) {
+        Object label = iterator.next();
         Long count = (Long) iterator.next();
         final Integer strata;
         if (label==null) { // missing (here "stratas" seems like overengineering )
@@ -360,6 +363,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
         facet.add(label);
         facet.add(count);
       }
+      @SuppressWarnings({"rawtypes"})
       List stratified =new ArrayList<>();
       for(Integer s : new Integer[]{1, 0}) { // non-zero capped to one goes first, zeroes go then
         stratified.addAll(stratas.get(s));
@@ -436,17 +440,22 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
     });
   }
   
+  @SuppressWarnings({"unchecked"})
   private String transformFacetFields(String expected, Consumer<Map.Entry<Object,Object>> consumer) throws IOException {
     Object json = Utils.fromJSONString(expected);
+    @SuppressWarnings({"rawtypes"})
     Map facet_fields = getFacetFieldMap(json);
+    @SuppressWarnings({"rawtypes"})
     Set entries = facet_fields.entrySet();
     for (Object facetTuples : entries) { //despite there should be only one field
+      @SuppressWarnings({"rawtypes"})
       Entry entry = (Entry)facetTuples;
       consumer.accept(entry);
     }
     return Utils.toJSONString(json);
   }
 
+  @SuppressWarnings({"rawtypes"})
   private Map getFacetFieldMap(Object json) {
     Object facet_counts = ((Map)json).get("facet_counts");
     Map facet_fields = (Map) ((Map)facet_counts).get("facet_fields");
diff --git a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
index d3ad78b..513626a 100644
--- a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
+++ b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
@@ -93,6 +93,7 @@ public class TestSolrCoreProperties extends SolrJettyTestBase {
     QueryResponse res = getSolrClient().query(params);
     assertEquals(0, res.getResults().getNumFound());
 
+    @SuppressWarnings({"rawtypes"})
     NamedList echoedParams = (NamedList) res.getHeader().get("params");
     assertEquals("f1", echoedParams.get("p1"));
     assertEquals("f2", echoedParams.get("p2"));
diff --git a/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java b/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java
index d409119..d41e641 100644
--- a/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java
+++ b/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 public class TokenizerChainTest extends SolrTestCaseJ4 {
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testNormalization() throws Exception {
     String fieldName = "f";
     TokenFilterFactory[] tff = new TokenFilterFactory[2];
diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
index f93600d..e9b905d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
@@ -94,6 +94,7 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testProperties() throws Exception {
     CollectionAdminRequest.createCollection("collection1meta", "conf", 2, 1).process(cluster.getSolrClient());
     CollectionAdminRequest.createCollection("collection2meta", "conf", 1, 1).process(cluster.getSolrClient());
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 413e55a..d5db36a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -795,6 +795,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
     }
     params.set("name", collectionName);
     params.set("collection.configName", configSetName);
+    @SuppressWarnings({"rawtypes"})
     SolrRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
 
@@ -902,6 +903,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
     QueryRequest qr = new QueryRequest(params("qt", "/get", "id","1000"));
     for (SolrClient client : clients) {
       val += 10;
+      @SuppressWarnings({"rawtypes"})
       NamedList rsp = client.request(qr);
       String match = JSONTestUtil.matchObj("/val_i", rsp.get("doc"), expected);
       if (match != null) throw new RuntimeException(match);
@@ -943,8 +945,11 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
       // use generic request to avoid extra processing of queries
       QueryRequest req = new QueryRequest(params);
       NamedList<Object> resp = client.request(req);
+      @SuppressWarnings({"rawtypes"})
       NamedList metrics = (NamedList) resp.get("metrics");
+      @SuppressWarnings({"rawtypes"})
       NamedList uhandlerCat = (NamedList) metrics.getVal(0);
+      @SuppressWarnings({"unchecked"})
       Map<String,Object> commits = (Map<String,Object>) uhandlerCat.get("UPDATE.updateHandler.commits");
       return (Long) commits.get("count");
     }
@@ -1150,9 +1155,11 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
     createSolrCore(collection, collectionClients, baseUrl, num, null);
   }
   
+  @SuppressWarnings({"unchecked"})
   private void createSolrCore(final String collection,
       List<SolrClient> collectionClients, final String baseUrl, final int num,
       final String shardId) {
+    @SuppressWarnings({"rawtypes"})
     Callable call = () -> {
       try (HttpSolrClient client = getHttpSolrClient(baseUrl)) {
         // client.setConnectionTimeout(15000);
@@ -1263,6 +1270,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
     client.add(doc);
   }
   
+  @SuppressWarnings({"unchecked"})
   private void createNewCollection(final String collection) throws InterruptedException {
     try {
       assertEquals(0, CollectionAdminRequest
@@ -1279,6 +1287,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
     for (final JettySolrRunner runner : jettys) {
       unique++;
       final int frozeUnique = unique;
+      @SuppressWarnings({"rawtypes"})
       Callable call = () -> {
 
         try {
diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudTestUtils.java b/solr/core/src/test/org/apache/solr/cloud/CloudTestUtils.java
index f86a6ba..07e279b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CloudTestUtils.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CloudTestUtils.java
@@ -64,6 +64,7 @@ public class CloudTestUtils {
     TimeOut timeout = new TimeOut(DEFAULT_TIMEOUT, TimeUnit.SECONDS, cloudManager.getTimeSource());
     while (!timeout.hasTimedOut()) {
       final SolrResponse response = cloudManager.request(AutoScalingRequest.create(SolrRequest.METHOD.GET, null));
+      @SuppressWarnings({"unchecked"})
       final Map<String,?> triggers = (Map<String,?>) response.getResponse().get("triggers");
       Assert.assertNotNull("null triggers in response from autoscaling request", triggers);
       
@@ -106,6 +107,7 @@ public class CloudTestUtils {
                                               final String json) throws IOException {
     // TODO: a lot of code that directly uses AutoScalingRequest.create should use this method
     
+    @SuppressWarnings({"rawtypes"})
     final SolrRequest req = AutoScalingRequest.create(SolrRequest.METHOD.POST, json);
     final SolrResponse rsp = cloudManager.request(req);
     final String result = rsp.getResponse().get("result").toString();
@@ -117,6 +119,7 @@ public class CloudTestUtils {
   /**
    * Helper class for sending (JSON) autoscaling requests that can randomize between V1 and V2 requests
    */
+  @SuppressWarnings({"rawtypes"})
   public static class AutoScalingRequest extends SolrRequest {
     private SolrParams params = null;
     /**
@@ -125,6 +128,7 @@ public class CloudTestUtils {
      * @param m HTTP Method to use
      * @aram message JSON payload, may be null
      */
+    @SuppressWarnings({"rawtypes"})
     public static SolrRequest create(SolrRequest.METHOD m, String message) {
       return create(m, null, message);
     }
@@ -136,10 +140,12 @@ public class CloudTestUtils {
      *        otherwise must start with "/"
      * @param message JSON payload, may be null
      */
+    @SuppressWarnings({"rawtypes"})
     public static SolrRequest create(SolrRequest.METHOD m, String subPath, String message) {
       return create(m,subPath,message,null);
 
     }
+    @SuppressWarnings({"rawtypes"})
     public static SolrRequest create(SolrRequest.METHOD m, String subPath, String message, SolrParams params) {
       final boolean useV1 = LuceneTestCase.random().nextBoolean();
       String path = useV1 ? "/admin/autoscaling" : "/cluster/autoscaling";
diff --git a/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java
index 26d77b7..0053fd9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java
@@ -61,6 +61,7 @@ public class ConfigSetsAPITest extends SolrCloudTestCase {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testSharedSchema() throws Exception {
     CollectionAdminRequest.createCollection("col1", "cShare", 1, 1)
         .processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT);
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 218d42a..ad66a64 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -381,6 +381,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
   }
 
   // test inspired by SOLR-6511
+  @SuppressWarnings({"try"})
   protected void testLeaderZkSessionLoss() throws Exception {
 
     String testCollectionName = "c8n_1x2_leader_session_loss";
@@ -567,12 +568,14 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
   }
 
   protected void assertDocNotExists(HttpSolrClient solr, String coll, String docId) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = realTimeGetDocId(solr, docId);
     String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), Integer.valueOf(docId));
     assertTrue("Doc with id=" + docId + " is found in " + solr.getBaseURL()
         + " due to: " + match + "; rsp="+rsp, match != null);
   }
 
+  @SuppressWarnings({"rawtypes"})
   private NamedList realTimeGetDocId(HttpSolrClient solr, String docId) throws SolrServerException, IOException {
     QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));
     return solr.request(qr);
diff --git a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
index 76a3085..0e9587b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
+++ b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
@@ -132,7 +132,7 @@ public class KerberosTestServices {
      */
     public JaasConfiguration(String clientPrincipal, File clientKeytab,
                              String serverPrincipal, File serverKeytab) {
-      Map<String, String> clientOptions = new HashMap();
+      Map<String, String> clientOptions = new HashMap<>();
       clientOptions.put("principal", clientPrincipal);
       clientOptions.put("keyTab", clientKeytab.getAbsolutePath());
       clientOptions.put("useKeyTab", "true");
@@ -148,7 +148,7 @@ public class KerberosTestServices {
               AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
               clientOptions)};
       if(serverPrincipal!=null && serverKeytab!=null) {
-        Map<String, String> serverOptions = new HashMap(clientOptions);
+        Map<String, String> serverOptions = new HashMap<>(clientOptions);
         serverOptions.put("principal", serverPrincipal);
         serverOptions.put("keytab", serverKeytab.getAbsolutePath());
         serverEntry =  new AppConfigurationEntry[]{
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
index 08bc9ab..fb0cbbd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -293,12 +293,14 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
   }
 
   private void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = realTimeGetDocId(solr, docId);
     String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
     assertTrue("Doc with id=" + docId + " not found in " + solr.getBaseURL()
         + " due to: " + match + "; rsp="+rsp, match == null);
   }
 
+  @SuppressWarnings({"rawtypes"})
   private NamedList realTimeGetDocId(HttpSolrClient solr, String docId) throws SolrServerException, IOException {
     QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));
     return solr.request(qr);
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java
index 6d169e3..cf7fa5e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java
@@ -34,6 +34,7 @@ public class OverseerStatusTest extends SolrCloudTestCase {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void test() throws Exception {
 
     // find existing command counts because collection may be created by base test class too
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java
index 331bf41..3472f58 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java
@@ -78,6 +78,7 @@ public class OverseerTaskQueueTest extends DistributedQueueTest {
     List<OverseerTaskQueue.QueueEvent> queueEvents = tq.peekTopN(2, s -> false, 1000);
     OverseerTaskQueue.QueueEvent requestId2Event = null;
     for (OverseerTaskQueue.QueueEvent queueEvent : queueEvents) {
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> eventProps = (Map<String, Object>) Utils.fromJSON(queueEvent.getBytes());
       if (requestId2.equals(eventProps.get(CommonAdminParams.ASYNC))) {
         requestId2Event = queueEvent;
diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
index c43bf6c..c2566a7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
@@ -123,6 +123,7 @@ public class SSLMigrationTest extends AbstractFullDistribZkTestBase {
         .toLowerCase(Locale.ROOT), "name", "urlScheme", "val", value);
     @SuppressWarnings("unchecked")
     SolrParams params = new MapSolrParams(m);
+    @SuppressWarnings({"rawtypes"})
     SolrRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
     
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
index 146ad82..321e208 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
@@ -126,6 +126,7 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         Arrays.asList("overlay", "runtimeLib", blobName, "version"),
         1l, 10);
 
+    @SuppressWarnings({"rawtypes"})
     LinkedHashMapWriter map = TestSolrConfigHandler.getRespMap("/runtime", client);
     String s = map._getStr( "error/msg",null);
     assertNotNull(map.toString(), s);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
index 1cd70f4..1ed2341 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
@@ -84,6 +84,7 @@ public class TestQueryingOnDownCollection extends SolrCloudTestCase {
 
     SolrClient client = cluster.getJettySolrRunner(0).newClient();
 
+    @SuppressWarnings({"rawtypes"})
     SolrRequest req = new QueryRequest(new SolrQuery("*:*").setRows(0)).setBasicAuthCredentials(USERNAME, PASSWORD);
 
     // Without the SOLR-13793 fix, this causes requests to "down collection" to pile up (until the nodes run out 
@@ -113,6 +114,7 @@ public class TestQueryingOnDownCollection extends SolrCloudTestCase {
     assertTrue(error.getMessage().contains("No active replicas found for collection: " + COLLECTION_NAME));
   }
 
+  @SuppressWarnings({"unchecked"})
   private void downAllReplicas() throws Exception {
     byte[] collectionState = cluster.getZkClient().getData("/collections/" + COLLECTION_NAME + "/state.json",
         null, null, true);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index 77d45c7..fe30305 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -248,7 +248,7 @@ public class TestTlogReplica extends SolrCloudTestCase {
                 "stats", "true");
             QueryResponse statsResponse = tlogReplicaClient.query(req);
             assertEquals("Append replicas should recive all updates. Replica: " + r + ", response: " + statsResponse,
-                1L, ((Map<String, Object>)((NamedList<Object>)statsResponse.getResponse()).findRecursive("plugins", "UPDATE", "updateHandler", "stats")).get("UPDATE.updateHandler.cumulativeAdds.count"));
+                1L, ((Map<String, Object>)(statsResponse.getResponse()).findRecursive("plugins", "UPDATE", "updateHandler", "stats")).get("UPDATE.updateHandler.cumulativeAdds.count"));
             break;
           } catch (AssertionError e) {
             if (t.hasTimedOut()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
index 0834891..cac7f76 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
@@ -119,6 +119,7 @@ public class TestUtilizeNode extends SolrCloudTestCase {
       log.info("Setting new policy to blacklist jettyX ({}) port={}",
           jettyX.getNodeName(), jettyX.getLocalPort());
     }
+    @SuppressWarnings({"rawtypes"})
     SolrRequest req = AutoScalingRequest.create(SolrRequest.METHOD.POST, setClusterPolicyCommand);
     NamedList<Object> response = cloudClient.request(req);
     assertEquals(req + " => " + response,
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
index 2a20ee5..41169a4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
@@ -1060,6 +1060,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {
     if (splitKey != null) {
       params.set("split.key", splitKey);
     }
+    @SuppressWarnings({"rawtypes"})
     SolrRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
 
diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
index 4a0f1ba..16dad97 100644
--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
@@ -50,7 +50,7 @@ public class BlobRepositoryMockingTest {
   private static final String[][] PARSED = new String[][]{{"foo", "bar", "baz"}, {"bang", "boom", "bash"}};
   private static final String BLOBSTR = "foo,bar,baz\nbang,boom,bash";
   private CoreContainer mockContainer = mock(CoreContainer.class);
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private ConcurrentHashMap<String, BlobRepository.BlobContent> mapMock = mock(ConcurrentHashMap.class);
   
   private Object[] mocks = new Object[] {
@@ -92,6 +92,7 @@ public class BlobRepositoryMockingTest {
       }
 
       @Override
+      @SuppressWarnings({"rawtypes"})
       ConcurrentHashMap<String, BlobContent> createMap() {
         return mapMock;
       }
@@ -103,6 +104,7 @@ public class BlobRepositoryMockingTest {
   public void testCloudOnly() {
     when(mockContainer.isZooKeeperAware()).thenReturn(false);
     try {
+      @SuppressWarnings({"rawtypes"})
       BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");
     } catch (SolrException e) {
       verify(mockContainer).isZooKeeperAware();
@@ -114,6 +116,7 @@ public class BlobRepositoryMockingTest {
   @Test
   public void testGetBlobIncrRefString() {
     when(mockContainer.isZooKeeperAware()).thenReturn(true);
+    @SuppressWarnings({"rawtypes"})
     BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");
     assertTrue("foo!".equals(blobKey));
     assertTrue(blobFetched);
@@ -130,6 +133,7 @@ public class BlobRepositoryMockingTest {
     when(mockContainer.isZooKeeperAware()).thenReturn(true);
     filecontent = TestDynamicLoading.getFileContent("runtimecode/runtimelibs_v2.jar.bin");
     url = "http://localhost:8080/myjar/location.jar";
+    @SuppressWarnings({"rawtypes"})
     BlobRepository.BlobContentRef ref = repository.getBlobIncRef( "filefoo",null,url,
         "bc5ce45ad281b6a08fb7e529b1eb475040076834816570902acb6ebdd809410e31006efdeaa7f78a6c35574f3504963f5f7e4d92247d0eb4db3fc9abdda5d417");
     assertTrue("filefoo".equals(blobKey));
@@ -154,6 +158,7 @@ public class BlobRepositoryMockingTest {
   public void testCachedAlready() {
     when(mockContainer.isZooKeeperAware()).thenReturn(true);
     when(mapMock.get("foo!")).thenReturn(new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));
+    @SuppressWarnings({"rawtypes"})
     BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");
     assertEquals("",blobKey);
     assertFalse(blobFetched);
@@ -167,6 +172,7 @@ public class BlobRepositoryMockingTest {
   @Test
   public void testGetBlobIncrRefStringDecoder() {
     when(mockContainer.isZooKeeperAware()).thenReturn(true);
+    @SuppressWarnings({"rawtypes"})
     BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!", new BlobRepository.Decoder<Object>() {
       @Override
       public Object decode(InputStream inputStream) {
diff --git a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
index 697d47b..f584604 100644
--- a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
+++ b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
@@ -80,6 +80,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void integrationTest() {
     assumeWorkingMockito();
 
@@ -124,6 +125,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
         Map<String, Replica> replicaMap = replicas.stream().collect(Collectors.toMap(Replica::getName, Function.identity()));
         sliceMap.put(slice, new Slice(slice, replicaMap, map(), collection));
       }
+      @SuppressWarnings({"unchecked"})
       DocCollection col = new DocCollection(collection, sliceMap, map(), DocRouter.DEFAULT);
       collToState.put(collection, col);
     }
@@ -181,6 +183,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
   }
 
   private CoreDescriptor newCoreDescriptor(Replica r) {
+    @SuppressWarnings({"unchecked"})
     Map<String,String> props = map(
         CoreDescriptor.CORE_SHARD, r.getSlice(),
         CoreDescriptor.CORE_COLLECTION, r.getCollection(),
@@ -192,6 +195,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
   protected Replica addNewReplica(List<Replica> replicaList, String collection, String slice, List<String> possibleNodes) {
     String replica = "r" + replicaList.size();
     String node = possibleNodes.get(random().nextInt(possibleNodes.size())); // place on a random node
+    @SuppressWarnings({"unchecked"})
     Replica r = new Replica(replica, map("core", replica, "node_name", node), collection, slice);
     replicaList.add(r);
     return r;
diff --git a/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java
index e638039..6050187 100644
--- a/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java
+++ b/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java
@@ -72,7 +72,8 @@ public class CountUsageValueSourceParser extends ValueSourceParser {
       this.counter = counter;
     }
     @Override
-    public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
+    public FunctionValues getValues(@SuppressWarnings({"rawtypes"})Map context,
+                                    LeafReaderContext readerContext) throws IOException {
       return new DoubleDocValues(this) {
         @Override
         public double doubleVal(int doc) {
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
index 28aba18..62bc44e 100755
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
@@ -76,6 +76,7 @@ public class DirectoryFactoryTest extends SolrTestCase {
     doTestGetDataHome(ByteBuffersDirectoryFactory.class);
   }
   
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private void doTestGetDataHome(Class<? extends DirectoryFactory> directoryFactoryClass) throws Exception {
     NodeConfig config = loadNodeConfig("/solr/solr-solrDataHome.xml");
     CoreContainer cc = new CoreContainer(config);
diff --git a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
index 2d83438..14f1a1e 100644
--- a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
+++ b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
@@ -29,10 +29,11 @@ import org.apache.solr.search.ValueSourceParser;
  *
  **/
 public class DummyValueSourceParser extends ValueSourceParser {
+  @SuppressWarnings({"rawtypes"})
   private NamedList args;
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     this.args = args;
   }
 
diff --git a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
index 06faa05..d4fd38e 100644
--- a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
@@ -99,10 +99,13 @@ public class ExitableDirectoryReaderTest extends SolrTestCaseJ4 {
     // This gets 0 docs back. Use 10000 instead of 1 for timeAllowed and it gets 100 back and the for loop below
     // succeeds.
     String response = JQ(req("q", "*:*", "fq", fq, "indent", "true", "timeAllowed", "1", "sleep", sleep));
+    @SuppressWarnings({"rawtypes"})
     Map res = (Map) fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map body = (Map) (res.get("response"));
     assertTrue("Should have fewer docs than " + NUM_DOCS, (long) (body.get("numFound")) < NUM_DOCS);
 
+    @SuppressWarnings({"rawtypes"})
     Map header = (Map) (res.get("responseHeader"));
     assertTrue("Should have partial results", (Boolean) (header.get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY)));
 
@@ -142,8 +145,11 @@ public class ExitableDirectoryReaderTest extends SolrTestCaseJ4 {
     nl = queryCacheStats.getValue();
     assertEquals("Should NOT have inserted partial results!", inserts, (long) nl.get("inserts"));
 
+    @SuppressWarnings({"rawtypes"})
     Map res = (Map) fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map body = (Map) (res.get("response"));
+    @SuppressWarnings({"rawtypes"})
     Map header = (Map) (res.get("responseHeader"));
 
     assertTrue("Should have fewer docs than " + NUM_DOCS, (long) (body.get("numFound")) < NUM_DOCS);
diff --git a/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java b/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java
index 3f463a1..ae20e0f 100644
--- a/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java
+++ b/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java
@@ -33,7 +33,7 @@ public class FakeDeletionPolicy extends IndexDeletionPolicy implements NamedList
 
   //@Override
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     var1 = (String) args.get("var1");
     var2 = (String) args.get("var2");
   }
@@ -48,13 +48,13 @@ public class FakeDeletionPolicy extends IndexDeletionPolicy implements NamedList
 
   //  @Override
   @Override
-  public void onCommit(List arg0) throws IOException {
+  public void onCommit(@SuppressWarnings({"rawtypes"})List arg0) throws IOException {
     System.setProperty("onCommit", "test.org.apache.solr.core.FakeDeletionPolicy.onCommit");
   }
 
   //  @Override
   @Override
-  public void onInit(List arg0) throws IOException {
+  public void onInit(@SuppressWarnings({"rawtypes"})List arg0) throws IOException {
     System.setProperty("onInit", "test.org.apache.solr.core.FakeDeletionPolicy.onInit");
   }
 }
diff --git a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java
index b2794df..6cc9d3e 100644
--- a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java
@@ -77,6 +77,7 @@ public class HdfsDirectoryFactoryTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"try"})
   public void testInitArgsOrSysPropConfig() throws Exception {
     try(HdfsDirectoryFactory hdfsFactory = new HdfsDirectoryFactory()) {
       // test sys prop config
diff --git a/solr/core/src/test/org/apache/solr/core/MockEventListener.java b/solr/core/src/test/org/apache/solr/core/MockEventListener.java
index d2babd5..5b0422e 100644
--- a/solr/core/src/test/org/apache/solr/core/MockEventListener.java
+++ b/solr/core/src/test/org/apache/solr/core/MockEventListener.java
@@ -34,7 +34,7 @@ public class MockEventListener implements SolrEventListener {
   }
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     /* NOOP */
   }
 
diff --git a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java
index 0b0c7e5..43e8900 100644
--- a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java
@@ -36,7 +36,7 @@ public class MockQuerySenderListenerReqHandler extends RequestHandlerBase {
   AtomicInteger initCounter = new AtomicInteger(0);
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     initCounter.incrementAndGet();
     super.init(args);
   }
diff --git a/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java
index 98266b2..f7eeced 100644
--- a/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java
@@ -27,6 +27,7 @@ import org.apache.solr.util.plugin.PluginInfoInitialized;
 
 /** a fake shardhandler factory that does nothing. */
 public class MockShardHandlerFactory extends ShardHandlerFactory implements PluginInfoInitialized {
+  @SuppressWarnings({"rawtypes"})
   NamedList args;
   
   @Override
diff --git a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
index 637aa24..6823180 100644
--- a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
+++ b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
@@ -36,6 +36,7 @@ public class RequestHandlersTest extends SolrTestCaseJ4 {
   public void testInitCount() {
     String registry = h.getCore().getCoreMetricManager().getRegistryName();
     SolrMetricManager manager = h.getCoreContainer().getMetricManager();
+    @SuppressWarnings({"unchecked"})
     Gauge<Number> g = (Gauge<Number>)manager.registry(registry).getMetrics().get("QUERY./mock.initCount");
     assertEquals("Incorrect init count",
                  1, g.getValue().intValue());
diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
index b6cf6a1..b257932 100644
--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
@@ -69,6 +69,7 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   public void testAwareCompatibility() throws Exception {
     
     final Class<?> clazz1 = ResourceLoaderAware.class;
@@ -199,7 +200,7 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
     
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"rawtypes", "deprecation"})
   public void testLoadDeprecatedFactory() throws Exception {
     SolrResourceLoader loader = new SolrResourceLoader(Paths.get("solr/collection1"));
     // ensure we get our exception
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
index e98f510..1c39fa9 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
@@ -65,6 +65,7 @@ public class TestConfigOverlay extends SolrTestCase {
   }
 
   public void testSetProperty(){
+    @SuppressWarnings({"unchecked"})
     ConfigOverlay overlay = new ConfigOverlay(Collections.EMPTY_MAP,0);
     overlay = overlay.setProperty("query.filterCache.initialSize",100);
     assertEquals(100, overlay.getXPathProperty("query/filterCache/@initialSize"));
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
index f8caaf6..1d0c733 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
@@ -75,6 +75,7 @@ public class TestConfigSetImmutable extends RestTestBase {
         "}";
     String uri = "/config";
     String response = restTestHarness.post(uri, SolrTestCaseJ4.json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) Utils.fromJSONString(response);
     assertNotNull(map.get("error"));
     assertTrue(map.get("error").toString().contains("immutable"));
@@ -92,7 +93,9 @@ public class TestConfigSetImmutable extends RestTestBase {
         "    }";
 
     String response = restTestHarness.post("/schema", json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) Utils.fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map error = (Map)map.get("error");
     assertNotNull("No errors", error);
     String msg = (String)error.get("msg");
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java
index 75f4e66..093bed6 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java
@@ -62,19 +62,23 @@ public class TestConfigSetProperties extends SolrTestCaseJ4 {
 
   @Test
   public void testEmptyMap() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList list = createConfigSetProps(Utils.toJSONString(ImmutableMap.of()));
     assertEquals(0, list.size());
   }
 
   @Test
   public void testMultipleProps() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     Map map = ImmutableMap.of("immutable", "true", "someOtherProp", "true");
+    @SuppressWarnings({"rawtypes"})
     NamedList list = createConfigSetProps(Utils.toJSONString(map));
     assertEquals(2, list.size());
     assertEquals("true", list.get("immutable"));
     assertEquals("true", list.get("someOtherProp"));
   }
 
+  @SuppressWarnings({"rawtypes"})
   private NamedList createConfigSetProps(String props) throws Exception {
     Path testDirectory = createTempDir();
     String filename = "configsetprops.json";
diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
index c97f816..5c5ba8f 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
@@ -141,6 +141,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
   // Test the basic setup, create some dirs with core.properties files in them, but solr.xml has discoverCores
   // set and insure that we find all the cores and can load them.
   @Test
+  @SuppressWarnings({"try"})
   public void testDiscovery() throws Exception {
     setMeUp();
 
diff --git a/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java b/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
index 0eccb6a..3f6b18b 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
@@ -58,6 +58,7 @@ public class TestDirectoryFactory extends SolrTestCaseJ4 {
     }
   }
 
+  @SuppressWarnings({"rawtypes"})
   private void testExistsBehavior(Class<? extends DirectoryFactory> clazz) throws Exception {
     final String path = createTempDir().toString() + "/" + clazz + "_somedir";
     DirectoryFactory dirFac = null;
diff --git a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
index 22ee299..d9a3bf4 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
@@ -84,6 +84,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         Arrays.asList("overlay", "requestHandler", "/test1", "class"),
         "org.apache.solr.core.BlobStoreTestRequestHandler",10);
 
+    @SuppressWarnings({"rawtypes"})
     Map map = TestSolrConfigHandler.getRespMap("/test1", client);
 
     assertNotNull(map.toString(), map = (Map) map.get("error"));
@@ -142,6 +143,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
     client = randomRestTestHarness();
     TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
 
+    @SuppressWarnings({"rawtypes"})
     Map result = TestSolrConfigHandler.testForResponseElement(client,
         null,
         "/config/overlay",
@@ -258,7 +260,8 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
     return jar;
   }
 
-  public static  ByteBuffer persistZip(String loc, Class... classes) throws IOException {
+  public static  ByteBuffer persistZip(String loc,
+                                       @SuppressWarnings({"rawtypes"})Class... classes) throws IOException {
     ByteBuffer jar = generateZip(classes);
     try (FileOutputStream fos =  new FileOutputStream(loc)){
       fos.write(jar.array(), 0, jar.limit());
@@ -268,11 +271,11 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
   }
 
 
-  public static ByteBuffer generateZip(Class... classes) throws IOException {
+  public static ByteBuffer generateZip(@SuppressWarnings({"rawtypes"})Class... classes) throws IOException {
     SimplePostTool.BAOS bos = new SimplePostTool.BAOS();
     try (ZipOutputStream zipOut = new ZipOutputStream(bos)) {
       zipOut.setLevel(ZipOutputStream.DEFLATED);
-      for (Class c : classes) {
+      for (@SuppressWarnings({"rawtypes"})Class c : classes) {
         String path = c.getName().replace('.', '/').concat(".class");
         ZipEntry entry = new ZipEntry(path);
         ByteBuffer b = SimplePostTool.inputStreamToByteArray(c.getClassLoader().getResourceAsStream(path));
diff --git a/solr/core/src/test/org/apache/solr/core/TestDynamicLoadingUrl.java b/solr/core/src/test/org/apache/solr/core/TestDynamicLoadingUrl.java
index 575cf9e..b172d52 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDynamicLoadingUrl.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDynamicLoadingUrl.java
@@ -109,6 +109,7 @@ public class TestDynamicLoadingUrl extends AbstractFullDistribZkTestBase {
           Arrays.asList("overlay", "requestHandler", "/runtime", "class"),
           "org.apache.solr.core.RuntimeLibReqHandler", 120);
 
+      @SuppressWarnings({"rawtypes"})
       Map result = TestSolrConfigHandler.testForResponseElement(client,
           null,
           "/runtime",
diff --git a/solr/core/src/test/org/apache/solr/core/TestInitParams.java b/solr/core/src/test/org/apache/solr/core/TestInitParams.java
index 465c160..d3a0eef 100644
--- a/solr/core/src/test/org/apache/solr/core/TestInitParams.java
+++ b/solr/core/src/test/org/apache/solr/core/TestInitParams.java
@@ -41,7 +41,9 @@ public class TestInitParams extends SolrTestCaseJ4 {
       SolrRequestHandler handler = h.getCore().getRequestHandler(s);
       SolrQueryResponse rsp = new SolrQueryResponse();
       handler.handleRequest(req("initArgs", "true"), rsp);
+      @SuppressWarnings({"rawtypes"})
       NamedList nl = (NamedList) rsp.getValues().get("initArgs");
+      @SuppressWarnings({"rawtypes"})
       NamedList def = (NamedList) nl.get(PluginInfo.DEFAULTS);
       assertEquals("A", def.get("a"));
       def = (NamedList) nl.get(PluginInfo.INVARIANTS);
@@ -52,8 +54,9 @@ public class TestInitParams extends SolrTestCaseJ4 {
 
     InitParams initParams = h.getCore().getSolrConfig().getInitParams().get("a");
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     PluginInfo pluginInfo = new PluginInfo("requestHandler",
-        new HashMap<String, String>(),
+        new HashMap<>(),
         new NamedList<>(singletonMap("defaults", new NamedList(Utils.makeMap("a", "A1")))), null);
     initParams.apply(pluginInfo);
     assertEquals( "A",initParams.defaults.get("a"));
@@ -64,7 +67,9 @@ public class TestInitParams extends SolrTestCaseJ4 {
     SolrRequestHandler handler = h.getCore().getRequestHandler("/dump6");
     SolrQueryResponse rsp = new SolrQueryResponse();
     handler.handleRequest(req("initArgs", "true"), rsp);
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) rsp.getValues().get("initArgs");
+    @SuppressWarnings({"rawtypes"})
     NamedList def = (NamedList) nl.get(PluginInfo.DEFAULTS);
     assertEquals("A", def.get("a"));
     assertEquals("P", def.get("p"));
@@ -81,7 +86,9 @@ public class TestInitParams extends SolrTestCaseJ4 {
     SolrRequestHandler handler = h.getCore().getRequestHandler("/dump2");
     SolrQueryResponse rsp = new SolrQueryResponse();
     handler.handleRequest(req("initArgs", "true"), rsp);
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) rsp.getValues().get("initArgs");
+    @SuppressWarnings({"rawtypes"})
     NamedList def = (NamedList) nl.get(PluginInfo.DEFAULTS);
     assertEquals("A1" ,def.get("a"));
     def = (NamedList) nl.get(PluginInfo.INVARIANTS);
@@ -101,7 +108,9 @@ public class TestInitParams extends SolrTestCaseJ4 {
     SolrRequestHandler handler = h.getCore().getRequestHandler("/elevate");
     SolrQueryResponse rsp = new SolrQueryResponse();
     handler.handleRequest(req("initArgs", "true"), rsp);
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) rsp.getValues().get("initArgs");
+    @SuppressWarnings({"rawtypes"})
     NamedList def = (NamedList) nl.get(PluginInfo.DEFAULTS);
     assertEquals("text" ,def.get("df"));
 
@@ -111,6 +120,7 @@ public class TestInitParams extends SolrTestCaseJ4 {
     SolrRequestHandler handler = h.getCore().getRequestHandler("/dump7");
     SolrQueryResponse rsp = new SolrQueryResponse();
     handler.handleRequest(req("initArgs", "true"), rsp);
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) rsp.getValues().get("initArgs");
     assertEquals("server-enabled.txt", nl.get("healthcheckFile"));
   }
diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
index 663febb..bc59241 100644
--- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -173,6 +173,7 @@ public class TestJmxIntegration extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"try"})
   public void testJmxOnCoreReload() throws Exception {
     // make sure searcher beans are registered
     assertQ(req("q", "*:*"), "//result[@numFound='0']");
diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
index 838ffdb..a41b750 100644
--- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
+++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
@@ -245,9 +245,11 @@ public class TestLazyCores extends SolrTestCaseJ4 {
 
         SolrQueryResponse resp = new SolrQueryResponse();
         handler.handleRequest(makeReq(core1, CommonParams.QT, "/admin/metrics"), resp);
+        @SuppressWarnings({"rawtypes"})
         NamedList values = resp.getValues();
         assertNotNull(values.get("metrics"));
         values = (NamedList) values.get("metrics");
+        @SuppressWarnings({"rawtypes"})
         NamedList nl = (NamedList) values.get("solr.core.collection2");
         assertNotNull(nl);
         Object o = nl.get("REPLICATION./replication.indexPath");
@@ -644,6 +646,7 @@ public class TestLazyCores extends SolrTestCaseJ4 {
               resp);
     }
 
+    @SuppressWarnings({"unchecked"})
     Map<String, Exception> failures =
         (Map<String, Exception>) resp.getValues().get("initFailures");
 
@@ -720,6 +723,7 @@ public class TestLazyCores extends SolrTestCaseJ4 {
     updater.addDoc(cmd);
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private LocalSolrQueryRequest makeReq(SolrCore core, String... q) {
     if (q.length == 1) {
       return new LocalSolrQueryRequest(core,
diff --git a/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java
index e6e6295..9b1fabe 100644
--- a/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java
@@ -33,6 +33,7 @@ public class TestShardHandlerFactory extends SolrTestCaseJ4 {
     CoreContainer cc = CoreContainer.createAndLoad(home, home.resolve("solr-shardhandler.xml"));
     ShardHandlerFactory factory = cc.getShardHandlerFactory();
     assertTrue(factory instanceof MockShardHandlerFactory);
+    @SuppressWarnings({"rawtypes"})
     NamedList args = ((MockShardHandlerFactory)factory).args;
     assertEquals("myMagicRequiredValue", args.get("myMagicRequiredParameter"));
     factory.close();
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 178ca2a..868561c 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -171,6 +171,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     reqhandlertests(restTestHarness, null, null);
   }
 
+  @SuppressWarnings({"rawtypes"})
   public static Map runConfigCommand(RestTestHarness harness, String uri, String payload) throws IOException {
     String json = SolrTestCaseJ4.json(payload);
     log.info("going to send config command. path {} , payload: {}", uri, payload);
@@ -185,11 +186,14 @@ public class TestSolrConfigHandler extends RestTestBase {
     String json = SolrTestCaseJ4.json(payload);
     log.info("going to send config command. path {} , payload: {}", uri, payload);
     String response = harness.post(uri, json);
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map)Utils.fromJSONString(response);
     assertNotNull(response, map.get("errorMessages"));
     assertNotNull(response, map.get("error"));
     assertTrue("Expected status != 0: " + response, 0L != (Long)((Map)map.get("responseHeader")).get("status"));
+    @SuppressWarnings({"rawtypes"})
     List errorDetails = (List)((Map)map.get("error")).get("details");
+    @SuppressWarnings({"rawtypes"})
     List errorMessages = (List)((Map)errorDetails.get(0)).get("errorMessages");
     assertTrue("Expected '" + expectedErrorMessage + "': " + response, 
         errorMessages.get(0).toString().contains(expectedErrorMessage));
@@ -264,6 +268,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     int maxTimeoutSeconds = 10;
     while (TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {
       String uri = "/config/overlay";
+      @SuppressWarnings({"rawtypes"})
       Map m = testServerBaseUrl == null ? getRespMap(uri, writeHarness) : TestSolrConfigHandlerConcurrent.getAsMap(testServerBaseUrl + uri, cloudSolrClient);
       if (null == Utils.getObjectByPath(m, true, asList("overlay", "requestHandler", "/x", "a"))) {
         success = true;
@@ -413,6 +418,7 @@ public class TestSolrConfigHandler extends RestTestBase {
         "'create-initparams' : { 'name' : 'hello', 'key':'val'}\n" +
         "}";
     runConfigCommand(writeHarness, "/config", payload);
+    @SuppressWarnings({"rawtypes"})
     Map map = testForResponseElement(writeHarness,
         testServerBaseUrl,
         "/config",
@@ -421,6 +427,7 @@ public class TestSolrConfigHandler extends RestTestBase {
         null,
         TIMEOUT_S);
 
+    @SuppressWarnings({"rawtypes"})
     List l = (List) Utils.getObjectByPath(map, false, asList("config", "initParams"));
     assertNotNull("no object /config/initParams : "+ map , l);
     assertEquals( 2, l.size());
@@ -467,6 +474,7 @@ public class TestSolrConfigHandler extends RestTestBase {
         TIMEOUT_S);
 
     map = getRespMap("/dump100?json.nl=arrmap&initArgs=true", writeHarness);
+    @SuppressWarnings({"rawtypes"})
     List initArgs = (List) map.get("initArgs");
     assertNotNull(initArgs);
     assertTrue(initArgs.size() >= 2);
@@ -536,13 +544,16 @@ public class TestSolrConfigHandler extends RestTestBase {
 
   public static class CacheTest extends DumpRequestHandler {
     @Override
+    @SuppressWarnings({"unchecked"})
     public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
       super.handleRequestBody(req, rsp);
       String[] caches = req.getParams().getParams("cacheNames");
       if(caches != null && caches.length>0){
+        @SuppressWarnings({"rawtypes"})
         HashMap m = new HashMap();
         rsp.add("caches", m);
         for (String c : caches) {
+          @SuppressWarnings({"rawtypes"})
           SolrCache cache = req.getSearcher().getCache(c);
           if(cache != null) m.put(c, cache.getClass().getName());
         }
@@ -550,6 +561,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     }
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static LinkedHashMapWriter testForResponseElement(RestTestHarness harness,
                                            String testServerBaseUrl,
                                            String uri,
@@ -830,6 +842,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     RESTfulServerProvider oldProvider = restTestHarness.getServerProvider();
     restTestHarness.setServerProvider(() -> jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);
 
+    @SuppressWarnings({"rawtypes"})
     Map rsp = TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
@@ -858,6 +871,7 @@ public class TestSolrConfigHandler extends RestTestBase {
   }
 
 
+  @SuppressWarnings({"rawtypes"})
   public static LinkedHashMapWriter getRespMap(String path, RestTestHarness restHarness) throws Exception {
     String response = restHarness.query(path);
     try {
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
index 41a10ca..328f069 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
@@ -290,11 +290,13 @@ public class TestSolrCloudSnapshots extends SolrCloudTestCase {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   private Collection<CollectionSnapshotMetaData> listCollectionSnapshots(SolrClient adminClient, String collectionName) throws Exception {
     CollectionAdminRequest.ListSnapshots listSnapshots = new CollectionAdminRequest.ListSnapshots(collectionName);
     CollectionAdminResponse resp = listSnapshots.process(adminClient);
 
     assertTrue( resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO) instanceof NamedList );
+    @SuppressWarnings({"rawtypes"})
     NamedList apiResult = (NamedList) resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO);
 
     Collection<CollectionSnapshotMetaData> result = new ArrayList<>();
@@ -308,8 +310,10 @@ public class TestSolrCloudSnapshots extends SolrCloudTestCase {
   private Collection<SnapshotMetaData> listCoreSnapshots(SolrClient adminClient, String coreName) throws Exception {
     ListSnapshots req = new ListSnapshots();
     req.setCoreName(coreName);
+    @SuppressWarnings({"rawtypes"})
     NamedList resp = adminClient.request(req);
     assertTrue( resp.get(SolrSnapshotManager.SNAPSHOTS_INFO) instanceof NamedList );
+    @SuppressWarnings({"rawtypes"})
     NamedList apiResult = (NamedList) resp.get(SolrSnapshotManager.SNAPSHOTS_INFO);
 
     List<SnapshotMetaData> result = new ArrayList<>(apiResult.size());
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
index b17e212..92b3c45 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
@@ -284,8 +284,10 @@ public class TestSolrCoreSnapshots extends SolrCloudTestCase {
   private Collection<SnapshotMetaData> listSnapshots(SolrClient adminClient, String coreName) throws Exception {
     ListSnapshots req = new ListSnapshots();
     req.setCoreName(coreName);
+    @SuppressWarnings({"rawtypes"})
     NamedList resp = adminClient.request(req);
     assertTrue( resp.get("snapshots") instanceof NamedList );
+    @SuppressWarnings({"rawtypes"})
     NamedList apiResult = (NamedList) resp.get("snapshots");
 
     List<SnapshotMetaData> result = new ArrayList<>(apiResult.size());
diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
index c53ab38..71bdd0a 100644
--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
@@ -67,6 +67,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
     System.clearProperty("enable.packages");
   }
   
+  @SuppressWarnings({"unchecked"})
   public void testPackageStoreManagement() throws Exception {
     MiniSolrCloudCluster cluster =
         configureCluster(4)
@@ -118,6 +119,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
           )
       );
 
+      @SuppressWarnings({"rawtypes"})
       Map expected = Utils.makeMap(
           ":files:/package/mypkg/v1.0/runtimelibs.jar:name", "runtimelibs.jar",
           ":files:/package/mypkg/v1.0[0]:sha512", "d01b51de67ae1680a84a813983b1de3b592fc32f1a22b662fc9057da5953abd1b72476388ba342cad21671cd0b805503c78ab9075ff2f3951fdf75fa16981420"
@@ -141,8 +143,10 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
 
       expected = Utils.makeMap(
           ":files:/package/mypkg/v1.0", (Predicate<Object>) o -> {
+            @SuppressWarnings({"rawtypes"})
             List l = (List) o;
             assertEquals(2, l.size());
+            @SuppressWarnings({"rawtypes"})
             Set expectedKeys = ImmutableSet.of("runtimelibs_v2.jar", "runtimelibs.jar");
             for (Object file : l) {
               if(! expectedKeys.contains(Utils.getObjectByPath(file, true, "name"))) return false;
@@ -166,6 +170,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
     }
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static void waitForAllNodesHaveFile(MiniSolrCloudCluster cluster, String path, Map expected , boolean verifyContent) throws Exception {
     for (JettySolrRunner jettySolrRunner : cluster.getJettySolrRunners()) {
       String baseUrl = jettySolrRunner.getBaseUrl().toString().replace("/solr", "/api");
@@ -187,6 +192,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
     }
   }
 
+  @SuppressWarnings({"rawtypes"})
   static class Fetcher implements Callable {
     String url;
     JettySolrRunner jetty;
@@ -208,13 +214,17 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
 
   }
 
-  public static NavigableObject assertResponseValues(int repeats, SolrClient client, SolrRequest req, Map vals) throws Exception {
+  public static NavigableObject assertResponseValues(int repeats, SolrClient client,
+                                                     @SuppressWarnings({"rawtypes"})SolrRequest req,
+                                                     @SuppressWarnings({"rawtypes"})Map vals) throws Exception {
     Callable<NavigableObject> callable = () -> req.process(client);
 
     return assertResponseValues(repeats, callable,vals);
   }
 
-  public static NavigableObject assertResponseValues(int repeats,  Callable<NavigableObject> callable,Map vals) throws Exception {
+  @SuppressWarnings({"unchecked"})
+  public static NavigableObject assertResponseValues(int repeats,  Callable<NavigableObject> callable,
+                                                     @SuppressWarnings({"rawtypes"})Map vals) throws Exception {
     NavigableObject rsp = null;
 
     for (int i = 0; i < repeats; i++) {
@@ -228,11 +238,13 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
         continue;
       }
       for (Object e : vals.entrySet()) {
+        @SuppressWarnings({"rawtypes"})
         Map.Entry entry = (Map.Entry) e;
         String k = (String) entry.getKey();
         List<String> key = StrUtils.split(k, '/');
 
         Object val = entry.getValue();
+        @SuppressWarnings({"rawtypes"})
         Predicate p = val instanceof Predicate ? (Predicate) val : o -> {
           String v = o == null ? null : String.valueOf(o);
           return Objects.equals(val, o);
diff --git a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
index 14036ed..0012c11 100644
--- a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
+++ b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
@@ -28,7 +28,7 @@ import org.apache.commons.lang3.ArrayUtils;
  */
 public abstract class AnalysisRequestHandlerTestBase extends SolrTestCaseJ4 {
 
-  protected void assertToken(NamedList token, TokenInfo info) {
+  protected void assertToken(@SuppressWarnings({"rawtypes"})NamedList token, TokenInfo info) {
     assertEquals(info.getText(), token.get("text"));
     if (info.getRawText() != null) {
       assertEquals(info.getRawText(), token.get("raw_text"));
diff --git a/solr/core/src/test/org/apache/solr/handler/BackupStatusChecker.java b/solr/core/src/test/org/apache/solr/handler/BackupStatusChecker.java
index 3a461b7..089ed59 100644
--- a/solr/core/src/test/org/apache/solr/handler/BackupStatusChecker.java
+++ b/solr/core/src/test/org/apache/solr/handler/BackupStatusChecker.java
@@ -194,8 +194,10 @@ public final class BackupStatusChecker {
     final String label = (null == backupName ? "latest backup" : backupName);
     final SimpleSolrResponse rsp = new GenericSolrRequest(GenericSolrRequest.METHOD.GET, path,
                                                           params("command", "details")).process(client);
+    @SuppressWarnings({"rawtypes"})
     final NamedList data = rsp.getResponse();
     log.info("Checking Status of {}: {}", label, data);
+    @SuppressWarnings({"unchecked"})
     final NamedList<String> backupData = (NamedList<String>) data.findRecursive("details","backup");
     if (null == backupData) {
       // no backup has finished yet
@@ -266,8 +268,10 @@ public final class BackupStatusChecker {
     assertNotNull("backumpName must not be null", backupName);
     final SimpleSolrResponse rsp = new GenericSolrRequest(GenericSolrRequest.METHOD.GET, path,
                                                           params("command", "details")).process(client);
+    @SuppressWarnings({"rawtypes"})
     final NamedList data = rsp.getResponse();
     log.info("Checking Deletion Status of {}: {}", backupName, data);
+    @SuppressWarnings({"unchecked"})
     final NamedList<String> backupData = (NamedList<String>) data.findRecursive("details","backup");
     if (null == backupData
         || null == backupData.get("status")
diff --git a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
index 5396165..f191054 100644
--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
@@ -42,6 +42,7 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"rawtypes"})
   public void testRequestParams() throws Exception {
     SolrInputDocument doc = new SolrInputDocument();
     doc.addField("id", "1");
diff --git a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
index 34fb186..6d98bb4 100644
--- a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
@@ -55,6 +55,7 @@ public class DocumentAnalysisRequestHandlerTest extends AnalysisRequestHandlerTe
 
   @Override
   @Before
+  @SuppressWarnings({"rawtypes"})
   public void setUp() throws Exception {
     super.setUp();
     handler = new DocumentAnalysisRequestHandler();
@@ -204,6 +205,7 @@ public class DocumentAnalysisRequestHandlerTest extends AnalysisRequestHandlerTe
    * org.apache.solr.schema.IndexSchema)}
    */
   @Test
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testHandleAnalysisRequest() throws Exception {
 
     SolrInputDocument document = new SolrInputDocument();
diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
index e3c9d07..4d905e2 100644
--- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
@@ -76,9 +76,13 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     request.addFieldType("pint");
     request.setFieldValue("5");
     
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> nl = handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
+    @SuppressWarnings({"rawtypes"})
     NamedList pintNL = (NamedList)nl.get("field_types").get("pint");
+    @SuppressWarnings({"rawtypes"})
     NamedList indexNL = (NamedList)pintNL.get("index");
+    @SuppressWarnings({"rawtypes"})
     ArrayList analyzerNL = (ArrayList)indexNL.get("org.apache.solr.schema.FieldType$DefaultAnalyzer$1");
     String text = (String)((NamedList)analyzerNL.get(0)).get("text"); 
     assertEquals("5", text);
@@ -169,6 +173,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
    * org.apache.solr.schema.IndexSchema)}
    */
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testHandleAnalysisRequest() throws Exception {
 
     FieldAnalysisRequest request = new FieldAnalysisRequest();
@@ -180,17 +185,22 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     request.setQuery("fox brown");
     request.setShowMatch(true);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> result = handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
     assertTrue("result is null and it shouldn't be", result != null);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> fieldTypes = result.get("field_types");
     assertNotNull("field_types should never be null", fieldTypes);
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> textType = fieldTypes.get("text");
     assertNotNull("expecting result for field type 'text'", textType);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<List<NamedList>> indexPart = textType.get("index");
     assertNotNull("expecting an index token analysis for field type 'text'", indexPart);
 
+    @SuppressWarnings({"rawtypes"})
     List<NamedList> tokenList = indexPart.get("org.apache.lucene.analysis.standard.StandardTokenizer");
     assertNotNull("Expcting StandardTokenizer analysis breakdown", tokenList);
     assertEquals(tokenList.size(), 10);
@@ -240,6 +250,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     assertToken(tokenList.get(6), new TokenInfo("brown", null, "<ALPHANUM>", 39, 44, 9, new int[]{9,9,9,9}, null, true));
     assertToken(tokenList.get(7), new TokenInfo("dog", null, "<ALPHANUM>", 45, 49, 10, new int[]{10,10,10,10}, null, false));
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<List<NamedList>> queryPart = textType.get("query");
     assertNotNull("expecting a query token analysis for field type 'text'", queryPart);
 
@@ -264,6 +275,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     assertToken(tokenList.get(0), new TokenInfo("fox", null, "<ALPHANUM>", 0, 3, 1, new int[]{1,1,1,1}, null, false));
     assertToken(tokenList.get(1), new TokenInfo("brown", null, "<ALPHANUM>", 4, 9, 2, new int[]{2,2,2,2}, null, false));
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> nameTextType = fieldTypes.get("nametext");
     assertNotNull("expecting result for field type 'nametext'", nameTextType);
 
@@ -290,9 +302,11 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     assertToken(tokenList.get(0), new TokenInfo("fox", null, "word", 0, 3, 1, new int[]{1}, null, false));
     assertToken(tokenList.get(1), new TokenInfo("brown", null, "word", 4, 9, 2, new int[]{2}, null, false));
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> fieldNames = result.get("field_names");
     assertNotNull("field_nameds should never be null", fieldNames);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> whitetok = fieldNames.get("whitetok");
     assertNotNull("expecting result for field 'whitetok'", whitetok);
 
@@ -322,6 +336,7 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     assertToken(tokenList.get(0), new TokenInfo("fox", null, "word", 0, 3, 1, new int[]{1}, null, false));
     assertToken(tokenList.get(1), new TokenInfo("brown", null, "word", 4, 9, 2, new int[]{2}, null, false));
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> keywordtok = fieldNames.get("keywordtok");
     assertNotNull("expecting result for field 'keywordtok'", keywordtok);
 
@@ -351,20 +366,25 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     request.setFieldValue("<html><body>whátëvêr</body></html>");
     request.setShowMatch(false);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> result = handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
     assertTrue("result is null and it shouldn't be", result != null);
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<NamedList> fieldTypes = result.get("field_types");
     assertNotNull("field_types should never be null", fieldTypes);
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<NamedList> textType = fieldTypes.get("charfilthtmlmap");
     assertNotNull("expecting result for field type 'charfilthtmlmap'", textType);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList indexPart = textType.get("index");
     assertNotNull("expecting an index token analysis for field type 'charfilthtmlmap'", indexPart);
 
     assertEquals("\n\nwhátëvêr\n\n", indexPart.get("org.apache.lucene.analysis.charfilter.HTMLStripCharFilter"));
     assertEquals("\n\nwhatever\n\n", indexPart.get("org.apache.lucene.analysis.charfilter.MappingCharFilter"));
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List<NamedList> tokenList = (List<NamedList>)indexPart.get(MockTokenizer.class.getName());
     assertNotNull("Expecting MockTokenizer analysis breakdown", tokenList);
     assertEquals(tokenList.size(), 1);
@@ -379,17 +399,22 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     request.setFieldValue("hi, 3456-12 a Test");
     request.setShowMatch(false);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> result = handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
     assertTrue("result is null and it shouldn't be", result != null);
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<NamedList> fieldTypes = result.get("field_types");
     assertNotNull("field_types should never be null", fieldTypes);
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<NamedList> textType = fieldTypes.get("skutype1");
     assertNotNull("expecting result for field type 'skutype1'", textType);
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<List<NamedList>> indexPart = textType.get("index");
     assertNotNull("expecting an index token analysis for field type 'skutype1'", indexPart);
 
+    @SuppressWarnings({"rawtypes"})
     List<NamedList> tokenList = indexPart.get(MockTokenizer.class.getName());
     assertNotNull("Expcting MockTokenizer analysis breakdown", tokenList);
     assertEquals(4, tokenList.size());
@@ -423,14 +448,17 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     request.addFieldType("location_rpt");
     request.setFieldValue("MULTIPOINT ((10 40), (40 30), (20 20), (30 10))");
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> result = handler.handleAnalysisRequest(request, h.getCore().getLatestSchema());
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<List<NamedList>> tokens = (NamedList<List<NamedList>>)
         ((NamedList)result.get("field_types").get("location_rpt")).get("index");
+    @SuppressWarnings({"rawtypes"})
     List<NamedList> tokenList = tokens.get("org.apache.lucene.spatial.prefix.PrefixTreeStrategy$ShapeTokenStream");
 
 
     List<String> vals = new ArrayList<>(tokenList.size());
-    for(NamedList v : tokenList) {
+    for(@SuppressWarnings({"rawtypes"})NamedList v : tokenList) {
       vals.add( (String)v.get("text") );
     }
     Collections.sort(vals);
@@ -462,8 +490,10 @@ public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestB
     );
     fieldType.setIndexAnalyzer(analyzer);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList<NamedList> result = handler.analyzeValues(request, fieldType, "fieldNameUnused");
     // just test that we see "900" in the flags attribute here
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List<NamedList> tokenInfoList = (List<NamedList>) result.findRecursive("index", CustomTokenFilter.class.getName());
     // '1' from CustomTokenFilter plus 900 from CustomFlagsAttributeImpl.
     assertEquals(901, tokenInfoList.get(0).get("org.apache.lucene.analysis.tokenattributes.FlagsAttribute#flags"));
diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
index 6c3a23a..cc91776 100644
--- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
@@ -294,6 +294,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
 
     String content = (String) p.addCommands.get(0).solrDoc.getFieldValue("_src_");
     assertNotNull(content);
+    @SuppressWarnings({"rawtypes"})
     Map obj = (Map) Utils.fromJSONString(content);
     assertEquals(Boolean.TRUE, obj.get("bool"));
     assertEquals("v0", obj.get("f0"));
@@ -418,6 +419,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
       assertOnlyValue("i am the parent", parent, "name");
       assertOnlyValue("parent", parent, "cat");
 
+      @SuppressWarnings({"unchecked"})
       List<SolrInputDocument> childDocs1 = (List) ((parent.getField("children")).getValue());
 
       assertEquals(2, childDocs1.size());
@@ -434,6 +436,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
         assertOnlyValue("test-new-label", child2, "test_s");
         assertOnlyValue("child", child2, "cat");
 
+        @SuppressWarnings({"unchecked"})
         List<SolrInputDocument> childDocs2 = (List) ((child2.getField("grandchildren")).getValue());
 
         assertEquals(1, childDocs2.size());
@@ -944,6 +947,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
     SolrInputDocument one = add.solrDoc;
     assertEquals("1", one.getFieldValue("id"));
 
+    @SuppressWarnings({"unchecked"})
     List<SolrInputDocument> children = (List) one.getFieldValues("children");
     SolrInputDocument two = children.get(0);
     assertEquals("2", two.getFieldValue("id"));
diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
index 3b3edb3..dd8aead 100644
--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
@@ -50,6 +50,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
   }
 
   @Before
+  @SuppressWarnings({"unchecked"})
   public void before() throws IOException {
     // by default, use relative file in dataDir
     healthcheckFile = new File(initAndGetDataDir(), fileName);
@@ -63,6 +64,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
     if (healthcheckFile.exists()) FileUtils.forceDelete(healthcheckFile);
 
     handler = new PingRequestHandler();
+    @SuppressWarnings({"rawtypes"})
     NamedList initParams = new NamedList();
     initParams.add(PingRequestHandler.HEALTHCHECK_FILE_PARAM,
                    fileNameParam);
@@ -70,6 +72,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
     handler.inform(h.getCore());
   }
   
+  @SuppressWarnings({"rawtypes"})
   public void testPingWithNoHealthCheck() throws Exception {
     
     // for this test, we don't want any healthcheck file configured at all
diff --git a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
index c1cfecb..c6c1dfe 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
@@ -177,6 +177,7 @@ public class TestBlobHandler extends AbstractFullDistribZkTestBase {
       entity = cloudClient.getLbClient().getHttpClient().execute(httpPost).getEntity();
       try {
         response = EntityUtils.toString(entity, StandardCharsets.UTF_8);
+        @SuppressWarnings({"rawtypes"})
         Map m = (Map) fromJSONString(response);
         assertFalse("Error in posting blob " + m.toString(), m.containsKey("error"));
       } catch (JSONParser.ParseException e) {
diff --git a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
index 499dccd..49ec80b 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
@@ -114,6 +114,7 @@ public class TestConfigReload extends AbstractFullDistribZkTestBase {
     assertEquals(StrUtils.formatString("tried these servers {0} succeeded only in {1} ", urls, succeeded) , urls.size(), succeeded.size());
   }
 
+  @SuppressWarnings({"rawtypes"})
   private LinkedHashMapWriter getAsMap(String uri) throws Exception {
     HttpGet get = new HttpGet(uri) ;
     HttpEntity entity = null;
diff --git a/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
index 57f03f7..ee87253 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
@@ -319,7 +319,7 @@ public class TestCoreBackup extends SolrTestCaseJ4 {
         
         // sanity check this is the initial commit..
         final IndexCommit commit = s.getIndexReader().getIndexCommit();
-        assertEquals(EXPECTED_GEN_OF_EMPTY_INDEX, (long) commit.getGeneration());
+        assertEquals(EXPECTED_GEN_OF_EMPTY_INDEX, commit.getGeneration());
         return commit;
       });
 
@@ -338,7 +338,7 @@ public class TestCoreBackup extends SolrTestCaseJ4 {
         final IndexCommit commit = s.getIndexReader().getIndexCommit();
         // WTF: how/why does this reader still have the same commit generation as before ? ? ? ? ?
         assertEquals("WTF: This Reader (claims) the same generation as our previous pre-softCommif (empty) reader",
-                     EXPECTED_GEN_OF_EMPTY_INDEX, (long) commit.getGeneration());
+                     EXPECTED_GEN_OF_EMPTY_INDEX, commit.getGeneration());
         return commit;
       });
 
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 8fd2abb..e5c5c71 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -205,6 +205,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     return s.add(doc).getStatus();
   }
 
+  @SuppressWarnings({"rawtypes"})
   NamedList query(String query, SolrClient s) throws SolrServerException, IOException {
     ModifiableSolrParams params = new ModifiableSolrParams();
 
@@ -216,6 +217,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
   }
 
   /** will sleep up to 30 seconds, looking for expectedDocCount */
+  @SuppressWarnings({"rawtypes"})
   private NamedList rQuery(int expectedDocCount, String query, SolrClient client) throws Exception {
     int timeSlept = 0;
     NamedList res = query(query, client);
@@ -232,7 +234,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     return res;
   }
   
-  private long numFound(NamedList res) {
+  private long numFound(@SuppressWarnings({"rawtypes"})NamedList res) {
     return ((SolrDocumentList) res.get("response")).getNumFound();
   }
 
@@ -329,6 +331,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
       if (i > 0) {
         rQuery(i, "*:*", slaveClient);
+        @SuppressWarnings({"rawtypes"})
         List replicatedAtCount = (List) ((NamedList) details.get("slave")).get("indexReplicatedAtList");
         int tries = 0;
         while ((replicatedAtCount == null || replicatedAtCount.size() < i) && tries++ < 5) {
@@ -514,11 +517,13 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(nDocs, numFound(masterQueryRsp));
 
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(nDocs, numFound(slaveQueryRsp));
@@ -591,11 +596,13 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(nDocs, numFound(masterQueryRsp));
 
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(nDocs, numFound(slaveQueryRsp));
@@ -653,11 +660,13 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
       masterClient.commit();
 
+      @SuppressWarnings({"rawtypes"})
       NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
       SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
       assertEquals(nDocs, numFound(masterQueryRsp));
 
       //get docs from slave and check if number is equal to master
+      @SuppressWarnings({"rawtypes"})
       NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
       SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
       assertEquals(nDocs, numFound(slaveQueryRsp));
@@ -748,7 +757,9 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     QueryResponse response = slaveClient.query(params);
 
     // details/slave/timesIndexReplicated
+    @SuppressWarnings({"unchecked"})
     NamedList<Object> details = (NamedList<Object>) response.getResponse().get("details");
+    @SuppressWarnings({"unchecked"})
     NamedList<Object> slave = (NamedList<Object>) details.get("slave");
     return slave;
   }
@@ -778,6 +789,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(nDocs, masterQueryResult.getNumFound());
@@ -790,6 +802,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     stream.close();
     
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(nDocs, slaveQueryResult.getNumFound());
@@ -936,6 +949,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
         totalDocs += docs;
         masterClient.commit();
         
+        @SuppressWarnings({"rawtypes"})
         NamedList masterQueryRsp = rQuery(totalDocs, "*:*", masterClient);
         SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp
             .get("response");
@@ -949,6 +963,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
         }
 
         // get docs from slave and check if number is equal to master
+        @SuppressWarnings({"rawtypes"})
         NamedList slaveQueryRsp = rQuery(totalDocs, "*:*", slaveClient);
         SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp
             .get("response");
@@ -1116,6 +1131,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
   private void assertVersions(SolrClient client1, SolrClient client2) throws Exception {
     NamedList<Object> details = getDetails(client1);
+    @SuppressWarnings({"unchecked"})
     ArrayList<NamedList<Object>> commits = (ArrayList<NamedList<Object>>) details.get("commits");
     Long maxVersionClient1 = getVersion(client1);
     Long maxVersionClient2 = getVersion(client2);
@@ -1142,6 +1158,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     assertEquals(maxVersionClient2, version);
   }
 
+  @SuppressWarnings({"unchecked"})
   private Long getVersion(SolrClient client) throws Exception {
     NamedList<Object> details;
     ArrayList<NamedList<Object>> commits;
@@ -1201,6 +1218,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
     
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(nDocs, masterQueryResult.getNumFound());
@@ -1215,6 +1233,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     slaveClient = createNewSolrClient(slaveJetty.getLocalPort());
 
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(nDocs, slaveQueryResult.getNumFound());
@@ -1261,6 +1280,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
       
       // masterClient = createNewSolrClient(masterJetty.getLocalPort());
       
+      @SuppressWarnings({"rawtypes"})
       NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
       SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp
           .get("response");
@@ -1275,6 +1295,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
       slaveClient = createNewSolrClient(slaveJetty.getLocalPort());
       
       // get docs from slave and check if number is equal to master
+      @SuppressWarnings({"rawtypes"})
       NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
       SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp
           .get("response");
@@ -1314,6 +1335,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(docs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(docs, masterQueryResult.getNumFound());
@@ -1327,6 +1349,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     slaveClient = createNewSolrClient(slaveJetty.getLocalPort());
     
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(docs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(docs, slaveQueryResult.getNumFound());
@@ -1346,6 +1369,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
     
+    @SuppressWarnings({"rawtypes"})
     NamedList resp =  rQuery(docs + 2, "*:*", masterClient);
     masterQueryResult = (SolrDocumentList) resp.get("response");
     assertEquals(docs + 2, masterQueryResult.getNumFound());
@@ -1368,11 +1392,13 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
 
     masterClient.commit();
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
     SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
     assertEquals(nDocs, masterQueryResult.getNumFound());
 
     //get docs from slave and check if number is equal to master
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
 
@@ -1429,10 +1455,12 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     // wait for slave to reload core by watching updated startTime
     watchCoreStartAt(slaveClient, 30*1000, slaveStartTime);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList masterQueryRsp2 = rQuery(1, "id:2000", masterClient);
     SolrDocumentList masterQueryResult2 = (SolrDocumentList) masterQueryRsp2.get("response");
     assertEquals(1, masterQueryResult2.getNumFound());
 
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp2 = rQuery(1, "id:2000", slaveClient);
     SolrDocumentList slaveQueryResult2 = (SolrDocumentList) slaveQueryRsp2.get("response");
     assertEquals(1, slaveQueryResult2.getNumFound());
@@ -1502,6 +1530,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     new Thread(new AddExtraDocs(masterClient, totalDocs)).start();
 
     //Wait and make sure that it actually replicated correctly.
+    @SuppressWarnings({"rawtypes"})
     NamedList slaveQueryRsp = rQuery(totalDocs, "*:*", slaveClient);
     SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(totalDocs, slaveQueryResult.getNumFound());
@@ -1710,6 +1739,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
         QueryRequest req = new QueryRequest(p);
         req.setPath("/admin/cores");
         try {
+          @SuppressWarnings({"rawtypes"})
           NamedList data = adminClient.request(req);
           for (String k : new String[]{"status", "collection1"}) {
             Object o = data.get(k);
@@ -1736,7 +1766,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
     }
   }
 
-  private void assertReplicationResponseSucceeded(NamedList response) {
+  private void assertReplicationResponseSucceeded(@SuppressWarnings({"rawtypes"})NamedList response) {
     assertNotNull("null response from server", response);
     assertNotNull("Expected replication response to have 'status' field", response.get("status"));
     assertEquals("OK", response.get("status"));
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
index 08fc7df..ba4e452 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
@@ -212,6 +212,7 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {
                  "true", response._getStr("details/slave/clearedLocalIndexFirst", null));
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private long indexDocs(SolrClient client, int totalDocs, int start) throws Exception {
     for (int i = 0; i < totalDocs; i++)
       TestReplicationHandler.index(client, "id", i + start, "name", TestUtil.randomSimpleString(random(), 1000, 5000));
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
index da990da..5c52bf4 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
@@ -78,6 +78,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
     }
   }
 
+  @SuppressWarnings({"rawtypes"})
   private void testReqParams() throws Exception {
     CloudSolrClient cloudClient = cluster.getSolrClient();
     DocCollection coll = cloudClient.getZkStateReader().getClusterState().getCollection(COLL_NAME);
@@ -282,6 +283,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
     compareValues(result, new Predicate() {
       @Override
       public boolean test(Object o) {
+        @SuppressWarnings({"rawtypes"})
         List l = (List) o;
         return l.contains("first") && l.contains("second");
       }
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index b20bec5..96555ca 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -1872,13 +1872,14 @@ public class TestSQLHandler extends SolrCloudTestCase {
     return true;
   }
 
-  protected boolean assertMaps(List<Map> maps, int... ids) throws Exception {
+  protected boolean assertMaps(@SuppressWarnings({"rawtypes"})List<Map> maps, int... ids) throws Exception {
     if(maps.size() != ids.length) {
       throw new Exception("Expected id count != actual map count:"+ids.length+":"+maps.size());
     }
 
     int i=0;
     for(int val : ids) {
+      @SuppressWarnings({"rawtypes"})
       Map t = maps.get(i);
       String tip = (String)t.get("id");
       if(!tip.equals(Integer.toString(val))) {
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
index 5b6c4f1..662354a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
@@ -109,6 +109,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
     TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
 
+    @SuppressWarnings({"rawtypes"})
     Map result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
         "/config/params",
@@ -274,7 +275,8 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
   }
 
-  public static void compareValues(Map result, Object expected, List<String> jsonPath) {
+  @SuppressWarnings({"unchecked"})
+  public static void compareValues(@SuppressWarnings({"rawtypes"})Map result, Object expected, List<String> jsonPath) {
     Object val = Utils.getObjectByPath(result, false, jsonPath);
     assertTrue(StrUtils.formatString("Could not get expected value  {0} for path {1} full output {2}", expected, jsonPath, result.toString()),
         expected instanceof Predicate ?
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
index 24d0fff..1b43808 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
@@ -55,18 +55,23 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
 
   @Test
   public void test() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     Map editable_prop_map = (Map) Utils.fromJSONResource("EditableSolrConfigAttributes.json");
+    @SuppressWarnings({"rawtypes"})
     Map caches = (Map) editable_prop_map.get("query");
 
     setupRestTestHarnesses();
     List<Thread> threads = new ArrayList<>(caches.size());
+    @SuppressWarnings({"rawtypes"})
     final List<List> collectErrors = new ArrayList<>();
 
     for (Object o : caches.entrySet()) {
+      @SuppressWarnings({"rawtypes"})
       final Map.Entry e = (Map.Entry) o;
       if (e.getValue() instanceof Map) {
         List<String> errs = new ArrayList<>();
         collectErrors.add(errs);
+        @SuppressWarnings({"rawtypes"})
         Map value = (Map) e.getValue();
         Thread t = new Thread(() -> {
           try {
@@ -85,7 +90,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
 
     boolean success = true;
 
-    for (List e : collectErrors) {
+    for (@SuppressWarnings({"rawtypes"})List e : collectErrors) {
       if(!e.isEmpty()){
         success = false;
         log.error("{}", e);
@@ -99,7 +104,8 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
   }
 
 
-  private void invokeBulkCall(String  cacheName, List<String> errs, Map val) throws Exception {
+  private void invokeBulkCall(String  cacheName, List<String> errs,
+                              @SuppressWarnings({"rawtypes"})Map val) throws Exception {
 
     String payload = "{" +
         "'set-property' : {'query.CACHENAME.size':'CACHEVAL1'," +
@@ -128,6 +134,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
         publisher.close();
       }
       
+      @SuppressWarnings({"rawtypes"})
       Map map = (Map) Utils.fromJSONString(response);
       Object errors = map.get("errors");
       if(errors!= null){
@@ -177,6 +184,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
 
   }
 
+  @SuppressWarnings({"rawtypes"})
   public static LinkedHashMapWriter getAsMap(String uri, CloudSolrClient cloudClient) throws Exception {
     HttpGet get = new HttpGet(uri) ;
     HttpEntity entity = null;
diff --git a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java
index 6409e17..804453f 100644
--- a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java
@@ -41,7 +41,7 @@ public class ThrowErrorOnInitRequestHandler extends RequestHandlerBase
   }
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     String errorMessage = (String) args.get("error");
     if (errorMessage != null) {
       throw new Error(errorMessage);
diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
index f82c238..4620c94 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
@@ -105,6 +105,7 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {
     ModifiableSolrParams params = new ModifiableSolrParams();
     params.set("command","XXXX");
     params.set("method", "POST");
+    @SuppressWarnings({"rawtypes"})
     Map result = resAsMap(cluster.getSolrClient(),
         new V2Request.Builder("/c/"+COLL_NAME+"/_introspect")
             .withParams(params).build());
@@ -141,14 +142,17 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {
 
   @Test
   public void testSingleWarning() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList resp = cluster.getSolrClient().request(
         new V2Request.Builder("/c/"+COLL_NAME+"/_introspect").build());
+    @SuppressWarnings({"rawtypes"})
     List warnings = resp.getAll("WARNING");
     assertEquals(1, warnings.size());
   }
 
   @Test
   public void testSetPropertyValidationOfCluster() throws IOException, SolrServerException {
+    @SuppressWarnings({"rawtypes"})
     NamedList resp = cluster.getSolrClient().request(
       new V2Request.Builder("/cluster").withMethod(SolrRequest.METHOD.POST).withPayload("{set-property: {name: autoAddReplicas, val:false}}").build());
     assertTrue(resp.toString().contains("status=0"));
@@ -160,6 +164,7 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {
   @Test
   public void testCollectionsApi() throws Exception {
     CloudSolrClient client = cluster.getSolrClient();
+    @SuppressWarnings({"rawtypes"})
     Map result = resAsMap(client, new V2Request.Builder("/c/"+COLL_NAME+"/get/_introspect").build());
     assertEquals("/c/collection1/get", Utils.getObjectByPath(result, true, "/spec[0]/url/paths[0]"));
     result = resAsMap(client, new V2Request.Builder("/collections/"+COLL_NAME+"/get/_introspect").build());
@@ -177,6 +182,7 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {
         .build());
   }
 
+  @SuppressWarnings({"rawtypes"})
   private Map resAsMap(CloudSolrClient client, V2Request request) throws SolrServerException, IOException {
     NamedList<Object> rsp = client.request(request);
     return rsp.asMap(100);
diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
index ccf2a58..316bc84 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
@@ -39,7 +39,9 @@ public class V2StandaloneTest extends SolrTestCaseJ4{
     jetty.start();
 
     try (HttpSolrClient client = getHttpSolrClient(buildUrl(jetty.getLocalPort(),"/solr/"))) {
+      @SuppressWarnings({"rawtypes"})
       NamedList res = client.request(new V2Request.Builder("/").build());
+      @SuppressWarnings({"rawtypes"})
       NamedList header = (NamedList) res.get("responseHeader");
       assertEquals(0, header.get("status"));
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
index 750dc72..962bd93 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
@@ -130,6 +130,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
         "      {'replica':'<2', 'shard': '#EACH', 'node': '#ANY'}" +
         "    ]" +
         "}";
+    @SuppressWarnings({"rawtypes"})
     SolrRequest req = AutoScalingRequest.create(SolrRequest.METHOD.POST, setClusterPolicyCommand);
     solrClient.request(req);
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
index 0c12318..5fa5364 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
@@ -206,8 +206,10 @@ public class CoreAdminCreateDiscoverTest extends SolrTestCaseJ4 {
                 CoreAdminParams.CoreAdminAction.STATUS.toString(),
                 CoreAdminParams.CORE, "testInstanceDirAsPropertyParam"),
             resp);
+    @SuppressWarnings({"rawtypes"})
     NamedList status = (NamedList) resp.getValues().get("status");
     assertNotNull(status);
+    @SuppressWarnings({"rawtypes"})
     NamedList coreProps = (NamedList) status.get("testInstanceDirAsPropertyParam");
     assertNotNull(status);
     String instanceDir = (String) coreProps.get("instanceDir");
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
index c20e42d..7eae212 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
@@ -197,6 +197,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
       (Map<String,Exception>) resp.getValues().get("initFailures");
     assertNotNull("core failures is null", failures);
 
+    @SuppressWarnings({"rawtypes"})
     NamedList status = (NamedList)resp.getValues().get("status");
     assertNotNull("core status is null", status);
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java
index cb6a631..7a4dcb1 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java
@@ -59,6 +59,7 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {
 
   @Test
   public void testHealthCheckHandler() throws Exception {
+    @SuppressWarnings({"rawtypes"})
     SolrRequest req = new GenericSolrRequest(SolrRequest.METHOD.GET, HEALTH_CHECK_HANDLER_PATH, new ModifiableSolrParams());
 
     // positive check that our only existing "healthy" node works with cloud client
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
index 2ad9b87..b092be1 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
@@ -171,29 +171,39 @@ public class IndexSizeEstimatorTest extends SolrCloudTestCase {
     assertEquals(0, rsp.getStatus());
     assertEquals(0, sampledRsp.getStatus());
     for (int i : Arrays.asList(1, 2)) {
+      @SuppressWarnings({"unchecked"})
       NamedList<Object> segInfos = (NamedList<Object>) rsp.getResponse().findRecursive(collection, "shards", "shard" + i, "leader", "segInfos");
+      @SuppressWarnings({"unchecked"})
       NamedList<Object> rawSize = (NamedList<Object>)segInfos.get("rawSize");
       assertNotNull("rawSize missing", rawSize);
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> rawSizeMap = rawSize.asMap(10);
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> fieldsBySize = (Map<String, Object>)rawSizeMap.get(IndexSizeEstimator.FIELDS_BY_SIZE);
       assertNotNull("fieldsBySize missing", fieldsBySize);
       assertEquals(fieldsBySize.toString(), fields.size(), fieldsBySize.size());
       fields.forEach(field -> assertNotNull("missing field " + field, fieldsBySize.get(field)));
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> typesBySize = (Map<String, Object>)rawSizeMap.get(IndexSizeEstimator.TYPES_BY_SIZE);
       assertNotNull("typesBySize missing", typesBySize);
       assertTrue("expected at least 8 types: " + typesBySize.toString(), typesBySize.size() >= 8);
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> summary = (Map<String, Object>)rawSizeMap.get(IndexSizeEstimator.SUMMARY);
       assertNotNull("summary missing", summary);
       assertEquals(summary.toString(), fields.size(), summary.size());
       fields.forEach(field -> assertNotNull("missing field " + field, summary.get(field)));
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> details = (Map<String, Object>)rawSizeMap.get(IndexSizeEstimator.DETAILS);
       assertNotNull("details missing", summary);
       assertEquals(details.keySet().toString(), 6, details.size());
 
       // compare with sampled
+      @SuppressWarnings({"unchecked"})
       NamedList<Object> sampledRawSize = (NamedList<Object>) rsp.getResponse().findRecursive(collection, "shards", "shard" + i, "leader", "segInfos", "rawSize");
       assertNotNull("sampled rawSize missing", sampledRawSize);
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> sampledRawSizeMap = rawSize.asMap(10);
+      @SuppressWarnings({"unchecked"})
       Map<String, Object> sampledFieldsBySize = (Map<String, Object>)sampledRawSizeMap.get(IndexSizeEstimator.FIELDS_BY_SIZE);
       assertNotNull("sampled fieldsBySize missing", sampledFieldsBySize);
       fieldsBySize.forEach((k, v) -> {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
index 7616885..e6c712d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
@@ -65,6 +65,7 @@ public class MBeansHandlerTest extends SolrTestCaseJ4 {
     NamedList<NamedList<NamedList<Object>>> diff = SolrInfoMBeanHandler.fromXML(xml);
 
     // The stats bean for SolrInfoMBeanHandler
+    @SuppressWarnings({"rawtypes"})
     NamedList stats = (NamedList)diff.get("ADMIN").get("/admin/mbeans").get("stats");
 
     //System.out.println("stats:"+stats);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index ea3ebc1..f6e1eb1 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -75,9 +75,11 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
 
     SolrQueryResponse resp = new SolrQueryResponse();
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", MetricsHandler.COMPACT_PARAM, "false", CommonParams.WT, "json"), resp);
+    @SuppressWarnings({"rawtypes"})
     NamedList values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList) values.get("metrics");
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) values.get("solr.core.collection1");
     assertNotNull(nl);
     Object o = nl.get("SEARCHER.new.errors");
@@ -181,6 +183,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     assertNotNull(values.get("solr.core.collection1"));
     values = (NamedList) values.get("solr.core.collection1");
     assertEquals(1, values.size());
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) values.get("CACHE.core.fieldCache");
     assertNotNull(m);
     assertNotNull(m.get("entries_count"));
@@ -196,6 +199,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", MetricsHandler.COMPACT_PARAM, "false", CommonParams.WT, "json", "group", "node", "type", "timer", "prefix", "CONTAINER.cores"), resp);
     values = resp.getValues();
     assertNotNull(values.get("metrics"));
+    @SuppressWarnings({"rawtypes"})
     SimpleOrderedMap map = (SimpleOrderedMap) values.get("metrics");
     assertEquals(0, map.size());
     handler.close();
@@ -207,9 +211,11 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
 
     SolrQueryResponse resp = new SolrQueryResponse();
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json", MetricsHandler.COMPACT_PARAM, "true"), resp);
+    @SuppressWarnings({"rawtypes"})
     NamedList values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList) values.get("metrics");
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) values.get("solr.core.collection1");
     assertNotNull(nl);
     Object o = nl.get("SEARCHER.new.errors");
@@ -219,6 +225,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testPropertyFilter() throws Exception {
     assertQ(req("*:*"), "//result[@numFound='0']");
 
@@ -227,14 +234,17 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     SolrQueryResponse resp = new SolrQueryResponse();
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json",
         MetricsHandler.COMPACT_PARAM, "true", "group", "core", "prefix", "CACHE.searcher"), resp);
+    @SuppressWarnings({"rawtypes"})
     NamedList values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList) values.get("metrics");
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = (NamedList) values.get("solr.core.collection1");
     assertNotNull(nl);
     assertTrue(nl.size() > 0);
     nl.forEach((k, v) -> {
       assertTrue(v instanceof Map);
+      @SuppressWarnings({"rawtypes"})
       Map map = (Map) v;
       assertTrue(map.size() > 2);
     });
@@ -250,6 +260,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     assertTrue(nl.size() > 0);
     nl.forEach((k, v) -> {
       assertTrue(v instanceof Map);
+      @SuppressWarnings({"rawtypes"})
       Map map = (Map) v;
       assertEquals(2, map.size());
       assertNotNull(map.get("inserts"));
@@ -266,6 +277,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     SolrQueryResponse resp = new SolrQueryResponse();
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json",
         MetricsHandler.KEY_PARAM, key1), resp);
+    @SuppressWarnings({"rawtypes"})
     NamedList values = resp.getValues();
     Object val = values.findRecursive("metrics", key1);
     assertNotNull(val);
@@ -319,6 +331,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
     handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json",
         MetricsHandler.KEY_PARAM, "foo", MetricsHandler.KEY_PARAM, "foo:bar:baz:xyz"), resp);
     values = resp.getValues();
+    @SuppressWarnings({"rawtypes"})
     NamedList metrics = (NamedList) values.get("metrics");
     assertEquals(0, metrics.size());
     assertNotNull(values.findRecursive("errors", "foo"));
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
index 34ab7eb..bbbde8a 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
@@ -60,6 +60,7 @@ public class PropertiesRequestHandlerTest extends SolrTestCaseJ4 {
     }
   }
 
+  @SuppressWarnings({"unchecked"})
   private NamedList<NamedList<NamedList<Object>>> readProperties() throws Exception {
     String xml = h.query(req(
         CommonParams.QT, "/admin/properties",
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
index 2b92462..dd5b52f 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
@@ -37,6 +37,7 @@ import static org.apache.solr.handler.admin.SecurityConfHandler.SecurityConfig;
 
 public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testEdit() throws Exception {
     MockSecurityHandler handler = new MockSecurityHandler();
     String command = "{\n" +
@@ -174,6 +175,7 @@ public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
     req.setContentStreams(Collections.singletonList(o));
     rsp = new SolrQueryResponse();
     handler.handleRequestBody(req, rsp);
+    @SuppressWarnings({"rawtypes"})
     List l = (List) ((Map) ((List)rsp.getValues().get("errorMessages")).get(0)).get("errorMessages");
     assertEquals(1, l.size());
     handler.close();
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java b/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
index fc1b496..3ec99a5 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
@@ -116,10 +116,12 @@ public class StatsReloadRaceTest extends SolrTestCaseJ4 {
       h.getCoreContainer().getRequestHandler("/admin/metrics").handleRequest(
           req("prefix", "SEARCHER", "registry", registry, "compact", "true"), rsp);
 
+      @SuppressWarnings({"rawtypes"})
       NamedList values = rsp.getValues();
       // this is not guaranteed to exist right away after core reload - there's a
       // small window between core load and before searcher metrics are registered
       // so we may have to check a few times, and then fail softly if reload is not complete yet
+      @SuppressWarnings({"rawtypes"})
       NamedList metrics = (NamedList)values.get("metrics");
       if (metrics == null) {
         if (softFail) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
index 32d1f58..3c66c7b 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
@@ -353,14 +353,18 @@ public class TestApiFramework extends SolrTestCaseJ4 {
   }
 
 
-  public static void assertConditions(Map root, Map conditions) {
+  public static void assertConditions(@SuppressWarnings({"rawtypes"})Map root,
+                                      @SuppressWarnings({"rawtypes"})Map conditions) {
     for (Object o : conditions.entrySet()) {
+      @SuppressWarnings({"rawtypes"})
       Map.Entry e = (Map.Entry) o;
       String path = (String) e.getKey();
       List<String> parts = StrUtils.splitSmart(path, path.charAt(0) == '/' ? '/' : ' ', true);
       Object val = Utils.getObjectByPath(root, false, parts);
       if (e.getValue() instanceof ValidatingJsonMap.PredicateWithErrMsg) {
+        @SuppressWarnings({"rawtypes"})
         ValidatingJsonMap.PredicateWithErrMsg value = (ValidatingJsonMap.PredicateWithErrMsg) e.getValue();
+        @SuppressWarnings({"unchecked"})
         String err = value.test(val);
         if (err != null) {
           assertEquals(err + " for " + e.getKey() + " in :" + Utils.toJSONString(root), e.getValue(), val);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
index a646912..78bf879 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
@@ -201,6 +201,7 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
                             final String payload, final CoreContainer cc, String expectedOutputMapJson) throws Exception {
     Pair<SolrQueryRequest, SolrQueryResponse> ctx = makeCall(apiBag, path, method, payload, cc);
     ZkNodeProps output = (ZkNodeProps) ctx.second().getValues().get(ZkNodeProps.class.getName());
+    @SuppressWarnings({"rawtypes"})
     Map expected = (Map) fromJSONString(expectedOutputMapJson);
     assertMapEqual(expected, output);
     return output;
@@ -252,9 +253,10 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
     return new Pair<>(req, rsp);
   }
 
-  private static void assertMapEqual(Map expected, ZkNodeProps actual) {
+  private static void assertMapEqual(@SuppressWarnings({"rawtypes"})Map expected, ZkNodeProps actual) {
     assertEquals(errorMessage(expected, actual), expected.size(), actual.getProperties().size());
     for (Object o : expected.entrySet()) {
+      @SuppressWarnings({"rawtypes"})
       Map.Entry e = (Map.Entry) o;
       Object actualVal = actual.get((String) e.getKey());
       if (actualVal instanceof String[]) {
@@ -264,7 +266,7 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
     }
   }
 
-  private static String errorMessage(Map expected, ZkNodeProps actual) {
+  private static String errorMessage(@SuppressWarnings({"rawtypes"})Map expected, ZkNodeProps actual) {
     return "expected: " + Utils.toJSONString(expected) + "\nactual: " + Utils.toJSONString(actual);
 
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
index 8360aef..0452a1e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
@@ -36,6 +36,7 @@ import static org.apache.solr.handler.admin.TestCollectionAPIs.compareOutput;
 public class TestConfigsApi extends SolrTestCaseJ4 {
 
 
+  @SuppressWarnings({"unchecked"})
   public void testCommands() throws Exception {
 
     try (ConfigSetsHandler handler = new ConfigSetsHandler(null) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
index 31d8b5c..15b5025 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
@@ -35,6 +35,7 @@ import static org.mockito.Mockito.*;
 
 public class TestCoreAdminApis extends SolrTestCaseJ4 {
 
+  @SuppressWarnings({"unchecked"})
   public void testCalls() throws Exception {
     Map<String, Object[]> calls = new HashMap<>();
     CoreContainer mockCC = getCoreContainerMock(calls, new HashMap<>());
@@ -71,6 +72,7 @@ public class TestCoreAdminApis extends SolrTestCaseJ4 {
     assertEquals(Boolean.TRUE ,params[1]);
   }
 
+  @SuppressWarnings({"unchecked"})
   public static CoreContainer getCoreContainerMock(final Map<String, Object[]> in,Map<String,Object> out ) {
     assumeWorkingMockito();
     
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
index 0ef3532..cf2dd74 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
@@ -83,12 +83,15 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
     NamedList<Object> nl = solr.httpUriRequest(mntrReq).future.get(10000, TimeUnit.MILLISECONDS);
 
     assertEquals("zkStatus", nl.getName(1));
+    @SuppressWarnings({"unchecked"})
     Map<String,Object> zkStatus = (Map<String,Object>) nl.get("zkStatus");
     assertEquals("green", zkStatus.get("status"));
     assertEquals("standalone", zkStatus.get("mode"));
     assertEquals(1L, zkStatus.get("ensembleSize"));
+    @SuppressWarnings({"unchecked"})
     List<Object> detailsList = (List<Object>)zkStatus.get("details");
     assertEquals(1, detailsList.size());
+    @SuppressWarnings({"unchecked"})
     Map<String,Object> details = (Map<String,Object>) detailsList.get(0);
     assertEquals(true, details.get("ok"));
     assertTrue(Integer.parseInt((String) details.get("zk_znode_count")) > 50);
diff --git a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
index 0dd9ee5..84dd45a 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
@@ -49,9 +49,12 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
     }
 
     @Override
-    protected Object convertHighlights(NamedList hl) {
+    @SuppressWarnings({"unchecked"})
+    protected Object convertHighlights(@SuppressWarnings({"rawtypes"})NamedList hl) {
+      @SuppressWarnings({"rawtypes"})
       final ArrayList<SimpleOrderedMap> hlMaps = new ArrayList<>();
       for (int i=0; i<hl.size(); ++i) {
+          @SuppressWarnings({"rawtypes"})
           SimpleOrderedMap hlMap = new SimpleOrderedMap<Object>();
           hlMap.add(id_key, hl.getName(i));
           hlMap.add(snippets_key, hl.getVal(i));
@@ -61,15 +64,18 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
     }
 
     @Override
+    @SuppressWarnings({"rawtypes"})
     protected Object[] newHighlightsArray(int size) {
       return new SimpleOrderedMap[size];
     }
 
     @Override
     protected void addHighlights(Object[] objArr, Object obj, Map<Object, ShardDoc> resultIds) {
+      @SuppressWarnings({"rawtypes"})
       SimpleOrderedMap[] mapArr = (SimpleOrderedMap[])objArr;
+      @SuppressWarnings({"unchecked", "rawtypes"})
       final ArrayList<SimpleOrderedMap> hlMaps = (ArrayList<SimpleOrderedMap>)obj;
-      for (SimpleOrderedMap hlMap : hlMaps) {
+      for (@SuppressWarnings({"rawtypes"})SimpleOrderedMap hlMap : hlMaps) {
         String id = (String)hlMap.get(id_key);
         ShardDoc sdoc = resultIds.get(id);
         int idx = sdoc.positionInResponse;
@@ -79,12 +85,14 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
 
     @Override
     protected Object getAllHighlights(Object[] objArr) {
+      @SuppressWarnings({"rawtypes"})
       final SimpleOrderedMap[] mapArr = (SimpleOrderedMap[])objArr;
       // remove nulls in case not all docs were able to be retrieved
+      @SuppressWarnings({"rawtypes"})
       ArrayList<SimpleOrderedMap> mapList = new ArrayList<>();
-      for (SimpleOrderedMap map : mapArr) {
+      for (@SuppressWarnings({"rawtypes"})SimpleOrderedMap map : mapArr) {
         if (map != null) {
-          mapList.add((SimpleOrderedMap)map);
+          mapList.add(map);
         }
       }
       return mapList;
@@ -199,6 +207,7 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
 
       // analyse the response
       final Map<String, Map<String, List<String>>> highlighting = queryResponse.getHighlighting();
+      @SuppressWarnings({"unchecked"})
       final ArrayList<SimpleOrderedMap<Object>> custom_highlighting =
           (ArrayList<SimpleOrderedMap<Object>>)queryResponse.getResponse().get("custom_highlighting");
 
@@ -289,13 +298,15 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
       }
       // snippets element
       {
+        @SuppressWarnings({"unchecked"})
         SimpleOrderedMap<Object> snippets = (SimpleOrderedMap<Object>)highlightingListElementMap.get(snippets_key);
         if (highlightedField == null) {
           assertEquals(0, snippets.size());
         } else {
+          @SuppressWarnings({"unchecked"})
           ArrayList<String> docHighlights = (ArrayList<String>)(snippets).get(highlightedField);
           assertEquals(1, docHighlights.size());
-          actualHighlightText = (String)docHighlights.get(0);
+          actualHighlightText = docHighlights.get(0);
           assertEquals(expectedHighlightText, actualHighlightText);
         }
       }
diff --git a/solr/core/src/test/org/apache/solr/handler/component/CustomTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomTermsComponentTest.java
index f648535..213e224 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/CustomTermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/CustomTermsComponentTest.java
@@ -36,7 +36,7 @@ public class CustomTermsComponentTest extends ShardsWhitelistTest {
 
   public static class CustomTermsComponent extends TermsComponent {
     
-    public void init( NamedList args )
+    public void init( @SuppressWarnings({"rawtypes"})NamedList args )
     {
       super.init(args);
     }
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.java
index e395825..cde6f04 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
@@ -208,7 +208,7 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {
         debug.add("true");
         all = true;
       }
-      q.set("debug", (String[])debug.toArray(new String[debug.size()]));
+      q.set("debug", debug.toArray(new String[debug.size()]));
 
       QueryResponse r = client.query(q);
       try {
@@ -404,8 +404,8 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {
     QueryResponse response = collection1.query(query);
     assertTrue((Boolean)response.getResponseHeader().get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY));
     @SuppressWarnings("unchecked")
-    NamedList<String> badShardTrack = (NamedList<String>) ((NamedList<NamedList<String>>)
-        ((NamedList<NamedList<NamedList<String>>>)response.getDebugMap().get("track")).get("EXECUTE_QUERY")).get(badShard);
+    NamedList<String> badShardTrack =
+            (((NamedList<NamedList<NamedList<String>>>)response.getDebugMap().get("track")).get("EXECUTE_QUERY")).get(badShard);
     assertEquals("Unexpected response size for shard", 1, badShardTrack.size());
     Entry<String, String> exception = badShardTrack.iterator().next();
     assertEquals("Expected key 'Exception' not found", "Exception", exception.getKey());
@@ -422,7 +422,7 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void assertSameKeys(NamedList object, NamedList object2) {
-    Iterator<Map.Entry<String,Object>> iteratorObj2 = ((NamedList)object2).iterator();
+    Iterator<Map.Entry<String,Object>> iteratorObj2 = (object2).iterator();
     for (Map.Entry<String,Object> entry:(NamedList<Object>)object) {
       assertTrue(iteratorObj2.hasNext());
       Map.Entry<String,Object> entry2 = iteratorObj2.next();
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
index 7938e23..8276f94 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
@@ -863,6 +863,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
   /**
    * spot checks some pivot values and the ranges hanging on them
    */
+  @SuppressWarnings({"unchecked"})
   private void doTestPivotRanges() throws Exception {
 
     // note: 'p0' is only a top level range, not included in per-pivot ranges
@@ -972,7 +973,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas
    * asserts that the actual RangeFacet matches the expected criteria
    */
   private void assertRange(String name, Object start, Object gap, Object end, int numCount,
-                           RangeFacet actual) {
+                           @SuppressWarnings({"rawtypes"})RangeFacet actual) {
     assertEquals("NAME: " + actual.toString(), name, actual.getName());
     assertEquals("START: " + actual.toString(), start, actual.getStart());
     assertEquals("GAP: " + actual.toString(), gap, actual.getGap());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
index 996ae2e..37d9989 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
@@ -67,6 +67,7 @@ public class DistributedFacetPivotLongTailTest extends BaseDistributedSearchTest
     doTestDeepPivotStats();
   }
   
+  @SuppressWarnings({"rawtypes"})
   private void sanityCheckIndividualShards() throws Exception {
     assertEquals("This test assumes exactly 3 shards/clients", 3, clients.size());
     
@@ -81,6 +82,7 @@ public class DistributedFacetPivotLongTailTest extends BaseDistributedSearchTest
     PivotField pivot = null;
     List<PivotField> pivots = null;
     
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List<PivotField>[] shardPivots = new List[clients.size()];
     for (int i = 0; i < clients.size(); i++) {
       shardPivots[i] = clients.get(i).query( req ).getFacetPivot().get("foo_s,bar_s");
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
index 71e34e3..087f111 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
@@ -1523,6 +1523,7 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
     assertEquals(msg + " stats max", val, stats.getMax());
   }
 
+  @SuppressWarnings({"rawtypes"})
   private List<RangeFacet> createExpectedRange(String key, int start, int end,
                                                int gap, int... values) {
     List<RangeFacet> expectedRanges = new ArrayList<>();
@@ -1541,7 +1542,8 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
   public static class ComparablePivotField extends PivotField {
 
     public ComparablePivotField(String f, Object v, int count,
-                                List<PivotField> pivot,  Map<String,Integer> queryCounts, List<RangeFacet> ranges) {
+                                List<PivotField> pivot,  Map<String,Integer> queryCounts,
+                                @SuppressWarnings({"rawtypes"})List<RangeFacet> ranges) {
       super(f, v, count, pivot, null, queryCounts, ranges);
     }
 
@@ -1570,9 +1572,9 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
         if (other.getFacetRanges() != null) return false;
       } else {
         if (getFacetRanges().size() != other.getFacetRanges().size()) return false;
-        for (RangeFacet entry : getFacetRanges()) {
+        for (@SuppressWarnings({"rawtypes"})RangeFacet entry : getFacetRanges()) {
           boolean found = false;
-          for (RangeFacet otherRange : other.getFacetRanges()) {
+          for (@SuppressWarnings({"rawtypes"})RangeFacet otherRange : other.getFacetRanges()) {
             if (otherRange.getName().equals(entry.getName())) {
               found = true;
 
@@ -1580,7 +1582,9 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
               if (!entry.getStart().equals(otherRange.getStart()))  return false;
               if (!entry.getEnd().equals(otherRange.getEnd()))  return false;
 
+              @SuppressWarnings({"unchecked"})
               List<RangeFacet.Count> myCounts = entry.getCounts();
+              @SuppressWarnings({"unchecked"})
               List<RangeFacet.Count> otherRangeCounts = otherRange.getCounts();
               if ( (myCounts == null && otherRangeCounts != null)
                   || (myCounts != null && otherRangeCounts == null)
@@ -1659,9 +1663,9 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
         }
       }
       if (compare == 0) {
-        for (RangeFacet entry : o1.getFacetRanges()) {
+        for (@SuppressWarnings({"rawtypes"})RangeFacet entry : o1.getFacetRanges()) {
           boolean found = false;
-          for (RangeFacet otherRangeFacet : o2.getFacetRanges()) {
+          for (@SuppressWarnings({"rawtypes"})RangeFacet otherRangeFacet : o2.getFacetRanges()) {
             if (otherRangeFacet.getName().equals(entry.getName()))  {
               found = true;
             }
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
index d8cdd2a..4e91e0d 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
@@ -75,7 +75,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
   
   @Test
   @ShardsFixed(num = 3)
-  // commented 4-Sep-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018
+  @SuppressWarnings({"unchecked"})
   public void test() throws Exception {
     del("*:*");
     index(id, "1", "lowerfilt", "toyota", "lowerfilt1", "x");
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
index 6818676..8572ae4 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
@@ -263,6 +263,7 @@ public class DistributedQueryComponentOptimizationTest extends SolrCloudTestCase
 
     if (distribSinglePass) {
       Map<String, Object> debugMap = response.getDebugMap();
+      @SuppressWarnings({"unchecked"})
       SimpleOrderedMap<Object> track = (SimpleOrderedMap<Object>) debugMap.get("track");
       assertNotNull(track);
       assertNotNull(track.get("EXECUTE_QUERY"));
diff --git a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
index b1b02e1..5d315a5 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
@@ -101,6 +101,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {
     ExecutorService executor = ExecutorUtil.newMDCAwareCachedThreadPool("InfixSuggesterTest");
     try {
       // Build the suggester in the background with a long dictionary
+      @SuppressWarnings({"rawtypes"})
       Future job = executor.submit(() ->
           expectThrows(RuntimeException.class, SolrCoreState.CoreIsClosedException.class,
               () -> assertQ(req("qt", rh_analyzing_long,
@@ -125,6 +126,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {
           (SolrCoreState.CoreIsClosedException.class, SolrException.class, IllegalStateException.class, NullPointerException.class));
       final Throwable[] outerException = new Throwable[1];
       // Build the suggester in the background with a long dictionary
+      @SuppressWarnings({"rawtypes"})
       Future job = executor.submit(() -> outerException[0] = expectThrowsAnyOf(expected,
           () -> assertQ(req("qt", rh_analyzing_long, SuggesterParams.SUGGEST_BUILD_ALL, "true"),
               "//str[@name='command'][.='buildAll']")));
diff --git a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
index b54b7a9..9acf827 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java
@@ -381,6 +381,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
     
   }
   
+  @SuppressWarnings({"unchecked"})
   public void testWhiteboxScores() throws Exception {
     final SchemaField analysisField = h.getCore().getLatestSchema().getField("multigrams_body");
     assertNotNull(analysisField);
@@ -452,6 +453,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
     
   }
   
+  @SuppressWarnings({"unchecked"})
   public void testWhiteboxScorcesStopwords() throws Exception {
     final String input = "why the lazy dog brown fox";
     final Map<String,Double> fieldWeights = new TreeMap<>();
@@ -771,6 +773,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
   }
 
   /** helper, docs for future junit/hamcrest seems to have something similar */
+  @SuppressWarnings({"rawtypes"})
   public static Matcher lessThan(double expected) {
     return new BaseMatcher() {
       @Override public boolean matches(Object actual) {
@@ -782,6 +785,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {
     };
   }
   /** helper, docs for future junit/hamcrest seems to have something similar */
+  @SuppressWarnings({"rawtypes"})
   public static Matcher greaterThan(double expected) {
     return new BaseMatcher() {
       @Override public boolean matches(Object actual) {
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
index 3d18b9a..90be499 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
@@ -245,6 +245,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testReloadOnStart() throws Exception {
     assertU(adoc("id", "0", "lowerfilt", "This is a title"));
     assertU(commit());
@@ -253,7 +254,9 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
         "default", "spellcheck.build", "true");
     assertQ(request, "//arr[@name='suggestion'][.='title']");
 
+    @SuppressWarnings({"rawtypes"})
     NamedList args = new NamedList();
+    @SuppressWarnings({"rawtypes"})
     NamedList spellchecker = new NamedList();
     spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "default");
     spellchecker.add(AbstractLuceneSpellChecker.FIELD, "lowerfilt");
@@ -298,6 +301,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
   }
     
     @Test
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void testThresholdTokenFrequency() throws Exception {
 
         //"document" is in 2 documents but "another" is only in 1.
@@ -345,7 +349,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
         req.close();
         values = rsp.getValues();
         spellCheck = (NamedList) values.get("spellcheck");
-        suggestions = (NamedList) spellCheck.get("suggestions");
+                suggestions = (NamedList) spellCheck.get("suggestions");
         assertTrue(suggestions.get("suggestion")==null);
         assertTrue((Boolean) spellCheck.get("correctlySpelled")==false);
     }
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 4df839b..4e84585 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -1253,13 +1253,15 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
             );
   }
   
-  private Doc createDocValuesDocument(List<FldType> types, String fieldName,  String id, Comparable... values) throws Exception {
+  private Doc createDocValuesDocument(List<FldType> types, String fieldName,  String id,
+                                      @SuppressWarnings({"rawtypes"})Comparable... values) throws Exception {
     Doc doc = createDoc(types);
     doc.getValues("id").set(0, id);
     initMultyValued(doc.getValues(fieldName), values);
     return doc;
   }
 
+  @SuppressWarnings({"rawtypes"})
   private List<Comparable> initMultyValued(List<Comparable> cat_docValues, Comparable... comparables) {
     Collections.addAll(cat_docValues, comparables);
     return cat_docValues;
@@ -1923,6 +1925,7 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
     
   }
 
+  @SuppressWarnings({"unchecked"})
   private NamedList<Double> extractPercentils(SolrQueryResponse rsp, String key) {
     return ((NamedList<NamedList<NamedList<NamedList<Double>>>> )
             rsp.getValues().get("stats")).get("stats_fields").get(key).get("percentiles");
diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
index c033b79..2d51647 100644
--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
@@ -741,7 +741,9 @@ public class TestExportWriter extends SolrTestCaseJ4 {
         );
     req = req("q", "*:*", "qt", "/export", "fl", "id,sortabledv_udvas", "sort", "sortabledv_udvas asc", "expr", "unique(input(),over=\"sortabledv_udvas\")");
     String rsp = h.query(req);
+    @SuppressWarnings({"unchecked"})
     Map<String, Object> rspMap = mapper.readValue(rsp, HashMap.class);
+    @SuppressWarnings({"unchecked"})
     List<Map<String, Object>> docs = (List<Map<String, Object>>) Utils.getObjectByPath(rspMap, false, "/response/docs");
     assertNotNull("missing document results: " + rspMap, docs);
     assertEquals("wrong number of unique docs", 100, docs.size());
@@ -779,12 +781,16 @@ public class TestExportWriter extends SolrTestCaseJ4 {
     String fieldsStr = String.join(",", fieldStrs); // fl :  field1, field2
 
     String resp = h.query(req("q", "*:*", "qt", "/export", "fl", "id," + fieldsStr, "sort", sortStr));
+    @SuppressWarnings({"rawtypes"})
     HashMap respMap = mapper.readValue(resp, HashMap.class);
+    @SuppressWarnings({"rawtypes"})
     List docs = (ArrayList) ((HashMap) respMap.get("response")).get("docs");
 
     SolrQueryRequest selectReq = req("q", "*:*", "qt", "/select", "fl", "id," + fieldsStr, "sort", sortStr, "rows", Integer.toString(numDocs), "wt", "json");
     String response = h.query(selectReq);
+    @SuppressWarnings({"rawtypes"})
     Map rsp = (Map)Utils.fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     List doclist = (List)(((Map)rsp.get("response")).get("docs"));
 
     assert docs.size() == numDocs;
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
index 9bde0fa..492a58b 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
@@ -140,6 +140,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
 
   @SuppressWarnings("unchecked")
   protected TestTag[] pullTagsFromResponse(SolrQueryRequest req, SolrQueryResponse rsp ) throws IOException {
+    @SuppressWarnings({"rawtypes"})
     NamedList rspValues = rsp.getValues();
     Map<String, String> matchingNames = new HashMap<>();
     SolrIndexSearcher searcher = req.getSearcher();
@@ -155,9 +156,10 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
     }
 
     //build TestTag[] aTags from response ('a' is actual)
+    @SuppressWarnings({"rawtypes"})
     List<NamedList> mTagsList = (List<NamedList>) rspValues.get("tags");
     List<TestTag> aTags = new ArrayList<>();
-    for (NamedList map : mTagsList) {
+    for (@SuppressWarnings({"rawtypes"})NamedList map : mTagsList) {
       List<String> foundIds = (List<String>) map.get("ids");
       for (String id  : foundIds) {
         aTags.add(new TestTag(
@@ -204,6 +206,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
     fail(message+": didn't expect "+actualsRemaining.first()+" (of "+actualsRemaining.size()+"); "+ error);
   }
 
+  @SuppressWarnings({"rawtypes"})
   class TestTag implements Comparable {
     final int startOffset, endOffset;
     final String substring;
diff --git a/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java b/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java
index 3836a12..f380129 100644
--- a/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java
+++ b/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 public class DummyHighlighter extends SolrHighlighter {
 
   @Override
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public NamedList<Object> doHighlighting(DocList docs, Query query,
       SolrQueryRequest req, String[] defaultFields) throws IOException {
     NamedList fragments = new SimpleOrderedMap();
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
index 8cf977f..1a2c79c 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
@@ -237,6 +237,7 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 {
     assertEquals(60, SolrMetricManager.DEFAULT_CLOUD_REPORTER_PERIOD);
   }
 
+  @SuppressWarnings({"unchecked"})
   private PluginInfo createPluginInfo(String name, String group, String registry) {
     Map<String,String> attrs = new HashMap<>();
     attrs.put("name", name);
@@ -247,6 +248,7 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 {
     if (registry != null) {
       attrs.put("registry", registry);
     }
+    @SuppressWarnings({"rawtypes"})
     NamedList initArgs = new NamedList();
     initArgs.add("configurable", "true");
     return new PluginInfo("SolrMetricReporter", attrs, initArgs, null);
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
index 21a80fa..f6eb498 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
@@ -132,7 +132,7 @@ public class SolrMetricsIntegrationTest extends SolrTestCaseJ4 {
 
     String metricName = SolrMetricManager.mkName(METRIC_NAME, HANDLER_CATEGORY.toString(), HANDLER_NAME);
     SolrCoreMetricManager coreMetricManager = h.getCore().getCoreMetricManager();
-    Timer timer = (Timer) metricManager.timer(null, coreMetricManager.getRegistryName(), metricName);
+    Timer timer = metricManager.timer(null, coreMetricManager.getRegistryName(), metricName);
 
     long initialCount = timer.getCount();
 
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
index 10e0179..c5bcde2 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
@@ -73,7 +73,7 @@ public class SolrGraphiteReporterTest extends SolrTestCaseJ4 {
       assertTrue(reporter instanceof SolrGraphiteReporter);
       Thread.sleep(5000);
       assertTrue(mock.lines.size() >= 3);
-      String[] frozenLines = (String[])mock.lines.toArray(new String[mock.lines.size()]);
+      String[] frozenLines = mock.lines.toArray(new String[mock.lines.size()]);
       for (String line : frozenLines) {
         assertTrue(line, line.startsWith("test.solr.node.CONTAINER.cores."));
       }
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrSlf4jReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrSlf4jReporterTest.java
index e93938a..4387f95 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrSlf4jReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrSlf4jReporterTest.java
@@ -69,6 +69,7 @@ public class SolrSlf4jReporterTest extends SolrTestCaseJ4 {
     assertTrue(reporter2 instanceof SolrSlf4jReporter);
 
     LogWatcherConfig watcherCfg = new LogWatcherConfig(true, null, null, 100);
+    @SuppressWarnings({"rawtypes"})
     LogWatcher watcher = LogWatcher.newRegisteredLogWatcher(watcherCfg, null);
     watcher.setThreshold("INFO");
 
diff --git a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
index 320b0a0..5631df3 100644
--- a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
@@ -93,12 +93,14 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
     assertEquals(JSONWriter.JSON_NL_STYLE_COUNT, namedListStyles.length);
   }
 
+  @SuppressWarnings({"unchecked"})
   private void implTestJSON(final String namedListStyle) throws IOException {
     SolrQueryRequest req = req("wt","json","json.nl",namedListStyle, "indent", "off");
     SolrQueryResponse rsp = new SolrQueryResponse();
     JSONResponseWriter w = new JSONResponseWriter();
 
     StringWriter buf = new StringWriter();
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = new NamedList();
     nl.add("data1", "he\u2028llo\u2029!");       // make sure that 2028 and 2029 are both escaped (they are illegal in javascript)
     nl.add(null, 42);
diff --git a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
index 871f8c4..4d2df6a 100644
--- a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
@@ -71,6 +71,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
     SmileResponseWriter smileResponseWriter = new SmileResponseWriter();
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     smileResponseWriter.write(baos,req,rsp);
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) decodeSmile(new ByteArrayInputStream(baos.toByteArray()));
     CharArr out = new CharArr();
     JSONWriter jsonWriter = new JSONWriter(out, 2);
@@ -83,12 +84,14 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testJSON() throws IOException {
     SolrQueryRequest req = req("wt","json","json.nl","arrarr");
     SolrQueryResponse rsp = new SolrQueryResponse();
     SmileResponseWriter w = new SmileResponseWriter();
 
     ByteArrayOutputStream buf = new ByteArrayOutputStream();
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = new NamedList();
     nl.add("data1", "he\u2028llo\u2029!");       // make sure that 2028 and 2029 are both escaped (they are illegal in javascript)
     nl.add(null, 42);
@@ -98,7 +101,9 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
     rsp.add("short", Short.valueOf((short)-4));
     String expected = "{\"nl\":[[\"data1\",\"he\\u2028llo\\u2029!\"],[null,42]],byte:-3,short:-4}";
     w.write(buf, req, rsp);
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) decodeSmile(new ByteArrayInputStream(buf.toByteArray()));
+    @SuppressWarnings({"rawtypes"})
     Map o2 = (Map) new ObjectBuilder(new JSONParser(new StringReader(expected))).getObject();
     assertEquals(Utils.toJSONString(m), Utils.toJSONString(o2));
     req.close();
@@ -133,9 +138,12 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
     w.write(buf, req, rsp);
 
     byte[] bytes = buf.toByteArray();
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) decodeSmile(new ByteArrayInputStream(bytes));
     m = (Map) m.get("response");
+    @SuppressWarnings({"rawtypes"})
     List l = (List) m.get("docs");
+    @SuppressWarnings({"rawtypes"})
     Map doc = (Map) l.get(0);
     assertFalse(doc.containsKey("subject"));
     assertFalse(doc.containsKey("title"));
@@ -146,6 +154,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
 
 
   @Test
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void test10Docs() throws IOException {
     SolrQueryResponse response = new SolrQueryResponse();
     SolrDocumentList l = constructSolrDocList(response);
@@ -166,6 +175,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   public static SolrDocumentList constructSolrDocList(SolrQueryResponse response) {
     SolrDocumentList l = new SolrDocumentList();
     for(int i=0;i<10; i++){
@@ -219,6 +229,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
   }
 
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static Object getVal(JsonNode value) {
     if (value instanceof NullNode) {
       return null;
diff --git a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
index bbc4985..e80b28c 100644
--- a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
@@ -62,6 +62,7 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {
     compareStringFormat("LIVE: सबरीमाला मंदिर के पास पहुंची दो महिलाएं, जमकर हो रहा विरोध-प्रदर्शन");
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testJavabinCodecWithCharSeq() throws IOException {
     SolrDocument document = new SolrDocument();
     document.put("id", "1");
@@ -103,6 +104,7 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {
     BinaryQueryResponseWriter writer = (BinaryQueryResponseWriter) h.getCore().getQueryResponseWriter("javabin");
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     writer.write(baos, req, rsp);
+    @SuppressWarnings({"rawtypes"})
     NamedList res;
     try (JavaBinCodec jbc = new JavaBinCodec()) {
       res = (NamedList) jbc.unmarshal(new ByteArrayInputStream(baos.toByteArray()));
diff --git a/solr/core/src/test/org/apache/solr/response/TestGeoJSONResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestGeoJSONResponseWriter.java
index 191136b..99e2c50 100644
--- a/solr/core/src/test/org/apache/solr/response/TestGeoJSONResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestGeoJSONResponseWriter.java
@@ -79,6 +79,7 @@ public class TestGeoJSONResponseWriter extends SolrTestCaseJ4 {
     assertU(commit());
   }
 
+  @SuppressWarnings({"unchecked"})
   protected Map<String,Object> readJSON(String json) {
     try {
       return jsonmapper.readValue(json, Map.class);
@@ -91,6 +92,7 @@ public class TestGeoJSONResponseWriter extends SolrTestCaseJ4 {
     return null; 
   }
   
+  @SuppressWarnings({"unchecked"})
   protected Map<String,Object> getFirstFeatureGeometry(Map<String,Object> json)
   {
     Map<String,Object> rsp = (Map<String,Object>)json.get("response");
@@ -213,8 +215,10 @@ public class TestGeoJSONResponseWriter extends SolrTestCaseJ4 {
     }
   }
   
+  @SuppressWarnings({"unchecked"})
   protected Map<String,Object> readFirstDoc(String json)
   {
+    @SuppressWarnings({"rawtypes"})
     List docs = (List)((Map)readJSON(json).get("response")).get("docs");
     return (Map)docs.get(0);
   }
diff --git a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
index 54b4654..7edffa4 100644
--- a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
@@ -45,9 +45,12 @@ public class TestGraphMLResponseWriter extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testGraphMLOutput() throws Exception {
     SolrQueryRequest request = req("blah", "blah"); // Just need a request to attach the stream and traversal to.
+    @SuppressWarnings({"rawtypes"})
     SolrQueryResponse response = new SolrQueryResponse();
+    @SuppressWarnings({"rawtypes"})
     Map context = request.getContext();
     TupleStream stream = new TestStream(); //Simulates a GatherNodesStream
     Traversal traversal = new Traversal();
@@ -85,31 +88,35 @@ public class TestGraphMLResponseWriter extends SolrTestCaseJ4 {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   private static class TestStream extends TupleStream {
 
     private Iterator<Tuple> tuples;
 
     public TestStream() {
         //Create some nodes
-      List<Tuple> testTuples = new ArrayList();
+      List<Tuple> testTuples = new ArrayList<>();
+      @SuppressWarnings({"rawtypes"})
       Map m1 = new HashMap();
 
-      List<String> an1 = new ArrayList();
+      List<String> an1 = new ArrayList<>();
       an1.add("jim");
       an1.add("max");
       m1.put("node", "bill");
       m1.put("ancestors", an1);
       testTuples.add(new Tuple(m1));
 
+      @SuppressWarnings({"rawtypes"})
       Map m2 = new HashMap();
-      List<String> an2 = new ArrayList();
+      List<String> an2 = new ArrayList<>();
       an2.add("max");
       m2.put("node", "jim");
       m2.put("ancestors", an2);
       testTuples.add(new Tuple(m2));
 
+      @SuppressWarnings({"rawtypes"})
       Map m3 = new HashMap();
-      List<String> an3 = new ArrayList();
+      List<String> an3 = new ArrayList<>();
       an3.add("jim");
       m3.put("node", "max");
       m3.put("ancestors", an3);
@@ -134,10 +141,12 @@ public class TestGraphMLResponseWriter extends SolrTestCaseJ4 {
       return null;
     }
 
+    @SuppressWarnings({"unchecked"})
     public Tuple read() {
       if(tuples.hasNext()) {
         return tuples.next();
       } else {
+        @SuppressWarnings({"rawtypes"})
         Map map = new HashMap();
         map.put("EOF", true);
         return new Tuple(map);
diff --git a/solr/core/src/test/org/apache/solr/response/TestJavabinTupleStreamParser.java b/solr/core/src/test/org/apache/solr/response/TestJavabinTupleStreamParser.java
index 81d0e26..74e0c95 100644
--- a/solr/core/src/test/org/apache/solr/response/TestJavabinTupleStreamParser.java
+++ b/solr/core/src/test/org/apache/solr/response/TestJavabinTupleStreamParser.java
@@ -65,6 +65,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
         "        \"a_s\":\"hello3\",\n" +
         "        \"a_i\":3,\n" +
         "        \"a_f\":3.0}]}}";
+    @SuppressWarnings({"rawtypes"})
     SimpleOrderedMap nl = convert2OrderedMap((Map) Utils.fromJSONString(payload));
 
     byte[] bytes = serialize(nl);
@@ -81,6 +82,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
 
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public SimpleOrderedMap convert2OrderedMap(Map m) {
     SimpleOrderedMap result = new SimpleOrderedMap<>();
     m.forEach((k, v) -> {
@@ -93,7 +95,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
   }
 
   public void testSimple() throws IOException {
-    List<Map<String, Object>> l = new ArrayList();
+    List<Map<String, Object>> l = new ArrayList<>();
     l.add(Utils.makeMap("id", 1, "f", 1.0f, "s", "Some str 1"));
     l.add(Utils.makeMap("id", 2, "f", 2.0f, "s", "Some str 2"));
     l.add(Utils.makeMap("id", 3, "f", 1.0f, "s", "Some str 3"));
@@ -141,6 +143,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
 
     byte[] bytes = serialize(tupleStream);
     JavabinTupleStreamParser parser = new JavabinTupleStreamParser(new ByteArrayInputStream(bytes), true);
+    @SuppressWarnings({"rawtypes"})
     Map m = parser.next();
     assertEquals(1L, m.get("id"));
     assertEquals(1.0, (Double) m.get("f"), 0.01);
@@ -167,6 +170,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
     assertEquals(Boolean.TRUE, m.get("EOF"));
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testSolrDocumentList() throws IOException {
     SolrQueryResponse response = new SolrQueryResponse();
     SolrDocumentList l = constructSolrDocList(response);
@@ -190,6 +194,7 @@ public class TestJavabinTupleStreamParser extends SolrTestCaseJ4 {
     }
 
   }
+  @SuppressWarnings({"unchecked"})
   public static byte[] serialize(Object o) throws IOException {
     SolrQueryResponse response = new SolrQueryResponse();
     response.getValues().add("results", o);
diff --git a/solr/core/src/test/org/apache/solr/response/TestPushWriter.java b/solr/core/src/test/org/apache/solr/response/TestPushWriter.java
index 4f6f23b..3fb32f4 100644
--- a/solr/core/src/test/org/apache/solr/response/TestPushWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestPushWriter.java
@@ -53,6 +53,7 @@ public class TestPushWriter extends SolrTestCaseJ4 {
     if (log.isInfoEnabled()) {
       log.info("{}", new String(baos.toByteArray(), StandardCharsets.UTF_8));
     }
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) Utils.fromJSON(baos.toByteArray());
     checkValues(m);
     try (JavaBinCodec jbc = new JavaBinCodec(baos= new ByteArrayOutputStream(), null)) {
@@ -64,7 +65,7 @@ public class TestPushWriter extends SolrTestCaseJ4 {
     checkValues(m);
   }
 
-  protected void checkValues(Map m) {
+  protected void checkValues(@SuppressWarnings({"rawtypes"})Map m) {
     assertEquals(0, ((Number)Utils.getObjectByPath(m, true, "responseHeader/status")).intValue());
     assertEquals(10, ((Number)Utils.getObjectByPath(m, true, "response/numFound")).intValue());
     assertEquals(1, ((Number)Utils.getObjectByPath(m, true, "response/docs[0]/id")).intValue());
diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
index 7995efa..75986c0 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
@@ -189,8 +189,10 @@ public class TestRawResponseWriter extends SolrTestCaseJ4 {
    *
    * @param baseWriter null or the name of a valid base writer
    */
+  @SuppressWarnings({"unchecked"})
   private static RawResponseWriter newRawResponseWriter(String baseWriter) {
     RawResponseWriter writer = new RawResponseWriter();
+    @SuppressWarnings({"rawtypes"})
     NamedList initArgs = new NamedList<Object>();
     if (null != baseWriter) {
       initArgs.add("base", baseWriter);
diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
index 4409efd..07609d3 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
@@ -106,6 +106,7 @@ public class TestRetrieveFieldsOptimizer extends SolrTestCaseJ4 {
 
   //TODO, how to generalize?
 
+  @SuppressWarnings({"unchecked"})
   private static void setupAllFields() throws IOException {
 
     IndexSchema schema = h.getCore().getLatestSchema();
@@ -231,6 +232,7 @@ public class TestRetrieveFieldsOptimizer extends SolrTestCaseJ4 {
     }
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private void checkFetchSources(SolrReturnFields.FIELD_SOURCES source) throws Exception {
     String flAll = fieldsHolder.allFields.stream()
         .map(RetrieveField::getName) // This will call testField.getName()
@@ -318,6 +320,7 @@ public class TestRetrieveFieldsOptimizer extends SolrTestCaseJ4 {
     assertEquals("We didn't get the values from the expected places! ",
         source, ((SolrReturnFields) rsp.returnFields).getFieldSources());
 
+    @SuppressWarnings({"rawtypes"})
     NamedList res;
     try (JavaBinCodec jbc = new JavaBinCodec()) {
       res = (NamedList) jbc.unmarshal(new ByteArrayInputStream(baos.toByteArray()));
diff --git a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
index 3e4dc6c..66aca82 100644
--- a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
+++ b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
@@ -59,6 +59,7 @@ public class TestSolrQueryResponse extends SolrTestCase {
     assertEquals("values new value", newValue, response.getValues());
     response.add("key2", "value2");
     {
+      @SuppressWarnings({"unchecked"})
       final Iterator<Map.Entry<String,Object>> it = response.getValues().iterator();
       assertTrue(it.hasNext());
       final Map.Entry<String,Object> entry1 = it.next();
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformerHierarchy.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformerHierarchy.java
index 26e5f05..bda4e7d 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformerHierarchy.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformerHierarchy.java
@@ -335,6 +335,7 @@ public class TestChildDocTransformerHierarchy extends SolrTestCaseJ4 {
     return idCounter.incrementAndGet();
   }
 
+  @SuppressWarnings({"unchecked"})
   private static void cleanSolrDocumentFields(SolrDocument input) {
     for(String fieldName: fieldsToRemove) {
       input.removeFields(fieldName);
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.java
index 3a020e6..a09ec23 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
@@ -109,15 +109,20 @@ public class TestBulkSchemaAPI extends RestTestBase {
         "    }";
 
     String response = restTestHarness.post("/schema", json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map error = (Map)map.get("error");
     assertNotNull("No errors", error);
+    @SuppressWarnings({"rawtypes"})
     List details = (List)error.get("details");
     assertNotNull("No details", details);
     assertEquals("Wrong number of details", 2, details.size());
+    @SuppressWarnings({"rawtypes"})
     List firstErrorList = (List)((Map)details.get(0)).get("errorMessages");
     assertEquals(1, firstErrorList.size());
     assertTrue (((String)firstErrorList.get(0)).contains("Field 'a1': Field type 'string1' not found.\n"));
+    @SuppressWarnings({"rawtypes"})
     List secondErrorList = (List)((Map)details.get(1)).get("errorMessages");
     assertEquals(1, secondErrorList.size());
     assertTrue (((String)secondErrorList.get(0)).contains("is a required field"));
@@ -148,12 +153,16 @@ public class TestBulkSchemaAPI extends RestTestBase {
 
     String response = restTestHarness.post("/schema",
         json(addFieldTypeAnalyzerWithClass + ',' + charFilters + tokenizer + filters + suffix));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map error = (Map)map.get("error");
     assertNotNull("No errors", error);
+    @SuppressWarnings({"rawtypes"})
     List details = (List)error.get("details");
     assertNotNull("No details", details);
     assertEquals("Wrong number of details", 1, details.size());
+    @SuppressWarnings({"rawtypes"})
     List errorList = (List)((Map)details.get(0)).get("errorMessages");
     assertEquals(1, errorList.size());
     assertTrue (((String)errorList.get(0)).contains
@@ -191,6 +200,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
 
     map = getObj(restTestHarness, "myNewTextFieldWithAnalyzerClass", "fieldTypes");
     assertNotNull(map);
+    @SuppressWarnings({"rawtypes"})
     Map analyzer = (Map)map.get("analyzer");
     assertEquals("org.apache.lucene.analysis.core.WhitespaceAnalyzer", String.valueOf(analyzer.get("class")));
     assertEquals("5.0.0", String.valueOf(analyzer.get(IndexSchema.LUCENE_MATCH_VERSION_PARAM)));
@@ -201,6 +211,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
 
     String newFieldName = "attr_non_dynamic";
 
+    @SuppressWarnings({"rawtypes"})
     Map map = getObj(harness, newFieldName, "fields");
     assertNull("Field '" + newFieldName + "' already exists in the schema", map);
 
@@ -243,6 +254,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
         "    }";
 
     String response = harness.post("/schema", json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
     assertNotNull(response, map.get("error"));
 
@@ -250,6 +262,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
     assertNull(newFieldName + " illegal dynamic field should not have been added to schema", map);
   }
 
+  @SuppressWarnings({"rawtypes"})
   public void testAddIllegalFields() throws Exception {
     RestTestHarness harness = restTestHarness;
 
@@ -292,6 +305,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
     assertNotNull(response, map.get("error"));
   }
 
+  @SuppressWarnings({"rawtypes"})
   public void testAddFieldWithExistingCatchallDynamicField() throws Exception {
     RestTestHarness harness = restTestHarness;
 
@@ -344,6 +358,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
     assertNotNull("Field '" + newFieldName + "' is not in the schema", map);
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testMultipleCommands() throws Exception{
     RestTestHarness harness = restTestHarness;
 
@@ -623,12 +638,14 @@ public class TestBulkSchemaAPI extends RestTestBase {
   public void testCopyFieldRules() throws Exception {
     RestTestHarness harness = restTestHarness;
 
+    @SuppressWarnings({"rawtypes"})
     Map m = getObj(harness, "name", "fields");
     assertNotNull("'name' field does not exist in the schema", m);
 
     m = getObj(harness, "bind", "fields");
     assertNotNull("'bind' field does not exist in the schema", m);
 
+    @SuppressWarnings({"rawtypes"})
     List l = getSourceCopyFields(harness, "bleh_s");
     assertTrue("'bleh_s' copyField rule exists in the schema", l.isEmpty());
 
@@ -640,6 +657,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
         "          }\n";
     String response = harness.post("/schema", json(payload));
 
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
     assertNull(response, map.get("error"));
 
@@ -690,6 +708,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
     assertTrue("'bleh_s' copyField rule exists in the schema", l.isEmpty());
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testDeleteAndReplace() throws Exception {
     RestTestHarness harness = restTestHarness;
 
@@ -939,9 +958,11 @@ public class TestBulkSchemaAPI extends RestTestBase {
 
     String response = restTestHarness.post("/schema", json(payload));
 
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
     assertNull(response, map.get("errors"));
 
+    @SuppressWarnings({"rawtypes"})
     Map fields = getObj(restTestHarness, fieldName, "fields");
     assertNotNull("field " + fieldName + " not created", fields);
 
@@ -1017,9 +1038,11 @@ public class TestBulkSchemaAPI extends RestTestBase {
 
     String response = harness.post("/schema", json(payload));
 
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) fromJSONString(response);
     assertNull(response, map.get("error"));
 
+    @SuppressWarnings({"rawtypes"})
     Map fields = getObj(harness, fieldName, "fields");
     assertNotNull("field " + fieldName + " not created", fields);
     
@@ -1054,26 +1077,30 @@ public class TestBulkSchemaAPI extends RestTestBase {
         sim -> assertEquals("Unexpected discountedOverlaps", discountOverlaps, sim.getDiscountOverlaps()));
   }
 
+  @SuppressWarnings({"rawtypes"})
   public static Map getObj(RestTestHarness restHarness, String fld, String key) throws Exception {
     Map map = getRespMap(restHarness);
     List l = (List) ((Map)map.get("schema")).get(key);
     for (Object o : l) {
-      Map m = (Map) o;
+      @SuppressWarnings({"rawtypes"})Map m = (Map) o;
       if (fld.equals(m.get("name"))) 
         return m;
     }
     return null;
   }
 
+  @SuppressWarnings({"rawtypes"})
   public static Map getRespMap(RestTestHarness restHarness) throws Exception {
     return getAsMap("/schema", restHarness);
   }
 
+  @SuppressWarnings({"rawtypes"})
   public static Map getAsMap(String uri, RestTestHarness restHarness) throws Exception {
     String response = restHarness.query(uri);
     return (Map) fromJSONString(response);
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static List getSourceCopyFields(RestTestHarness harness, String src) throws Exception {
     Map map = getRespMap(harness);
     List l = (List) ((Map)map.get("schema")).get("copyFields");
@@ -1085,6 +1112,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
     return result;
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static List getDestCopyFields(RestTestHarness harness, String dest) throws Exception {
     Map map = getRespMap(harness);
     List l = (List) ((Map)map.get("schema")).get("copyFields");
@@ -1102,6 +1130,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
    * Executes each of the specified Similarity-accepting validators.
    */
   @SafeVarargs
+  @SuppressWarnings({"unchecked"})
   private static <T extends Similarity> void assertFieldSimilarity(String fieldname, Class<T> expected, Consumer<T>... validators) {
     CoreContainer cc = jetty.getCoreContainer();
     try (SolrCore core = cc.getCore("collection1")) {
diff --git a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
index 972ebe6..eb44c16 100644
--- a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
@@ -98,7 +98,7 @@ public class OpenExchangeRatesOrgProviderTest extends SolrTestCaseJ4 {
     assertEquals(HARDCODED_TEST_TIMESTAMP, oerp.rates.getTimestamp());
 
     // modify the timestamp to be "current" then fetch a rate and ensure no reload
-    final long currentTimestamp = (long) (System.currentTimeMillis() / 1000);
+    final long currentTimestamp = System.currentTimeMillis() / 1000;
     oerp.rates.setTimestamp(currentTimestamp);
     assertEquals(81.29D, oerp.getExchangeRate("USD", "JPY"), 0.0D);    
     assertEquals(currentTimestamp, oerp.rates.getTimestamp());
diff --git a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
index 5524a31..c780d73 100644
--- a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
@@ -202,6 +202,7 @@ public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {
     setupRPTField("miles", "true", "WKT", random().nextBoolean()
         ? new SpatialRecursivePrefixTreeFieldType() : new RptWithGeometrySpatialField());
 
+    @SuppressWarnings({"rawtypes"})
     AbstractSpatialFieldType ftype = (AbstractSpatialFieldType)
         h.getCore().getLatestSchema().getField("geo").getType();
 
@@ -220,6 +221,7 @@ public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {
     setupRPTField("miles", "true", "GeoJSON", random().nextBoolean()
         ? new SpatialRecursivePrefixTreeFieldType() : new RptWithGeometrySpatialField());
 
+    @SuppressWarnings({"rawtypes"})
     AbstractSpatialFieldType ftype = (AbstractSpatialFieldType)
         h.getCore().getLatestSchema().getField("geo").getType();
 
diff --git a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
index 4804a8d..df196d7 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
@@ -53,11 +53,13 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void test() throws Exception {
 
     final int threadCount = 5;
     setupRestTestHarnesses();
     Thread[] threads = new Thread[threadCount];
+    @SuppressWarnings({"rawtypes"})
     final List<List> collectErrors = Collections.synchronizedList(new ArrayList<>());
 
     for (int i = 0 ; i < threadCount ; i++) {
@@ -65,6 +67,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
       threads[i] = new Thread(){
         @Override
         public void run() {
+          @SuppressWarnings({"rawtypes"})
           ArrayList errs = new ArrayList();
           collectErrors.add(errs);
           try {
@@ -84,7 +87,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
 
     boolean success = true;
 
-    for (List e : collectErrors) {
+    for (@SuppressWarnings({"rawtypes"})List e : collectErrors) {
       if (e != null &&  !e.isEmpty()) {
         success = false;
         log.error("{}", e);
@@ -94,6 +97,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
     assertTrue(collectErrors.toString(), success);
   }
 
+  @SuppressWarnings({"unchecked"})
   private void invokeBulkAddCall(int seed, ArrayList<String> errs) throws Exception {
     String payload = "{\n" +
         "          'add-field' : {\n" +
@@ -130,6 +134,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
 
     RestTestHarness publisher = randomRestTestHarness(r);
     String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) Utils.fromJSONString(response);
     Object errors = map.get("errors");
     if (errors != null) {
@@ -145,12 +150,14 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
       long maxTimeoutMillis = 100000;
       while (TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutMillis) {
         errmessages.clear();
+        @SuppressWarnings({"rawtypes"})
         Map m = getObj(harness, aField, "fields");
         if (m == null) errmessages.add(StrUtils.formatString("field {0} not created", aField));
         
         m = getObj(harness, dynamicFldName, "dynamicFields");
         if (m == null) errmessages.add(StrUtils.formatString("dynamic field {0} not created", dynamicFldName));
 
+        @SuppressWarnings({"rawtypes"})
         List l = getSourceCopyFields(harness, aField);
         if (!checkCopyField(l, aField, dynamicCopyFldDest))
           errmessages.add(StrUtils.formatString("CopyField source={0},dest={1} not created", aField, dynamicCopyFldDest));
@@ -170,6 +177,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
     }
   }
 
+  @SuppressWarnings({"unchecked"})
   private void invokeBulkReplaceCall(int seed, ArrayList<String> errs) throws Exception {
     String payload = "{\n" +
         "          'replace-field' : {\n" +
@@ -200,6 +208,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
 
     RestTestHarness publisher = randomRestTestHarness(r);
     String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) Utils.fromJSONString(response);
     Object errors = map.get("errors");
     if (errors != null) {
@@ -215,12 +224,14 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
       long maxTimeoutMillis = 100000;
       while (TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutMillis) {
         errmessages.clear();
+        @SuppressWarnings({"rawtypes"})
         Map m = getObj(harness, aField, "fields");
         if (m == null) errmessages.add(StrUtils.formatString("field {0} no longer present", aField));
 
         m = getObj(harness, dynamicFldName, "dynamicFields");
         if (m == null) errmessages.add(StrUtils.formatString("dynamic field {0} no longer present", dynamicFldName));
 
+        @SuppressWarnings({"rawtypes"})
         List l = getSourceCopyFields(harness, aField);
         if (!checkCopyField(l, aField, dynamicCopyFldDest))
           errmessages.add(StrUtils.formatString("CopyField source={0},dest={1} no longer present", aField, dynamicCopyFldDest));
@@ -240,6 +251,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
     }
   }
 
+  @SuppressWarnings({"unchecked"})
   private void invokeBulkDeleteCall(int seed, ArrayList<String> errs) throws Exception {
     String payload = "{\n" +
         "          'delete-copy-field' : {\n" +
@@ -262,6 +274,7 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
 
     RestTestHarness publisher = randomRestTestHarness(r);
     String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
+    @SuppressWarnings({"rawtypes"})
     Map map = (Map) Utils.fromJSONString(response);
     Object errors = map.get("errors");
     if (errors != null) {
@@ -277,12 +290,14 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
       long maxTimeoutMillis = 100000;
       while (TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutMillis) {
         errmessages.clear();
+        @SuppressWarnings({"rawtypes"})
         Map m = getObj(harness, aField, "fields");
         if (m != null) errmessages.add(StrUtils.formatString("field {0} still exists", aField));
 
         m = getObj(harness, dynamicFldName, "dynamicFields");
         if (m != null) errmessages.add(StrUtils.formatString("dynamic field {0} still exists", dynamicFldName));
 
+        @SuppressWarnings({"rawtypes"})
         List l = getSourceCopyFields(harness, aField);
         if (checkCopyField(l, aField, dynamicCopyFldDest))
           errmessages.add(StrUtils.formatString("CopyField source={0},dest={1} still exists", aField, dynamicCopyFldDest));
@@ -302,9 +317,9 @@ public class TestBulkSchemaConcurrent  extends AbstractFullDistribZkTestBase {
     }
   }
 
-  private boolean checkCopyField(List<Map> l, String src, String dest) {
+  private boolean checkCopyField(@SuppressWarnings({"rawtypes"})List<Map> l, String src, String dest) {
     if (l == null) return false;
-    for (Map map : l) {
+    for (@SuppressWarnings({"rawtypes"})Map map : l) {
       if (src.equals(map.get("source")) && dest.equals(map.get("dest"))) 
         return true;
     }
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
index 2427f19..085ba1a 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
@@ -59,9 +59,12 @@ public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {
     String previousBaseURL = client.getBaseURL();
     // Strip /collection1 step from baseURL - requests fail otherwise
     client.setBaseURL(previousBaseURL.substring(0, previousBaseURL.lastIndexOf("/")));
+    @SuppressWarnings({"rawtypes"})
     NamedList namedListResponse = client.request(request);
     client.setBaseURL(previousBaseURL); // Restore baseURL 
+    @SuppressWarnings({"rawtypes"})
     NamedList status = (NamedList)namedListResponse.get("status");
+    @SuppressWarnings({"rawtypes"})
     NamedList collectionStatus = (NamedList)status.getVal(0);
     String collectionSchema = (String)collectionStatus.get(CoreAdminParams.SCHEMA);
     // Make sure the upgrade to managed schema happened
diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
index ae8dd4e..f0ccd99 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
@@ -145,8 +145,11 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {
     SolrQueryResponse response = new SolrQueryResponse();
     admin.handleRequestBody(request, response);
     assertNull("Exception on create", response.getException());
+    @SuppressWarnings({"rawtypes"})
     NamedList responseValues = response.getValues();
+    @SuppressWarnings({"rawtypes"})
     NamedList status = (NamedList)responseValues.get("status");
+    @SuppressWarnings({"rawtypes"})
     NamedList collectionStatus = (NamedList)status.get(collection);
     String collectionSchema = (String)collectionStatus.get(CoreAdminParams.SCHEMA);
     assertEquals("Schema resource name differs from expected name", expectedSchemaResource, collectionSchema);
diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java
index 5a23ffd..34f8bb2 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java
@@ -171,6 +171,7 @@ public class TestManagedSchemaThreadSafety extends SolrTestCaseJ4 {
     return zkController;
   }
 
+  @SuppressWarnings({"rawtypes"})
   private Runnable indexSchemaLoader(String configsetName, final ZkController zkController) {
     return () -> {
       try {
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 4f41f7f..aa096fc 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -3856,6 +3856,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
 
   public void testWhiteboxCreateFields() throws Exception {
     String[] typeNames = new String[]{"i", "l", "f", "d", "dt"};
+    @SuppressWarnings({"rawtypes"})
     Class<?>[] expectedClasses = new Class[]{IntPoint.class, LongPoint.class, FloatPoint.class, DoublePoint.class, LongPoint.class};
     
     Date dateToTest = new Date();
diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
index 1e38669..41e5504 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
@@ -89,6 +89,7 @@ public class TestUseDocValuesAsStored2 extends RestTestBase {
 
     String response = harness.post("/schema", json(payload));
 
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) Utils.fromJSONString(response);
     assertNull(response, m.get("errors"));
 
diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java
index 0bc140b..94d90e0 100644
--- a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java
+++ b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java
@@ -96,7 +96,9 @@ public class AnalyticsMergeStrategyTest extends BaseDistributedSearchTestCase {
   }
 
   private void assertCountOnly(QueryResponse rsp, int count) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList response = rsp.getResponse();
+    @SuppressWarnings({"rawtypes"})
     NamedList analytics = (NamedList)response.get("analytics");
     Integer c = (Integer)analytics.get("mycount");
     if(c.intValue() != count) {
@@ -105,7 +107,9 @@ public class AnalyticsMergeStrategyTest extends BaseDistributedSearchTestCase {
   }
 
   private void assertCount(QueryResponse rsp, int count) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     NamedList response = rsp.getResponse();
+    @SuppressWarnings({"rawtypes"})
     NamedList analytics = (NamedList)response.get("analytics");
     Integer c = (Integer)analytics.get("mycount");
     if(c.intValue() != count) {
diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
index 158df17..b2a733f 100644
--- a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
@@ -87,7 +87,9 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
       leafDelegate.collect(doc);
     }
 
+    @SuppressWarnings({"unchecked"})
     public void finish() throws IOException {
+      @SuppressWarnings({"rawtypes"})
       NamedList analytics = new NamedList();
       rb.rsp.add("analytics", analytics);
       analytics.add("mycount", count+base);
@@ -114,12 +116,16 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
     public void  handleMergeFields(ResponseBuilder rb, SolrIndexSearcher searcher) {
     }
 
+    @SuppressWarnings({"unchecked"})
     public void merge(ResponseBuilder rb, ShardRequest shardRequest) {
       int count = 0;
+      @SuppressWarnings({"rawtypes"})
       NamedList merged = new NamedList();
 
       for(ShardResponse shardResponse : shardRequest.responses) {
+        @SuppressWarnings({"rawtypes"})
         NamedList response = shardResponse.getSolrResponse().getResponse();
+        @SuppressWarnings({"rawtypes"})
         NamedList analytics = (NamedList)response.get("analytics");
         Integer c = (Integer)analytics.get("mycount");
         count += c.intValue();
@@ -132,10 +138,13 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
 
   static class TestIterative extends IterativeMergeStrategy  {
 
+    @SuppressWarnings({"unchecked"})
     public void process(ResponseBuilder rb, ShardRequest sreq) throws Exception {
       int count = 0;
       for(ShardResponse shardResponse : sreq.responses) {
+        @SuppressWarnings({"rawtypes"})
         NamedList response = shardResponse.getSolrResponse().getResponse();
+        @SuppressWarnings({"rawtypes"})
         NamedList analytics = (NamedList)response.get("analytics");
         Integer c = (Integer)analytics.get("mycount");
         count += c.intValue();
@@ -158,11 +167,13 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
 
       for(Future<CallBack> future : futures) {
         QueryResponse response = future.get().getResponse();
+        @SuppressWarnings({"rawtypes"})
         NamedList analytics = (NamedList)response.getResponse().get("analytics");
         Integer c = (Integer)analytics.get("mycount");
         nextCount += c.intValue();
       }
 
+      @SuppressWarnings({"rawtypes"})
       NamedList merged = new NamedList();
       merged.add("mycount", nextCount);
       rb.rsp.add("analytics", merged);
diff --git a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
index 50ece14..127ad6d 100644
--- a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
@@ -94,6 +94,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
     assertEquals(0, cluster.getSolrClient().commit().getStatus());
   }
 
+  @SuppressWarnings({"rawtypes"})
   public void testSimpleRangeFacetsOfSymetricRates() throws Exception {
     for (boolean use_mincount : Arrays.asList(true, false)) {
     
@@ -146,6 +147,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
           assertEquals(3, result.getAfter());
           assertEquals(9, result.getBetween());
           
+          @SuppressWarnings({"unchecked"})
           List<RangeFacet.Count> counts = result.getCounts();
           if (use_mincount) {
             assertEquals(3, counts.size());
@@ -174,12 +176,14 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         try {
           assertEquals(NUM_DOCS, rsp.getResults().getNumFound());
           
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
           
           assertEqualsHACK("before", 3L, ((NamedList)foo.get("before")).get("count"));
           assertEqualsHACK("after", 3L, ((NamedList)foo.get("after")).get("count"));
           assertEqualsHACK("between", 9L, ((NamedList)foo.get("between")).get("count"));
           
+          @SuppressWarnings({"unchecked"})
           final List<NamedList> buckets = (List<NamedList>) foo.get("buckets");
           
           if (use_mincount) {
@@ -219,8 +223,10 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
       final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
       try {
         assertEquals(NUM_DOCS, rsp.getResults().getNumFound());
+        @SuppressWarnings({"rawtypes"})
         final List<RangeFacet> range_facets = rsp.getFacetRanges();
         assertEquals(1, range_facets.size());
+        @SuppressWarnings({"rawtypes"})
         final RangeFacet result = range_facets.get(0);
         assertEquals(FIELD, result.getName());
         assertEquals("8.00,EUR", result.getStart());
@@ -230,6 +236,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         assertEquals(3, result.getAfter());
         assertEquals(6, result.getBetween());
         
+        @SuppressWarnings({"unchecked"})
         List<RangeFacet.Count> counts = result.getCounts();
         if (use_mincount) {
           assertEquals(2, counts.size());
@@ -266,17 +273,20 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
       try {
         assertEquals(NUM_DOCS, rsp.getResults().getNumFound());
         
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
         
         assertEqualsHACK("before", 6L, ((NamedList)foo.get("before")).get("count"));
         assertEqualsHACK("after", 3L, ((NamedList)foo.get("after")).get("count"));
         assertEqualsHACK("between", 6L, ((NamedList)foo.get("between")).get("count"));
         
+        @SuppressWarnings({"unchecked", "rawtypes"})
         final List<NamedList> buckets = (List<NamedList>) foo.get("buckets");
         
         if (use_mincount) {
           assertEquals(2, buckets.size());
           for (int i = 0; i < 2; i++) {
+            @SuppressWarnings({"rawtypes"})
             NamedList bucket = buckets.get(i);
             assertEquals((12 + (i * 2)) + ".00,EUR", bucket.get("val"));
             assertEqualsHACK("bucket #" + i, 3L, bucket.get("count"));
@@ -284,6 +294,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         } else {
           assertEquals(7, buckets.size());
           for (int i = 0; i < 7; i++) {
+            @SuppressWarnings({"rawtypes"})
             NamedList bucket = buckets.get(i);
             assertEquals((8 + (i * 2)) + ".00,EUR", bucket.get("val"));
             assertEqualsHACK("bucket #" + i, (i == 2 || i == 3) ? 3L : 0L, bucket.get("count"));
@@ -357,10 +368,15 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         // this top level result count sanity check that should vary based on how we are filtering our facets...
         assertEquals(use_domain ? 15 : 10, rsp.getResults().getNumFound());
 
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> bar = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("bar");
+        @SuppressWarnings({"unchecked"})
         final List<NamedList<Object>> bar_buckets = (List<NamedList<Object>>) bar.get("buckets");
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> before = (NamedList<Object>) bar.get("before");
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> between = (NamedList<Object>) bar.get("between");
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> after = (NamedList<Object>) bar.get("after");
         
         // sanity check our high level expectations...
@@ -378,7 +394,8 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         for (int i = 0; i < 2; i++) {
           final NamedList<Object> bucket = bar_buckets.get(i);
           assertEquals((i * 10) + ".00,EUR", bucket.get("val"));
-          assertEqualsHACK("bucket #" + i, 4L, bucket.get("count"));
+          assertEquals("bucket #" + i, 4L, bucket.get("count"));
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> foo_buckets = ((NamedList<List<NamedList<Object>>>)bucket.get("foo")).get("buckets");
           assertEquals("bucket #" + i + " foo num buckets", 2, foo_buckets.size());
           assertEquals("bucket #" + i + " foo top term", (0==i ? "x2" : "x0"), foo_buckets.get(0).get("val"));
@@ -390,6 +407,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         }
         
         { // between...
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = ((NamedList<List<NamedList<Object>>>)between.get("foo")).get("buckets");
           assertEquals("between num buckets", 2, buckets.size());
           // the counts should both be 3, and the term order should break the tie...
@@ -400,6 +418,7 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         }
         
         { // after...
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = ((NamedList<List<NamedList<Object>>>)after.get("foo")).get("buckets");
           assertEquals("after num buckets", 2, buckets.size());
           // the counts should both be 1, and the term order should break the tie...
@@ -441,16 +460,19 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         // this top level result count sanity check that should vary based on how we are filtering our facets...
         assertEquals(use_domain ? 15 : 11, rsp.getResults().getNumFound());
         
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
         
         // sanity check...
         // because of the facet limit, foo should only have 1 bucket
         // because of the fq, the val should be "x2" and the count=5
+        @SuppressWarnings({"unchecked"})
         final List<NamedList<Object>> foo_buckets = (List<NamedList<Object>>) foo.get("buckets");
         assertEquals(1, foo_buckets.size());
         assertEquals("x2", foo_buckets.get(0).get("val"));
         assertEqualsHACK("foo bucket count", 5L, foo_buckets.get(0).get("count"));
         
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> bar = (NamedList<Object>)foo_buckets.get(0).get("bar");
         
         // these are the 'x2' specific counts, based on our fq...
@@ -459,9 +481,11 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
         assertEqualsHACK("after", 1L, ((NamedList)bar.get("after")).get("count"));
         assertEqualsHACK("between", 2L, ((NamedList)bar.get("between")).get("count"));
         
+        @SuppressWarnings({"unchecked", "rawtypes"})
         final List<NamedList> buckets = (List<NamedList>) bar.get("buckets");
         assertEquals(7, buckets.size());
         for (int i = 0; i < 7; i++) {
+          @SuppressWarnings({"rawtypes"})
           NamedList bucket = buckets.get(i);
           assertEquals((8 + (i * 2)) + ".00,EUR", bucket.get("val"));
           // 12,EUR & 15,EUR are the 2 values that align with x2 docs
@@ -482,5 +506,5 @@ public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
     assertTrue(msg + " ... NOT A NUMBER: " + actual.getClass(), Number.class.isInstance(actual));
     assertEquals(msg, expected, ((Number)actual).longValue());
   }
-  
+
 }
diff --git a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
index 89a40a9..48378f9 100644
--- a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
@@ -36,6 +36,7 @@ public class LargeFieldTest extends SolrTestCaseJ4 {
   private static final String BIG_FIELD = "bigField";
 
   @BeforeClass
+  @SuppressWarnings({"unchecked"})
   public static void initManagedSchemaCore() throws Exception {
     // This testing approach means no schema file or per-test temp solr-home!
     System.setProperty("managed.schema.mutable", "true");
diff --git a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
index ff73925..d7bb4d8 100644
--- a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
+++ b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
@@ -47,6 +47,7 @@ public class MergeStrategyTest extends BaseDistributedSearchTestCase {
 
   @Test
   @ShardsFixed(num = 3)
+  @SuppressWarnings({"unchecked"})
   public void test() throws Exception {
     del("*:*");
 
diff --git a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
index 874b21a..e401f3c 100644
--- a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
+++ b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
@@ -27,7 +27,7 @@ public class MockSearchComponent extends SearchComponent {
   private String testParam = null;
   
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     super.init(args);
     testParam = (String) args.get("testParam");
   }
diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
index 00108d7..9ed0340 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
@@ -290,6 +290,7 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
     }
   }
 
+  @SuppressWarnings({"unchecked"})
   public void testQueryCollapse() throws Exception {
     SolrQueryRequest req = req("myField","foo_s1",
                                "g_sort","foo_s1 asc, foo_i desc");
@@ -314,7 +315,9 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
           "{!collapse field=$myField max=a nullPolicy=expand}");
 
       //Add boosted documents to the request context.
+      @SuppressWarnings({"rawtypes"})
       Map context = req.getContext();
+      @SuppressWarnings({"rawtypes"})
       Set boosted = new HashSet();
       boosted.add("doc1");
       boosted.add("doc2");
diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
index 1024883..120847b 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
@@ -132,6 +132,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       this.mergeStrategy = mergeStrategy;
     }
 
+    @SuppressWarnings({"rawtypes"})
     public TopDocsCollector getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) {
       if(collector == 0)
         return new TestCollector(null);
@@ -165,6 +166,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
 
     }
 
+    @SuppressWarnings({"unchecked"})
     public void merge(ResponseBuilder rb, ShardRequest sreq) {
 
       // id to shard mapping, to eliminate any accidental dups
@@ -183,7 +185,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       long numFound = 0;
       Float maxScore=null;
       boolean partialResults = false;
-      List<ShardDoc> shardDocs = new ArrayList();
+      List<ShardDoc> shardDocs = new ArrayList<>();
 
       for (ShardResponse srsp : sreq.responses) {
         SolrDocumentList docs = null;
@@ -460,6 +462,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       }
     }
 
+    @SuppressWarnings({"unchecked"})
     public void merge(ResponseBuilder rb, ShardRequest sreq) {
 
       // id to shard mapping, to eliminate any accidental dups
@@ -478,7 +481,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       long numFound = 0;
       Float maxScore=null;
       boolean partialResults = false;
-      List<ShardDoc> shardDocs = new ArrayList();
+      List<ShardDoc> shardDocs = new ArrayList<>();
 
       for (ShardResponse srsp : sreq.responses) {
         SolrDocumentList docs = null;
@@ -535,8 +538,11 @@ public class RankQueryTestPlugin extends QParserPlugin {
         SortSpec ss = rb.getSortSpec();
         Sort sort = ss.getSort();
 
+        @SuppressWarnings({"rawtypes"})
         NamedList sortFieldValues = (NamedList)(srsp.getSolrResponse().getResponse().get("merge_values"));
+        @SuppressWarnings({"rawtypes"})
         NamedList unmarshalledSortFieldValues = unmarshalSortValues(ss, sortFieldValues, schema);
+        @SuppressWarnings({"rawtypes"})
         List lst = (List)unmarshalledSortFieldValues.getVal(0);
 
         for (int i=0; i<docs.size(); i++) {
@@ -614,6 +620,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       }
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     private NamedList unmarshalSortValues(SortSpec sortSpec,
                                           NamedList sortFieldValues,
                                           IndexSchema schema) {
@@ -657,11 +664,13 @@ public class RankQueryTestPlugin extends QParserPlugin {
   }
 
 
+  @SuppressWarnings({"rawtypes"})
   static class TestCollector extends TopDocsCollector {
 
-    private List<ScoreDoc> list = new ArrayList();
+    private List<ScoreDoc> list = new ArrayList<>();
 
-    public TestCollector(PriorityQueue pq) {
+    @SuppressWarnings({"unchecked"})
+    public TestCollector(@SuppressWarnings({"rawtypes"})PriorityQueue pq) {
       super(pq);
     }
 
@@ -690,6 +699,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       return list.size();
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public TopDocs topDocs() {
       Collections.sort(list, new Comparator() {
         public int compare(Object o1, Object o2) {
@@ -722,11 +732,13 @@ public class RankQueryTestPlugin extends QParserPlugin {
     }
   }
 
+  @SuppressWarnings({"rawtypes"})
   static class TestCollector1 extends TopDocsCollector {
 
-    private List<ScoreDoc> list = new ArrayList();
+    private List<ScoreDoc> list = new ArrayList<>();
 
-    public TestCollector1(PriorityQueue pq) {
+    @SuppressWarnings({"unchecked"})
+    public TestCollector1(@SuppressWarnings({"rawtypes"})PriorityQueue pq) {
       super(pq);
     }
 
@@ -752,6 +764,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
       return list.size();
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public TopDocs topDocs() {
       Collections.sort(list, new Comparator() {
         public int compare(Object o1, Object o2) {
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index 177242a..cec08b5 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -283,8 +283,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
   @Test
   public void testMergeBoost() throws Exception {
 
-    Set<Integer> boosted = new HashSet();
-    Set<Integer> results = new HashSet();
+    Set<Integer> boosted = new HashSet<>();
+    Set<Integer> results = new HashSet<>();
 
     for(int i=0; i<200; i++) {
       boosted.add(random().nextInt(1000));
@@ -314,7 +314,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
 
     CollapsingQParserPlugin.MergeBoost mergeBoost = new CollapsingQParserPlugin.MergeBoost(boostedArray);
 
-    List<Integer> boostedResults = new ArrayList();
+    List<Integer> boostedResults = new ArrayList<>();
 
     for(int i=0; i<resultsArray.length; i++) {
       int result = resultsArray[i];
@@ -323,7 +323,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
       }
     }
 
-    List<Integer> controlResults = new ArrayList();
+    List<Integer> controlResults = new ArrayList<>();
 
     for(int i=0; i<resultsArray.length; i++) {
       int result = resultsArray[i];
diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 230f011..53c9a97 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -1819,6 +1819,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
         , "/response/numFound==1"
     );
 
+    @SuppressWarnings({"rawtypes"})
     Map all = (Map) Utils.fromJSONString(h.query(req("q", "*:*", "rows", "0", "wt", "json")));
     int totalDocs = Integer.parseInt(((Map)all.get("response")).get("numFound").toString());
     int allDocsExceptOne = totalDocs - 1;
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index fe9dbac..97b9952 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -118,6 +118,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
 
 
   @Test
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testHashPartition() throws Exception {
 
 
@@ -303,7 +304,9 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
   }
 
 
-  private void assertNoOverLap(Set setA, Set setB) throws Exception {
+  private void assertNoOverLap(@SuppressWarnings({"rawtypes"})Set setA,
+                               @SuppressWarnings({"rawtypes"})Set setB) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     Iterator it =  setA.iterator();
     while(it.hasNext()) {
       Object o = it.next();
diff --git a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
index 457129f..a6c3a0e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
+++ b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
@@ -83,9 +83,11 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
     assertU((commit()));
   }
 
+  @SuppressWarnings({"unchecked"})
   private String getStringVal(SolrQueryRequest sqr, String field, int doc) throws IOException {
     SchemaField sf = sqr.getSchema().getField(field);
     ValueSource vs = sf.getType().getValueSource(sf, null);
+    @SuppressWarnings({"rawtypes"})
     Map context = ValueSource.newContext(sqr.getSearcher());
     vs.createWeight(context, sqr.getSearcher());
     IndexReaderContext topReaderContext = sqr.getSearcher().getTopReaderContext();
@@ -138,6 +140,7 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
     assertEquals(1, baseRefCount);
 
     Map<String, Metric> metrics = h.getCore().getCoreMetricManager().getRegistry().getMetrics();
+    @SuppressWarnings({"unchecked"})
     Gauge<Date> g = (Gauge<Date>)metrics.get("SEARCHER.searcher.registeredAt");
     Date sr3SearcherRegAt = g.getValue();
     assertU(commit()); // nothing has changed
@@ -247,6 +250,7 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
       addDummyDoc(newCore);
       
       // Open a new searcher, this should call the newSearcherListeners
+      @SuppressWarnings({"rawtypes"})
       Future<?>[] future = new Future[1];
       newCore.getSearcher(true, false, future);
       future[0].get();
@@ -435,7 +439,7 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
     static AtomicInteger numberOfTimesCalledFirstSearcher;
 
     @Override
-    public void init(NamedList args) {}
+    public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
 
     @Override
     public void postCommit() {}
@@ -459,7 +463,7 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
     static CountDownLatch latch;
     
     @Override
-    public void init(NamedList args) {}
+    public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
 
     @Override
     public void postCommit() {}
diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
index 1800ddb..3f99fa6 100644
--- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
@@ -48,6 +48,7 @@ public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
     assertEquals(new BoostQuery(new TermQuery(new Term("text", "foo")), 3f), q);
 
     q = parse("price:[0 TO 10]");
+    @SuppressWarnings({"rawtypes"})
     Class expected = LegacyNumericRangeQuery.class;
     if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) {
       expected = PointRangeQuery.class;
diff --git a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
index 8020fc4..30cb450 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
@@ -715,7 +715,9 @@ public class TestRealTimeGet extends TestRTGBase {
               }
 
               String response = h.query(sreq);
+              @SuppressWarnings({"rawtypes"})
               Map rsp = (Map) Utils.fromJSONString(response);
+              @SuppressWarnings({"rawtypes"})
               List doclist = (List)(((Map)rsp.get("response")).get("docs"));
               if (doclist.size() == 0) {
                 // there's no info we can get back with a delete, so not much we can check without further synchronization
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
index f4df24c..4e7e12e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
@@ -234,10 +234,13 @@ public class TestRecovery extends SolrTestCaseJ4 {
 
       assertEquals(UpdateLog.State.REPLAYING, h.getCore().getUpdateHandler().getUpdateLog().getState());
       // check metrics
+      @SuppressWarnings({"unchecked"})
       Gauge<Integer> state = (Gauge<Integer>)metrics.get("TLOG.state");
       assertEquals(UpdateLog.State.REPLAYING.ordinal(), state.getValue().intValue());
+      @SuppressWarnings({"unchecked"})
       Gauge<Integer> replayingLogs = (Gauge<Integer>)metrics.get("TLOG.replay.remaining.logs");
       assertTrue(replayingLogs.getValue().intValue() > 0);
+      @SuppressWarnings({"unchecked"})
       Gauge<Long> replayingDocs = (Gauge<Long>)metrics.get("TLOG.replay.remaining.bytes");
       assertTrue(replayingDocs.getValue().longValue() > 0);
       Meter replayDocs = (Meter)metrics.get("TLOG.replay.ops");
@@ -570,8 +573,10 @@ public class TestRecovery extends SolrTestCaseJ4 {
 
       ulog.bufferUpdates();
       assertEquals(UpdateLog.State.BUFFERING, ulog.getState());
+      @SuppressWarnings({"unchecked"})
       Gauge<Integer> state = (Gauge<Integer>)metrics.get("TLOG.state");
       assertEquals(UpdateLog.State.BUFFERING.ordinal(), state.getValue().intValue());
+      @SuppressWarnings({"unchecked"})
       Gauge<Integer> bufferedOps = (Gauge<Integer>)metrics.get("TLOG.buffered.ops");
       int initialOps = bufferedOps.getValue();
       Meter applyingBuffered = (Meter)metrics.get("TLOG.applyingBuffered.ops");
@@ -1676,17 +1681,22 @@ public class TestRecovery extends SolrTestCaseJ4 {
 
   private static Long getVer(SolrQueryRequest req) throws Exception {
     String response = JQ(req);
+    @SuppressWarnings({"rawtypes"})
     Map rsp = (Map) Utils.fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map doc = null;
     if (rsp.containsKey("doc")) {
       doc = (Map)rsp.get("doc");
     } else if (rsp.containsKey("docs")) {
+      @SuppressWarnings({"rawtypes"})
       List lst = (List)rsp.get("docs");
       if (lst.size() > 0) {
         doc = (Map)lst.get(0);
       }
     } else if (rsp.containsKey("response")) {
+      @SuppressWarnings({"rawtypes"})
       Map responseMap = (Map)rsp.get("response");
+      @SuppressWarnings({"rawtypes"})
       List lst = (List)responseMap.get("docs");
       if (lst.size() > 0) {
         doc = (Map)lst.get(0);
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
index fa146ea..2786aca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
@@ -1001,17 +1001,22 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
 
   private static Long getVer(SolrQueryRequest req) throws Exception {
     String response = JQ(req);
+    @SuppressWarnings({"rawtypes"})
     Map rsp = (Map) Utils.fromJSONString(response);
+    @SuppressWarnings({"rawtypes"})
     Map doc = null;
     if (rsp.containsKey("doc")) {
       doc = (Map)rsp.get("doc");
     } else if (rsp.containsKey("docs")) {
+      @SuppressWarnings({"rawtypes"})
       List lst = (List)rsp.get("docs");
       if (lst.size() > 0) {
         doc = (Map)lst.get(0);
       }
     } else if (rsp.containsKey("response")) {
+      @SuppressWarnings({"rawtypes"})
       Map responseMap = (Map)rsp.get("response");
+      @SuppressWarnings({"rawtypes"})
       List lst = (List)responseMap.get("docs");
       if (lst.size() > 0) {
         doc = (Map)lst.get(0);
diff --git a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java
index 765e984..15b1b32 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java
@@ -77,6 +77,7 @@ public class TestSmileRequest extends SolrTestCaseJ4 {
           query.setPath(path);
         }
         NamedList<Object> rsp = client.request(query);
+        @SuppressWarnings({"rawtypes"})
         Map m = rsp.asMap(5);
         String jsonStr = Utils.toJSONString(m);
         SolrTestCaseHS.matchJSON(jsonStr, tests);
@@ -98,6 +99,7 @@ public class TestSmileRequest extends SolrTestCaseJ4 {
     }
 
     @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public NamedList<Object> processResponse(InputStream body, String encoding) {
       try {
         Map m = (Map) SmileWriterTest.decodeSmile(body);
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
index 0f5f7a1..ff51dde 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
@@ -37,6 +37,7 @@ import org.junit.Test;
 @LuceneTestCase.Slow
 public class TestSolrCachePerf extends SolrTestCaseJ4 {
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private static final Class<? extends SolrCache>[] IMPLS = new Class[] {
       CaffeineCache.class,
       LRUCache.class,
@@ -89,9 +90,11 @@ public class TestSolrCachePerf extends SolrTestCaseJ4 {
 
   static final String VALUE = "foo";
 
+  @SuppressWarnings({"rawtypes"})
   private void doTestGetPutCompute(Map<String, SummaryStatistics> ratioStats, Map<String, SummaryStatistics> timeStats, int numThreads, boolean useCompute) throws Exception {
     for (Class<? extends SolrCache> clazz : IMPLS) {
       SolrMetricManager metricManager = new SolrMetricManager();
+      @SuppressWarnings({"unchecked"})
       SolrCache<String, String> cache = clazz.getDeclaredConstructor().newInstance();
       Map<String, String> params = new HashMap<>();
       params.put("size", "" + NUM_KEYS);
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
index 1fd485f..ede71b4 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
@@ -105,6 +105,7 @@ public class TestSolrJ extends SolrTestCaseJ4 {
     // need a server.close()!!!
   }
 
+  @SuppressWarnings({"unchecked"})
   public static SolrInputDocument getDocument(int docnum) {
     SolrInputDocument doc = new SolrInputDocument();
     doc.setField(idField, docnum );
@@ -120,6 +121,7 @@ public class TestSolrJ extends SolrTestCaseJ4 {
     int golden = (int)2654435761L;
     int h = docnum * golden;
     int n = (h & 0xff) + 1;
+    @SuppressWarnings({"rawtypes"})
     List lst = new ArrayList(n);
     for (int i=0; i<n; i++) {
       h = (h+i) * golden;
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 4205aac..3674fc4 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -1065,6 +1065,7 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
         , "/response/numFound==1"
     );
 
+    @SuppressWarnings({"rawtypes"})
     Map all = (Map) Utils.fromJSONString(h.query(req("q", "*:*", "rows", "0", "wt", "json")));
     int totalDocs = Integer.parseInt(((Map)all.get("response")).get("numFound").toString());
     int allDocsExceptOne = totalDocs - 1;
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
index 2ed7f5c..7e20c79 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
@@ -314,7 +314,9 @@ public class TestStressRecovery extends TestRTGBase {
               }
 
               String response = h.query(sreq);
+              @SuppressWarnings({"rawtypes"})
               Map rsp = (Map) Utils.fromJSONString(response);
+              @SuppressWarnings({"rawtypes"})
               List doclist = (List)(((Map)rsp.get("response")).get("docs"));
               if (doclist.size() == 0) {
                 // there's no info we can get back with a delete, so not much we can check without further synchronization
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
index db3c01f..ed3106e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
@@ -295,7 +295,9 @@ public class TestStressReorder extends TestRTGBase {
               }
 
               String response = h.query(sreq);
+              @SuppressWarnings({"rawtypes"})
               Map rsp = (Map) Utils.fromJSONString(response);
+              @SuppressWarnings({"rawtypes"})
               List doclist = (List)(((Map)rsp.get("response")).get("docs"));
               if (doclist.size() == 0) {
                 // there's no info we can get back with a delete, so not much we can check without further synchronization
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
index a1f4930..b550b17 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
@@ -272,7 +272,9 @@ public class TestStressUserVersions extends TestRTGBase {
               }
 
               String response = h.query(sreq);
+              @SuppressWarnings({"rawtypes"})
               Map rsp = (Map) Utils.fromJSONString(response);
+              @SuppressWarnings({"rawtypes"})
               List doclist = (List)(((Map)rsp.get("response")).get("docs"));
               if (doclist.size() == 0) {
                 // there's no info we can get back with a delete, so not much we can check without further synchronization
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
index fc66846..ff3bf0c 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
@@ -241,7 +241,9 @@ public class TestStressVersions extends TestRTGBase {
               }
 
               String response = h.query(sreq);
+              @SuppressWarnings({"rawtypes"})
               Map rsp = (Map) Utils.fromJSONString(response);
+              @SuppressWarnings({"rawtypes"})
               List doclist = (List)(((Map)rsp.get("response")).get("docs"));
               if (doclist.size() == 0) {
                 // there's no info we can get back with a delete, so not much we can check without further synchronization
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
index 77bfb35..29028b6 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
@@ -50,7 +50,7 @@ class DebugAgg extends AggValueSource {
     }
 
     @Override
-    public void init(NamedList args) {
+    public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     }
   }
 
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
index 0ed8659..6a5cb49 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
@@ -129,6 +129,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
 
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private void sanityCheckIndividualShards() throws Exception {
     // sanity check that our expectations about each shard (non-distrib) are correct
 
@@ -184,6 +185,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
     }
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private void checkRefinementAndOverrequesting() throws Exception {
     // // distributed queries // //
 
@@ -374,6 +376,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
   
   private void checkSubFacetStats(String extraJson) throws Exception {
     String commonJson = "type: terms, " + extraJson;
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList<NamedList> all_facets = (NamedList) queryServer
       ( params( "q", "*:*", "shards", getShardsString(), "rows" , "0", "json.facet",
                 "{ foo : { " + commonJson + " field: foo_s, facet: { " +
@@ -385,8 +388,10 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
     
     assertNotNull(all_facets);
 
-    List<NamedList> foo_buckets = (List) ((NamedList)all_facets.get("foo")).get("buckets");
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    List<NamedList> foo_buckets = (List) (all_facets.get("foo")).get("buckets");
 
+    @SuppressWarnings({"rawtypes"})
     NamedList aaa0_Bucket = foo_buckets.get(0);
     assertEquals(ALL_STATS.size() + 3, aaa0_Bucket.size()); // val,count,facet
     assertEquals("aaa0", aaa0_Bucket.get("val"));
@@ -406,6 +411,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
     assertEquals(284L, aaa0_Bucket.get("unique"));
     assertEquals(284L, aaa0_Bucket.get("hll"));
 
+    @SuppressWarnings({"rawtypes"})
     NamedList tail_Bucket = foo_buckets.get(5);
     assertEquals(ALL_STATS.size() + 3, tail_Bucket.size()); // val,count,facet
     assertEquals("tail", tail_Bucket.get("val"));
@@ -425,8 +431,10 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
     assertEquals(45L, tail_Bucket.get("unique"));
     assertEquals(45L, tail_Bucket.get("hll"));
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List<NamedList> tail_bar_buckets = (List) ((NamedList)tail_Bucket.get("bar")).get("buckets");
    
+    @SuppressWarnings({"rawtypes"})
     NamedList tailB_Bucket = tail_bar_buckets.get(0);
     assertEquals(ALL_STATS.size() + 3, tailB_Bucket.size()); // val,count,skg ... NO SUB FACETS
     assertEquals("tailB", tailB_Bucket.get("val"));
@@ -447,6 +455,7 @@ public class DistributedFacetSimpleRefinementLongTailTest extends BaseDistribute
     assertEquals(6L, tailB_Bucket.get("hll"));
 
     // check the SKG stats on our tailB bucket
+    @SuppressWarnings({"rawtypes"})
     NamedList tailB_skg = (NamedList) tailB_Bucket.get("skg");
     assertEquals(tailB_skg.toString(),
                  3, tailB_skg.size()); 
diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
index 77663df..8e4cd11 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java
@@ -78,6 +78,7 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
    * the array indexes represent values in our numeric field, while the array values
    * track the mapping from string field terms to facet counts for docs that have that numeric value
    */
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private static final Map<String,Integer>[] TERM_MODEL = new Map[NUM_RANGE_VALUES];
   
   @BeforeClass
@@ -138,7 +139,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
 
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
             assertEquals("num buckets", 4, buckets.size());
@@ -170,7 +173,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
         
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -201,7 +206,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
         
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -241,7 +248,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
     
         final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
         try {
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
           
           assertEquals("num buckets", 4, buckets.size());
@@ -269,7 +278,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
     
         final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
         try {
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
           
           assertEquals("num buckets", 2, buckets.size());
@@ -298,7 +309,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
         
         final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
         try {
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
           
           assertEquals("num buckets", 3, buckets.size());
@@ -333,7 +346,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -366,7 +381,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -399,7 +416,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -434,7 +453,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 3, buckets.size());
@@ -481,7 +502,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 2, buckets.size());
@@ -516,7 +539,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
             if (null == expected_mincount_bucket_val) {
@@ -559,7 +584,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
           
           final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
           try {
+            @SuppressWarnings({"unchecked"})
             final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+            @SuppressWarnings({"unchecked"})
             final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
             
             assertEquals("num buckets", 2, buckets.size());
@@ -591,7 +618,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
 
         final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
         try {
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>) rsp.getResponse().get("facets")).get("foo");
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
           assertEquals("num buckets", 4, buckets.size());
@@ -621,7 +650,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
 
         final QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
         try {
+          @SuppressWarnings({"unchecked"})
           final NamedList<Object> foo = ((NamedList<NamedList<Object>>) rsp.getResponse().get("facets")).get("foo");
+          @SuppressWarnings({"unchecked"})
           final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
           assertEquals("num buckets", 4, buckets.size());
@@ -654,7 +685,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
 
       QueryResponse rsp = cluster.getSolrClient().query(solrQuery);
       try {
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+        @SuppressWarnings({"unchecked"})
         final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
         assertEquals("num buckets", 2, buckets.size());
@@ -688,7 +721,9 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
 
       rsp = cluster.getSolrClient().query(solrQuery);
       try {
+        @SuppressWarnings({"unchecked"})
         final NamedList<Object> foo = ((NamedList<NamedList<Object>>)rsp.getResponse().get("facets")).get("foo");
+        @SuppressWarnings({"unchecked"})
         final List<NamedList<Object>> buckets = (List<NamedList<Object>>) foo.get("buckets");
 
         if (null == expected_mincount_bucket_val) {
@@ -727,6 +762,7 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
       assertNotNull("null bucket", actualBucket);
       assertNotNull("expectedRangeValues", expectedRangeValues);
       assertTrue("bucket is not a NamedList", actualBucket instanceof NamedList);
+      @SuppressWarnings({"unchecked"})
       final NamedList<Object> bucket = (NamedList<Object>) actualBucket;
 
       if (null != expectedVal) {
@@ -751,11 +787,13 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
       if (null == subFacetLimitUsed || 0 == expectedCount) {
         assertNull("unexpected subfacets", bucket.get("bar"));
       } else {
+        @SuppressWarnings({"unchecked"})
         NamedList<Object> bar = ((NamedList<Object>)bucket.get("bar"));
         assertNotNull("can't find subfacet 'bar'", bar);
 
         final int numBucketsExpected = subFacetLimitUsed < 0
           ? expectedTermCounts.size() : Math.min(subFacetLimitUsed, expectedTermCounts.size());
+        @SuppressWarnings({"unchecked"})
         final List<NamedList<Object>> subBuckets = (List<NamedList<Object>>) bar.get("buckets");
         // we should either have filled out the expected limit, or 
         assertEquals("num subfacet buckets", numBucketsExpected, subBuckets.size());
@@ -877,7 +915,7 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {
     //
     // NOTE: Don't mix "ALL" or "NONE" with other options so we don't have to make assertBeforeAfterBetween
     // overly complicated
-    ArrayList<EnumSet<FacetRangeOther>> results = new ArrayList(5);
+    ArrayList<EnumSet<FacetRangeOther>> results = new ArrayList<>(5);
     results.add(EnumSet.of(FacetRangeOther.ALL));
     results.add(EnumSet.of(FacetRangeOther.BEFORE, FacetRangeOther.AFTER, FacetRangeOther.BETWEEN));
     results.add(EnumSet.of(FacetRangeOther.BEFORE, FacetRangeOther.AFTER));
diff --git a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
index 5af7bb6..a177767 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
@@ -104,6 +104,7 @@ public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
 
     // ----- Search
     // this test simply has some 0's, nulls, 1's and a 2 in there.
+    @SuppressWarnings({"rawtypes"})
     NamedList hmObj = getHmObj(query(params(baseParams,
         FacetParams.FACET_HEATMAP_GEOM, "[\"50 20\" TO \"180 90\"]",
         FacetParams.FACET_HEATMAP_LEVEL, "4")));
@@ -232,6 +233,7 @@ public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
 
     // ----- Search
     // this test simply has some 0's, nulls, 1's and a 2 in there.
+    @SuppressWarnings({"rawtypes"})
     NamedList hmObj = getHmObj(query(params(baseParams,
         "json.facet", "{f1:{type:heatmap, f:" + FIELD + " geom:'[\"50 20\" TO \"180 90\"]', gridLevel:4}}")));
     List<List<Integer>> counts = (List<List<Integer>>) hmObj.get("counts_ints2D");
@@ -265,8 +267,10 @@ public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
               "q2:{type:query, q:'id:4', " + jsonHeatmap + " } " +
               "}"));
       {
+        @SuppressWarnings({"rawtypes"})
         final NamedList q1Res = (NamedList) response.getResponse().findRecursive("facets", "q1");
         assertEquals("1", q1Res.get("count").toString());
+        @SuppressWarnings({"rawtypes"})
         final NamedList q2Res = (NamedList) response.getResponse().findRecursive("facets", "q2");
         assertEquals("1", q2Res.get("count").toString());
         // essentially, these will differ only in the heatmap counts but otherwise will be the same
@@ -303,6 +307,7 @@ public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
     //good enough for this test method
   }
 
+  @SuppressWarnings({"rawtypes"})
   private NamedList getHmObj(QueryResponse response) {
     // classic faceting
     final NamedList classicResp = (NamedList) response.getResponse().findRecursive("facet_counts", "facet_heatmaps", FIELD);
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.java
index 70f4ad2..4c87746 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
@@ -208,6 +208,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
       SolrException e = expectThrows(SolrException.class, () -> {
           final SolrParams req = params("q", "*:*", "json.facet",
                                         "{ x : { type:terms, field:x_s, domain: { join:"+join+" } } }");
+          @SuppressWarnings({"rawtypes"})
           final NamedList trash = getRandClient(random()).request(new QueryRequest(req));
         });
       assertEquals(join + " -> " + e, SolrException.ErrorCode.BAD_REQUEST.code, e.code());
@@ -440,6 +441,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
 
     QueryResponse rsp = null;
     // JSON Facets not (currently) available from QueryResponse...
+    @SuppressWarnings({"rawtypes"})
     NamedList topNamedList = null;
     try {
       rsp = (new QueryRequest(initParams)).process(getRandClient(random()));
@@ -451,6 +453,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
                                  e.getMessage(), e);
     }
     try {
+      @SuppressWarnings({"rawtypes"})
       final NamedList facetResponse = (NamedList) topNamedList.get("facets");
       assertNotNull("null facet results?", facetResponse);
       assertEquals("numFound mismatch with top count?",
@@ -474,13 +477,15 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
   private void assertFacetCountsAreCorrect(final AtomicInteger maxBucketsToCheck,
                                            final Map<String,TermFacet> expected,
                                            final SolrParams baseParams,
-                                           final NamedList actualFacetResponse) throws SolrServerException, IOException {
+                                           @SuppressWarnings({"rawtypes"})final NamedList actualFacetResponse) throws SolrServerException, IOException {
 
     for (Map.Entry<String,TermFacet> entry : expected.entrySet()) {
       final String facetKey = entry.getKey();
       final TermFacet facet = entry.getValue();
+      @SuppressWarnings({"rawtypes"})
       final NamedList results = (NamedList) actualFacetResponse.get(facetKey);
       assertNotNull(facetKey + " key missing from: " + actualFacetResponse, results);
+      @SuppressWarnings({"unchecked", "rawtypes"})
       final List<NamedList> buckets = (List<NamedList>) results.get("buckets");
       assertNotNull(facetKey + " has null buckets: " + actualFacetResponse, buckets);
 
@@ -492,7 +497,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
                      0, docsWithField);
       }
       
-      for (NamedList bucket : buckets) {
+      for (@SuppressWarnings({"rawtypes"})NamedList bucket : buckets) {
         final long count = ((Number) bucket.get("count")).longValue();
         final String fieldVal = bucket.get("val").toString(); // int or stringified int
 
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.java
index 08ce3ba..0992af8 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
@@ -371,6 +371,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
 
     QueryResponse rsp = null;
     // JSON Facets not (currently) available from QueryResponse...
+    @SuppressWarnings({"rawtypes"})
     NamedList topNamedList = null;
     try {
       rsp = (new QueryRequest(initParams)).process(getRandClient(random()));
@@ -382,6 +383,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
                                  e.getMessage(), e);
     }
     try {
+      @SuppressWarnings({"rawtypes"})
       final NamedList facetResponse = (NamedList) topNamedList.get("facets");
       assertNotNull("null facet results?", facetResponse);
       assertEquals("numFound mismatch with top count?",
@@ -404,15 +406,17 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
    * Recursive helper method that walks the actual facet response, comparing the SKG results to 
    * the expected output based on the equivalent filters generated from the original TermFacet.
    */
+  @SuppressWarnings({"unchecked"})
   private void assertFacetSKGsAreCorrect(final AtomicInteger maxBucketsToCheck,
                                          final Map<String,TermFacet> expected,
                                          final SolrParams baseParams,
-                                         final NamedList actualFacetResponse) throws SolrServerException, IOException {
+                                         @SuppressWarnings({"rawtypes"})final NamedList actualFacetResponse) throws SolrServerException, IOException {
 
     for (Map.Entry<String,TermFacet> entry : expected.entrySet()) {
       final String facetKey = entry.getKey();
       final TermFacet facet = entry.getValue();
       
+      @SuppressWarnings({"rawtypes"})
       final NamedList results = (NamedList) actualFacetResponse.get(facetKey);
       assertNotNull(facetKey + " key missing from: " + actualFacetResponse, results);
 
@@ -424,6 +428,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
                      Collections.emptyList(),
                      ((NamedList)results.get("allBuckets")).getAll("skg"));
       }
+      @SuppressWarnings({"rawtypes"})
       final List<NamedList> buckets = (List<NamedList>) results.get("buckets");
       assertNotNull(facetKey + " has null buckets: " + actualFacetResponse, buckets);
 
@@ -441,7 +446,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
       // NOTE: it's important that we do this depth first -- not just because it's the easiest way to do it,
       // but because it means that our maxBucketsToCheck will ensure we do a lot of deep sub-bucket checking,
       // not just all the buckets of the top level(s) facet(s)
-      for (NamedList bucket : buckets) {
+      for (@SuppressWarnings({"rawtypes"})NamedList bucket : buckets) {
         final String fieldVal = bucket.get("val").toString(); // int or stringified int
 
         verifySKGResults(facetKey, facet, baseParams, fieldVal, bucket);
@@ -461,6 +466,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
     
     { // make sure we don't have any facet keys we don't expect
       // a little hackish because subfacets have extra keys...
+      @SuppressWarnings({"rawtypes"})
       final LinkedHashSet expectedKeys = new LinkedHashSet(expected.keySet());
       expectedKeys.add("count");
       if (0 <= actualFacetResponse.indexOf("val",0)) {
@@ -484,6 +490,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
     throws SolrServerException, IOException {
 
     final String bucketQ = facet.field+":"+fieldVal;
+    @SuppressWarnings({"unchecked"})
     final NamedList<Object> skgBucket = (NamedList<Object>) bucket.get("skg");
     assertNotNull(facetKey + "/bucket:" + bucket.toString(), skgBucket);
 
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.java
index b3793c2..cab7df4 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
@@ -290,10 +290,12 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
     try {
       final QueryResponse rsp = (new QueryRequest(params)).process(getRandClient(random()));
       assertNotNull(params + " is null rsp?", rsp);
+      @SuppressWarnings({"rawtypes"})
       final NamedList topNamedList = rsp.getResponse();
       assertNotNull(params + " is null topNamedList?", topNamedList);
       
       // skip past the (implicit) top Facet query to get it's "sub-facets" (the real facets)...
+      @SuppressWarnings({"unchecked"})
       final List<NamedList<Object>> facetDebug =
         (List<NamedList<Object>>) topNamedList.findRecursive("debug", "facet-trace", "sub-facet");
       assertNotNull(topNamedList + " ... null facet debug?", facetDebug);
@@ -515,12 +517,14 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
     try {
 
       // start by recording the results of the purely "default" behavior...
+      @SuppressWarnings({"rawtypes"})
       final NamedList expected = getFacetResponse(basicParams);
 
       // now loop over all processors and compare them to the "default"...
       for (FacetMethod method : EnumSet.allOf(FacetMethod.class)) {
         ModifiableSolrParams options = params("method_val", method.toString().toLowerCase(Locale.ROOT));
           
+        @SuppressWarnings({"rawtypes"})
         final NamedList actual = getFacetResponse(SolrParams.wrapAppended(options, basicParams));
 
         // we can't rely on a trivial assertEquals() comparison...
@@ -550,6 +554,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
    * We ignore {@link QueryResponse#getJsonFacetingResponse()} because it isn't as useful for
    * doing a "deep equals" comparison across requests
    */
+  @SuppressWarnings({"rawtypes"})
   private NamedList getFacetResponse(final SolrParams params) {
     try {
       final QueryResponse rsp = (new QueryRequest(params)).process(getRandClient(random()));
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
index 1d844e6..1112f0b 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
@@ -118,11 +118,13 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {
     JSONParser parser = new JSONParser(json);
     ObjectBuilder ob = new ObjectBuilder(parser) {
       @Override
+      @SuppressWarnings({"rawtypes"})
       public Object newObject() throws IOException {
         return new SimpleOrderedMap();
       }
 
       @Override
+      @SuppressWarnings({"unchecked", "rawtypes"})
       public void addKeyVal(Object map, Object key, Object val) throws IOException {
         ((SimpleOrderedMap) map).add(key.toString(), val);
       }
@@ -136,6 +138,7 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {
     try {
       int nShards = responsesAndTests.length / 2;
       Object jsonFacet = Utils.fromJSONString(facet);
+      @SuppressWarnings({"rawtypes"})
       FacetParser parser = new FacetParser.FacetTopParser(req);
       FacetRequest facetRequest = parser.parse(jsonFacet);
 
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
index 886ad02..24ca10f 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetsStatsParsing.java
@@ -58,6 +58,7 @@ public class TestJsonFacetsStatsParsing extends SolrTestCaseJ4 {
       
       // NOTE: we don't bother trying to test 'min(foo_i)' because of SOLR-12559
       // ...once that bug is fixed, several assertions below will need to change
+      @SuppressWarnings({"unchecked"})
       final FacetRequest fr = FacetRequest.parse
         (req, (Map<String,Object>) Utils.fromJSONString
          ("{ " +
@@ -98,6 +99,7 @@ public class TestJsonFacetsStatsParsing extends SolrTestCaseJ4 {
     }
   }
 
+  @SuppressWarnings({"unchecked"})
   public void testVerboseSyntaxWithLocalParams() throws IOException {
     // some parsers may choose to use "global" req params as defaults/shadows for
     // local params, but DebugAgg does not -- so use these to test that the
diff --git a/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java b/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
index 72e2cc6..e9d9453 100644
--- a/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
+++ b/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
@@ -70,7 +70,7 @@ public class NvlValueSourceParser extends ValueSourceParser {
     }
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     /* initialize the value to consider as null */
     Float nvlFloatValueArg = (Float) args.get("nvlFloatValue");
     if (nvlFloatValueArg != null) {
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index f273ba5..8993b25 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -416,6 +416,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
 
   public void testRandom() throws Exception {
 
+    @SuppressWarnings({"rawtypes"})
     Comparable[] vals = new Comparable[TestUtil.nextInt(random(), 1, 17)];
 
     // random ints
@@ -532,17 +533,20 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
   }
   
   /** Tests a single doc with a few explicit values, as well as testing exists with and w/o values */
-  protected void testSimpleValues(final String fieldname, final Class<?> clazz, final Comparable... vals) {
+  @SuppressWarnings({"unchecked"})
+  protected void testSimpleValues(final String fieldname, final Class<?> clazz,
+                                  @SuppressWarnings({"rawtypes"})final Comparable... vals) {
     clearIndex();
     
     assert 0 < vals.length;
-    
+    @SuppressWarnings({"rawtypes"})
     Comparable min = vals[0];
+    @SuppressWarnings({"rawtypes"})
     Comparable max = vals[0];
     
     final String type = clazz.getName();
     final SolrInputDocument doc1 = sdoc("id", "1");
-    for (Comparable v : vals) {
+    for (@SuppressWarnings({"rawtypes"})Comparable v : vals) {
       doc1.addField(fieldname, v);
       if (0 < min.compareTo(v)) {
         min = v;
@@ -610,7 +614,8 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
    * @param positive a "positive" value for this field (ie: in a function context, is more then the "0")
    */
   protected void testSimpleSort(final String fieldname,
-                                final Comparable negative, final Comparable positive) {
+                                @SuppressWarnings({"rawtypes"})final Comparable negative,
+                                @SuppressWarnings({"rawtypes"})final Comparable positive) {
     clearIndex();
 
     int numDocsExpected = 1;
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java
index 04b8ed5..8ecd198 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java
@@ -107,8 +107,8 @@ public class TestCloudNestedDocsSort extends SolrCloudTestCase {
           final boolean canPickMatchingChild = !chVals.isEmpty() && !parentFilter.isEmpty();
           final boolean haveNtPickedMatchingChild = matchingParent==null ||matchingChild==null;
           if (canPickMatchingChild && haveNtPickedMatchingChild && usually()) {
-            matchingParent = (String) parentFilter.iterator().next();
-            matchingChild = (String) chVals.iterator().next();
+            matchingParent = parentFilter.iterator().next();
+            matchingChild = chVals.iterator().next();
           }
         }
         maxDocs += parent.getChildDocumentCount()+1;
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java b/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
index 8c7ee2a..e8081a8 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestNestedDocsSort.java
@@ -123,6 +123,7 @@ public class TestNestedDocsSort extends SolrTestCaseJ4 {
     public void testCachehits(){
       final SolrQueryRequest req = req();
       try {
+        @SuppressWarnings({"rawtypes"})
         final SolrCache cache = req.getSearcher().getCache("perSegFilter");
         assertNotNull(cache);
         final Map<String,Object> state = cache.getMetricsSnapshot();
diff --git a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
index f6968c5..3de8049 100644
--- a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
@@ -162,6 +162,7 @@ public class CloudMLTQParserTest extends SolrCloudTestCase {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testMinDF() throws Exception {
 
     QueryResponse queryResponse = cluster.getSolrClient().query(COLLECTION,
diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
index 6459459..c05b176 100644
--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
@@ -162,7 +162,7 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
     gate.release(preShutdownEventsAllowed);
     runThreeTestAdminCommands();
 
-    final List<AuditEvent> events = new ArrayList
+    final List<AuditEvent> events = new ArrayList<>
       (harness.receiver.waitForAuditEvents(preShutdownEventsAllowed));
     assertEquals(preShutdownEventsAllowed, events.size());
 
diff --git a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
index 43ff9a8..e52b09a 100644
--- a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
@@ -62,6 +62,7 @@ import static org.apache.solr.common.util.Utils.makeMap;
  */
 @SuppressWarnings("unchecked")
 public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
+  @SuppressWarnings({"rawtypes"})
   protected Map rules;
 
   final int STATUS_OK = 200;
@@ -464,6 +465,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
     assertEquals("admin", perms.getVal("permissions[0]/role"));
     perms.runCmd("{set-permission : {name: config-edit, role: [admin, dev], index:2 } }", false);
     perms.runCmd("{set-permission : {name: config-edit, role: [admin, dev], index:1}}", true);
+    @SuppressWarnings({"rawtypes"})
     Collection roles = (Collection) perms.getVal("permissions[0]/role");
     assertEquals(2, roles.size());
     assertTrue(roles.contains("admin"));
@@ -484,15 +486,18 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
   }
 
   static class  Perms {
+    @SuppressWarnings({"rawtypes"})
     Map conf =  new HashMap<>();
     ConfigEditablePlugin plugin = new RuleBasedAuthorizationPlugin();
     List<CommandOperation> parsedCommands;
 
     public void runCmd(String cmds, boolean failOnError) throws IOException {
       parsedCommands = CommandOperation.parse(new StringReader(cmds));
+      @SuppressWarnings({"rawtypes"})
       LinkedList ll = new LinkedList();
       Map<String, Object> edited = plugin.edit(conf, parsedCommands);
       if(edited!= null) conf = edited;
+      @SuppressWarnings({"rawtypes"})
       List<Map> maps = captureErrors(parsedCommands);
       if(failOnError){
         assertTrue("unexpected error ,"+maps , maps.isEmpty());
@@ -553,6 +558,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
     }
 
     @Override
+    @SuppressWarnings({"rawtypes"})
     public Enumeration getHeaderNames() {
       return null;
     }
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index 96dbcdc..ebfdb22 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -138,6 +138,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
           "'set-user': {'harry':'HarryIsCool'}\n" +
           "}";
 
+      @SuppressWarnings({"rawtypes"})
       final SolrRequest genericReq;
       if (isUseV2Api) {
         genericReq = new V2Request.Builder("/cluster/security/authentication").withMethod(SolrRequest.METHOD.POST).build();
@@ -255,6 +256,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
       try {
         System.setProperty("basicauth", "harry:HarryIsUberCool");
         tool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(tool.getOptions()), toolArgs));
+        @SuppressWarnings({"rawtypes"})
         Map obj = (Map) Utils.fromJSON(new ByteArrayInputStream(baos.toByteArray()));
         assertTrue(obj.containsKey("version"));
         assertTrue(obj.containsKey("startTime"));
@@ -319,6 +321,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
   }
 
   private QueryResponse executeQuery(ModifiableSolrParams params, String user, String pass) throws IOException, SolrServerException {
+    @SuppressWarnings({"rawtypes"})
     SolrRequest req = new QueryRequest(params);
     req.setBasicAuthCredentials(user, pass);
     QueryResponse resp = (QueryResponse) req.process(cluster.getSolrClient(), COLLECTION);
diff --git a/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java b/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
index bd1818e..30badf1 100644
--- a/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/HttpParamDelegationTokenPlugin.java
@@ -191,7 +191,7 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {
     @Override
     public void init(Properties config) throws ServletException {
       Properties conf = new Properties();
-      for (Map.Entry entry : config.entrySet()) {
+      for (@SuppressWarnings({"rawtypes"})Map.Entry entry : config.entrySet()) {
         conf.setProperty((String) entry.getKey(), (String) entry.getValue());
       }
       conf.setProperty(TOKEN_KIND, KerberosPlugin.DELEGATION_TOKEN_TYPE_DEFAULT);
diff --git a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
index 998ec4a..af87d59 100644
--- a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
+++ b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
@@ -65,9 +65,11 @@ public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {
   private KeyHolder k4;
   private KeyHolder k5;
   private List<JsonWebKey> keysToReturnFromSecondJwk;
+  @SuppressWarnings({"rawtypes"})
   private Iterator refreshSequenceForSecondJwk;
 
   @Before
+  @SuppressWarnings({"unchecked"})
   public void setUp() throws Exception {
     super.setUp();
     k1 = new KeyHolder("k1");
diff --git a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java
index e2dda3e..69de1de 100644
--- a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java
+++ b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java
@@ -88,6 +88,7 @@ public class TestAuthorizationFramework extends AbstractFullDistribZkTestBase {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   public static void verifySecurityStatus(HttpClient cl, String url, String objPath, Object expected, int count) throws Exception {
     boolean success = false;
     String s = null;
@@ -95,10 +96,12 @@ public class TestAuthorizationFramework extends AbstractFullDistribZkTestBase {
     for (int i = 0; i < count; i++) {
       HttpGet get = new HttpGet(url);
       s = EntityUtils.toString(cl.execute(get, HttpClientUtil.createNewHttpClientRequestContext()).getEntity());
+      @SuppressWarnings({"rawtypes"})
       Map m = (Map) Utils.fromJSONString(s);
 
       Object actual = Utils.getObjectByPath(m, true, hierarchy);
       if (expected instanceof Predicate) {
+        @SuppressWarnings({"rawtypes"})
         Predicate predicate = (Predicate) expected;
         if (predicate.test(actual)) {
           success = true;
diff --git a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java
index 26c3597..653d77b 100644
--- a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java
+++ b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java
@@ -33,8 +33,10 @@ public class TestSha256AuthenticationProvider extends SolrTestCaseJ4 {
 
     String pwd = "My#$Password";
     String user = "noble";
+    @SuppressWarnings({"rawtypes"})
     Map latestConf = new LinkedHashMap<>();
     Map<String, Object> params = singletonMap(user, pwd);
+    @SuppressWarnings({"unchecked"})
     Map<String, Object> result = zkAuthenticationProvider.edit(latestConf,
         Collections.singletonList(new CommandOperation("set-user",params )));
     zkAuthenticationProvider = new Sha256AuthenticationProvider();
@@ -46,10 +48,12 @@ public class TestSha256AuthenticationProvider extends SolrTestCaseJ4 {
 
   }
 
+  @SuppressWarnings({"unchecked"})
   public void testBasicAuthCommands() throws IOException {
     try (BasicAuthPlugin basicAuthPlugin = new BasicAuthPlugin()) {
       basicAuthPlugin.init(Collections.emptyMap());
 
+      @SuppressWarnings({"rawtypes"})
       Map latestConf = new LinkedHashMap<>();
 
       CommandOperation blockUnknown = new CommandOperation("set-property", singletonMap("blockUnknown", true));
diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java b/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java
index 00c2b71..f1ffe1d 100644
--- a/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java
+++ b/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java
@@ -50,6 +50,7 @@ public class ImpersonationUtil {
     return group;
   }
 
+  @SuppressWarnings({"rawtypes"})
   static SolrRequest getProxyRequest(String user, String doAs) {
     return new CollectionAdminRequest.List() {
       @Override
diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
index 500f8ad..0a10429 100644
--- a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
+++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
@@ -150,6 +150,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
     assertEquals("Did not receieve excepted status code", expectedStatusCode, lastStatusCode);
   }
 
+  @SuppressWarnings({"rawtypes"})
   private SolrRequest getAdminRequest(final SolrParams params) {
     return new CollectionAdminRequest.List() {
       @Override
@@ -161,6 +162,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
     };
   }
 
+  @SuppressWarnings({"unchecked"})
   private int getStatusCode(String token, final String user, final String op, HttpSolrClient client)
   throws Exception {
     SolrClient delegationTokenClient;
@@ -181,6 +183,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
       ModifiableSolrParams p = new ModifiableSolrParams();
       if (user != null) p.set(PseudoAuthenticator.USER_NAME, user);
       if (op != null) p.set("op", op);
+      @SuppressWarnings({"rawtypes"})
       SolrRequest req = getAdminRequest(p);
       if (user != null || op != null) {
         Set<String> queryParams = new HashSet<>();
@@ -199,7 +202,8 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
     }
   }
 
-  private void doSolrRequest(SolrClient client, SolrRequest request,
+  private void doSolrRequest(SolrClient client,
+                             @SuppressWarnings({"rawtypes"})SolrRequest request,
       int expectedStatusCode) throws Exception {
     try {
       client.request(request);
@@ -367,6 +371,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
     String token = getDelegationToken(null, USER_1, primarySolrClient);
     assertNotNull(token);
 
+    @SuppressWarnings({"rawtypes"})
     SolrRequest request = getAdminRequest(new ModifiableSolrParams());
 
     // test without token
diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java
index 8846652..481e0d8 100644
--- a/solr/core/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java
+++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java
@@ -85,6 +85,7 @@ public class TestZkAclsWithHadoopAuth extends SolrCloudTestCase {
   }
 
   @Test
+  @SuppressWarnings({"try"})
   public void testZkAcls() throws Exception {
     try (ZooKeeper keeper = new ZooKeeper(cluster.getZkServer().getZkAddress(),
         (int) TimeUnit.MINUTES.toMillis(1), arg0 -> {/* Do nothing */})) {
diff --git a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
index bc2aa19..3a76690 100644
--- a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
@@ -126,6 +126,7 @@ public class SolrRequestParserTest extends SolrTestCaseJ4 {
   }
   
   @Test
+  @SuppressWarnings({"try"})
   public void testStreamURL() throws Exception
   {
     URL url = getClass().getResource("/README");
@@ -149,6 +150,7 @@ public class SolrRequestParserTest extends SolrTestCaseJ4 {
   }
   
   @Test
+  @SuppressWarnings({"try"})
   public void testStreamFile() throws Exception
   {
     File file = getFile("README");
diff --git a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java
index 53d142d..c1a9731 100644
--- a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java
+++ b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java
@@ -94,17 +94,22 @@ public class CdcrUpdateLogTest extends SolrTestCaseJ4 {
   }
 
   private static Long getVer(SolrQueryRequest req) throws Exception {
+    @SuppressWarnings({"rawtypes"})
     Map rsp = (Map) fromJSONString(JQ(req));
+    @SuppressWarnings({"rawtypes"})
     Map doc = null;
     if (rsp.containsKey("doc")) {
       doc = (Map) rsp.get("doc");
     } else if (rsp.containsKey("docs")) {
+      @SuppressWarnings({"rawtypes"})
       List lst = (List) rsp.get("docs");
       if (lst.size() > 0) {
         doc = (Map) lst.get(0);
       }
     } else if (rsp.containsKey("response")) {
+      @SuppressWarnings({"rawtypes"})
       Map responseMap = (Map) rsp.get("response");
+      @SuppressWarnings({"rawtypes"})
       List lst = (List) responseMap.get("docs");
       if (lst.size() > 0) {
         doc = (Map) lst.get(0);
@@ -140,6 +145,7 @@ public class CdcrUpdateLogTest extends SolrTestCaseJ4 {
     Object o = reader.next();
     assertNotNull(o);
 
+    @SuppressWarnings({"rawtypes"})
     List entry = (List) o;
     int opAndFlags = (Integer) entry.get(0);
     assertEquals(UpdateLog.COMMIT, opAndFlags & UpdateLog.OPERATION_MASK);
@@ -203,6 +209,7 @@ public class CdcrUpdateLogTest extends SolrTestCaseJ4 {
     assertTrue(reader1.seek(targetVersion));
     Object o = reader1.next();
     assertNotNull(o);
+    @SuppressWarnings({"rawtypes"})
     List entry = (List) o;
     long version = (Long) entry.get(1);
 
@@ -579,6 +586,7 @@ public class CdcrUpdateLogTest extends SolrTestCaseJ4 {
     subReader.close();
 
     // After fast forward, the parent reader should be position on the doc15
+    @SuppressWarnings({"rawtypes"})
     List o = (List) reader.next();
     assertNotNull(o);
     assertTrue("Expected SolrInputDocument but got" + o.toString() ,o.get(3) instanceof SolrInputDocument);
diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
index f3d32ba..b3d3a5c 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
@@ -100,6 +100,7 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
 
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testBasics() throws Exception {
 
     // get initial metrics
@@ -466,7 +467,7 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
     }
 
     @Override
-    public void init(NamedList args) {
+    public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
 
     }
   }
diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
index 30e9141..0449224 100644
--- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
@@ -247,7 +247,7 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
     private StringBuffer fail = new StringBuffer();
     
     @Override
-    public void init(NamedList args) {}
+    public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
     
     @Override
     public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
diff --git a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
index c269c9e..bfa6221 100644
--- a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
+++ b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
@@ -69,7 +69,7 @@ public class MockStreamingSolrClients extends StreamingSolrClients {
     }
     
     @Override
-    public NamedList<Object> request(SolrRequest request, String collection)
+    public NamedList<Object> request(@SuppressWarnings({"rawtypes"})SolrRequest request, String collection)
         throws SolrServerException, IOException {
       if (exp != null) {
         Exception e = exception();
diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
index c9aded7..0046c12 100644
--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
@@ -37,6 +37,7 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
 
   private volatile Exp exp = null;
   private boolean oneExpPerReq;
+  @SuppressWarnings({"rawtypes"})
   private Set<SolrRequest> reqGotException;
 
   public MockingHttp2SolrClient(String baseSolrUrl, Builder builder) {
@@ -85,7 +86,8 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
   }
 
   @Override
-  public NamedList<Object> request(SolrRequest request, String collection)
+  public NamedList<Object> request(@SuppressWarnings({"rawtypes"})SolrRequest request,
+                                   String collection)
       throws SolrServerException, IOException {
     if (request instanceof UpdateRequest) {
       UpdateRequest ur = (UpdateRequest) request;
@@ -118,7 +120,8 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
     return super.request(request, collection);
   }
 
-  public NamedList<Object> request(SolrRequest request, String collection, OnComplete onComplete)
+  public NamedList<Object> request(@SuppressWarnings({"rawtypes"})SolrRequest request,
+                                   String collection, OnComplete onComplete)
       throws SolrServerException, IOException {
     if (request instanceof UpdateRequest) {
       UpdateRequest ur = (UpdateRequest) request;
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
index 9e6fd60..54e816c 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
@@ -338,6 +338,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
 
   void assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "sync", StrUtils.join(Arrays.asList(syncWith), ',')));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     assertEquals(expectedResult, (Boolean) rsp.get("sync"));
   }
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
index eff120d..f836816 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
@@ -216,6 +216,7 @@ public class PeerSyncWithBufferUpdatesTest  extends BaseDistributedSearchTestCas
 
   void assertSync(SolrClient client, int numVersions, boolean expectedResult, String syncWith) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "syncWithLeader", syncWith));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     assertEquals(expectedResult, (Boolean) rsp.get("syncWithLeader"));
   }
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
index 9617ff2..9bece14 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java
@@ -95,12 +95,14 @@ public class PeerSyncWithIndexFingerprintCachingTest extends BaseDistributedSear
 
   IndexFingerprint getFingerprint(SolrClient client, long maxVersion) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getFingerprint",Long.toString(maxVersion)));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     return IndexFingerprint.fromObject(rsp.get("fingerprint"));
   }
 
   void assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "sync", StrUtils.join(Arrays.asList(syncWith), ',')));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     assertEquals(expectedResult, (Boolean) rsp.get("sync"));
   }
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderAndIndexFingerprintCachingTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderAndIndexFingerprintCachingTest.java
index aa66818..3b386f4 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderAndIndexFingerprintCachingTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderAndIndexFingerprintCachingTest.java
@@ -30,6 +30,7 @@ public class PeerSyncWithLeaderAndIndexFingerprintCachingTest extends PeerSyncWi
   @Override
   void assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "syncWithLeader", StrUtils.join(Arrays.asList(syncWith), ',')));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     assertEquals(expectedResult, (Boolean) rsp.get("syncWithLeader"));
   }
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java
index f1c7f69..414d043 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java
@@ -51,6 +51,7 @@ public class PeerSyncWithLeaderTest extends PeerSyncTest {
   @Override
   void assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {
     QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "syncWithLeader", StrUtils.join(Arrays.asList(syncWith), ',')));
+    @SuppressWarnings({"rawtypes"})
     NamedList rsp = client.request(qr);
     assertEquals(expectedResult, (Boolean) rsp.get("syncWithLeader"));
   }
diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
index 59d5048..9c0f847 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -554,7 +554,7 @@ class MockEventListener implements SolrEventListener {
   public MockEventListener() { /* NOOP */ }
   
   @Override
-  public void init(NamedList args) {}
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
   
   @Override
   public void newSearcher(SolrIndexSearcher newSearcher,
diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
index 36c511f..77f5a89 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -302,7 +302,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {
         try (SolrCore core = cores.getCore("collection1")) {
           core.getUpdateHandler().registerCommitCallback(new SolrEventListener() {
             @Override
-            public void init(NamedList args) {
+            public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
             }
 
             @Override
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index 3831100..cd3f874 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -648,7 +648,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
     assertTrue("Earlier: "+docids+", now: "+getInternalDocIds("100"), docids.equals(getInternalDocIds("100")));
     
     SolrDocument sdoc = LEADER.getById("100");  // RTG straight from the index
-    assertEquals(sdoc.toString(), (float) inplace_updatable_float, sdoc.get("inplace_updatable_float"));
+    assertEquals(sdoc.toString(), inplace_updatable_float, sdoc.get("inplace_updatable_float"));
     assertEquals(sdoc.toString(), title, sdoc.get("title_s"));
     assertEquals(sdoc.toString(), version, sdoc.get("_version_"));
 
@@ -659,7 +659,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
       version = currentVersion;
 
       sdoc = LEADER.getById("100");  // RTG from the tlog
-      assertEquals(sdoc.toString(), (float) inplace_updatable_float, sdoc.get("inplace_updatable_float"));
+      assertEquals(sdoc.toString(), inplace_updatable_float, sdoc.get("inplace_updatable_float"));
       assertEquals(sdoc.toString(), title, sdoc.get("title_s"));
       assertEquals(sdoc.toString(), version, sdoc.get("_version_"));
 
@@ -689,8 +689,8 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
       final String clientDebug = client.toString() + (LEADER.equals(client) ? " (leader)" : " (not leader)");
       sdoc = client.getById("100", params("distrib", "false"));
 
-      assertEquals(clientDebug + " => "+ sdoc, (int) 100, sdoc.get("inplace_updatable_int"));
-      assertEquals(clientDebug + " => "+ sdoc, (float) inplace_updatable_float, sdoc.get("inplace_updatable_float"));
+      assertEquals(clientDebug + " => "+ sdoc, 100, sdoc.get("inplace_updatable_int"));
+      assertEquals(clientDebug + " => "+ sdoc, inplace_updatable_float, sdoc.get("inplace_updatable_float"));
       assertEquals(clientDebug + " => "+ sdoc, title, sdoc.get("title_s"));
       assertEquals(clientDebug + " => "+ sdoc, version, sdoc.get("_version_"));
     }
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
index 90397c1..2867935 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -913,6 +913,7 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
    *                 (regular or containing atomic update Maps)
    *                 or one of the {@link TestInPlaceUpdatesStandalone#HARDCOMMIT} or {@link TestInPlaceUpdatesStandalone#SOFTCOMMIT} sentinal objects.
    */
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void checkReplay(final String valField, Object... commands) throws Exception {
     
     HashMap<Integer, DocInfo> model = new LinkedHashMap<>();
diff --git a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
index 4384895..49177a9 100644
--- a/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
+++ b/solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
@@ -163,6 +163,7 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
     nestedUpdate.processAdd(cmd);
     cmd.clear();
 
+    @SuppressWarnings({"rawtypes"})
     List children = (List) docHierarchy.get("children").getValues();
 
     SolrInputDocument firstChild = (SolrInputDocument) children.get(0);
@@ -189,6 +190,7 @@ public class TestNestedUpdateProcessor extends SolrTestCaseJ4 {
     cmd.solrDoc = noIdChildren;
     nestedUpdate.processAdd(cmd);
     cmd.clear();
+    @SuppressWarnings({"rawtypes"})
     List children = (List) noIdChildren.get("children").getValues();
     SolrInputDocument idLessChild = (SolrInputDocument)((SolrInputDocument) children.get(1)).get(childKey).getValue();
     assertTrue("Id less child did not get an Id", idLessChild.containsKey("id"));
diff --git a/solr/core/src/test/org/apache/solr/update/TestUpdate.java b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
index 2418169..d93b844 100644
--- a/solr/core/src/test/org/apache/solr/update/TestUpdate.java
+++ b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
@@ -48,7 +48,7 @@ public class TestUpdate extends SolrTestCaseJ4 {
 
   }
 
-  public void doUpdateTest(Callable afterUpdate) throws Exception {
+  public void doUpdateTest(@SuppressWarnings({"rawtypes"})Callable afterUpdate) throws Exception {
     clearIndex();
     afterUpdate.call();
 
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
index e66b05a..fb4ec29 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
@@ -183,6 +183,7 @@ public class UpdateLogTest extends SolrTestCaseJ4 {
       // verify that the document is deleted, by doing an RTG call
       assertJQ(req("qt","/get", "id","1"), "=={'doc':null}");
     } else { // dbi
+      @SuppressWarnings({"rawtypes"})
       List entry = ((List)ulog.lookup(DOC_1_INDEXED_ID));
       assertEquals(UpdateLog.DELETE, (int)entry.get(UpdateLog.FLAGS_IDX) & UpdateLog.OPERATION_MASK);
     }
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
index ad39b6f..8a05ca5 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorFactoryTest.java
@@ -32,9 +32,11 @@ import static org.mockito.Mockito.mock;
  */
 public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
   private ClassificationUpdateProcessorFactory cFactoryToTest = new ClassificationUpdateProcessorFactory();
+  @SuppressWarnings({"rawtypes"})
   private NamedList args = new NamedList<String>();
 
   @Before
+  @SuppressWarnings({"unchecked"})
   public void initArgs() {
     args.add("inputFields", "inputField1,inputField2");
     args.add("classField", "classField1");
@@ -92,6 +94,7 @@ public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void init_unsupportedAlgorithm_shouldThrowExceptionWithDetailedMessage() {
     args.removeAll("algorithm");
     args.add("algorithm", "unsupported");
@@ -103,6 +106,7 @@ public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void init_unsupportedFilterQuery_shouldThrowExceptionWithDetailedMessage() {
     assumeWorkingMockito();
     
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
index 3aee1be..3a80f8f 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
@@ -25,7 +25,6 @@ import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.NamedList;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.junit.Before;
@@ -49,7 +48,6 @@ public class ClassificationUpdateProcessorIntegrationTest extends SolrTestCaseJ4
   private static final String BROKEN_CHAIN_FILTER_QUERY = "classification-unsupported-filterQuery";
 
   private ClassificationUpdateProcessorFactory cFactoryToTest = new ClassificationUpdateProcessorFactory();
-  private NamedList args = new NamedList<String>();
 
   @BeforeClass
   public static void beforeClass() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index b6d4fc6..19752bd 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -236,6 +236,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
     updateProcessorToTest=new ClassificationUpdateProcessor(params,mockProcessor,reader,req().getSchema());
     updateProcessorToTest.processAdd(update);
 
+    @SuppressWarnings({"unchecked"})
     ArrayList<Object> assignedClasses = (ArrayList)unseenDocument1.getFieldValues(TRAINING_CLASS);
     assertThat(assignedClasses.get(0),is("class2"));
     assertThat(assignedClasses.get(1),is("class1"));
@@ -259,6 +260,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
     updateProcessorToTest=new ClassificationUpdateProcessor(params,mockProcessor,reader,req().getSchema());
     updateProcessorToTest.processAdd(update);
 
+    @SuppressWarnings({"unchecked"})
     ArrayList<Object> assignedClasses = (ArrayList)unseenDocument1.getFieldValues(TRAINING_CLASS);
     assertThat(assignedClasses.size(),is(2));
     assertThat(assignedClasses.get(0),is("class2"));
@@ -283,6 +285,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
     updateProcessorToTest=new ClassificationUpdateProcessor(params,mockProcessor,reader,req().getSchema());
     updateProcessorToTest.processAdd(update);
 
+    @SuppressWarnings({"unchecked"})
     ArrayList<Object> assignedClasses = (ArrayList)unseenDocument1.getFieldValues(TRAINING_CLASS);
     assertThat(assignedClasses.size(),is(2));
     assertThat(assignedClasses.get(0),is("class2"));
@@ -309,6 +312,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
 
     updateProcessorToTest.processAdd(update);
 
+    @SuppressWarnings({"unchecked"})
     ArrayList<Object> assignedClasses = (ArrayList)unseenDocument1.getFieldValues(TRAINING_CLASS);
     assertThat(assignedClasses.size(),is(2));
     assertThat(assignedClasses.get(0),is("class4"));
@@ -335,6 +339,7 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
 
     updateProcessorToTest.processAdd(update);
 
+    @SuppressWarnings({"unchecked"})
     ArrayList<Object> assignedClasses = (ArrayList)unseenDocument1.getFieldValues(TRAINING_CLASS);
     assertThat(assignedClasses.size(),is(2));
     assertThat(assignedClasses.get(0),is("class4"));
diff --git a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java
index 8fb0924..dc1640c 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java
@@ -26,10 +26,11 @@ import org.apache.solr.response.SolrQueryResponse;
  */
 public class CustomUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory 
 {
+  @SuppressWarnings({"rawtypes"})
   public NamedList args = null;
   
   @Override
-  public void init( NamedList args )
+  public void init( @SuppressWarnings({"rawtypes"})NamedList args )
   {
     this.args = args;
   }
diff --git a/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
index 89d3314..98b1f43 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactoryTest.java
@@ -37,6 +37,7 @@ import static org.apache.solr.update.processor.IgnoreLargeDocumentProcessorFacto
 public class IgnoreLargeDocumentProcessorFactoryTest extends SolrTestCase {
 
   @Test
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void testProcessor() throws IOException {
     NamedList args = new NamedList();
     args.add(IgnoreLargeDocumentProcessorFactory.LIMIT_SIZE_PARAM, 1);
diff --git a/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java b/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
index 155f0c7..d01ce72 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/NestedAtomicUpdateTest.java
@@ -714,6 +714,7 @@ public class NestedAtomicUpdateTest extends SolrTestCaseJ4 {
         "/response/docs/[0]/cat_ss/[1]==\"ccc\"");
   }
 
+  @SuppressWarnings({"unchecked"})
   private static void assertDocContainsSubset(SolrInputDocument subsetDoc, SolrInputDocument fullDoc) {
     for(SolrInputField field: subsetDoc) {
       String fieldName = field.getName();
diff --git a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
index d092a73..026d5e1 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
@@ -326,6 +326,7 @@ public abstract class RoutedAliasUpdateProcessorTest extends SolrCloudTestCase {
 
   void assertUpdateResponse(UpdateResponse rsp) {
     // use of TolerantUpdateProcessor can cause non-thrown "errors" that we need to check for
+    @SuppressWarnings({"rawtypes"})
     List errors = (List) rsp.getResponseHeader().get("errors");
     assertTrue("Expected no errors: " + errors,errors == null || errors.isEmpty());
   }
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
index 06af046..99951cc 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
@@ -260,6 +260,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
   }
   
   @Test
+  @SuppressWarnings({"rawtypes"})
   public void testNonStringFieldsValues() throws Exception {
     this.chain = "dedupe-allfields";
     
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
index 63069df..a7c2477 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java
@@ -42,6 +42,7 @@ import org.mockito.Mockito;
 public class SkipExistingDocumentsProcessorFactoryTest {
 
   private BytesRef docId = new BytesRef();
+  @SuppressWarnings({"rawtypes"})
   private SolrQueryRequest defaultRequest = new LocalSolrQueryRequest(null, new NamedList());
   
   @BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java b/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
index 37192b2..256e504 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
@@ -138,7 +138,8 @@ public class TestNamedUpdateProcessors extends AbstractFullDistribZkTestBase {
     return jar;
   }
 
-  public static ByteBuffer persistZip(String loc, Class... classes) throws IOException {
+  public static ByteBuffer persistZip(String loc,
+                                      @SuppressWarnings({"rawtypes"})Class... classes) throws IOException {
     ByteBuffer jar = generateZip(classes);
     try (FileOutputStream fos = new FileOutputStream(loc)) {
       fos.write(jar.array(), 0, jar.limit());
@@ -148,11 +149,11 @@ public class TestNamedUpdateProcessors extends AbstractFullDistribZkTestBase {
   }
 
 
-  public static ByteBuffer generateZip(Class... classes) throws IOException {
+  public static ByteBuffer generateZip(@SuppressWarnings({"rawtypes"})Class... classes) throws IOException {
     SimplePostTool.BAOS bos = new SimplePostTool.BAOS();
     try (ZipOutputStream zipOut = new ZipOutputStream(bos)) {
       zipOut.setLevel(ZipOutputStream.DEFLATED);
-      for (Class c : classes) {
+      for (@SuppressWarnings({"rawtypes"})Class c : classes) {
         String path = c.getName().replace('.', '/').concat(".class");
         ZipEntry entry = new ZipEntry(path);
         ByteBuffer b = SimplePostTool.inputStreamToByteArray(c.getClassLoader().getResourceAsStream(path));
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index 7f76453..cba15f8 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -918,6 +918,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
 
   // here we do things not to be emulated elsewhere to create a legacy condition and ensure that we can
   // work with both old and new formats.
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private void manuallyConstructLegacyTRA() throws Exception {
     // first create a "modern" alias
     String configName = getSaferTestName();
@@ -975,7 +976,6 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
     if (data == null || data.length == 0) {
       aliasMap = Collections.emptyMap();
     } else {
-      //noinspection unchecked
       aliasMap = (Map<String, Map>) Utils.fromJSON(data);
     }
     assertNotEquals(0, aliasMap.size());
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java
index 07b3a88..f51b94a 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java
@@ -343,7 +343,7 @@ public class TolerantUpdateProcessorTest extends UpdateProcessorTestBase {
     try {
       return connection.request(handler, params, xml);
     } catch (SolrException e) {
-      throw (SolrException)e;
+      throw e;
     } catch (Exception e) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
     }
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
index 06a72ea..0099652 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TrackingUpdateProcessorFactory.java
@@ -87,7 +87,7 @@ public final class TrackingUpdateProcessorFactory
   }
 
   @Override
-  public void init(NamedList args) {
+  public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
     if (args != null && args.indexOf("group",0) >= 0) {
       group = (String) args.get("group");
       log.debug("Init URP, group '{}'", group);
diff --git a/solr/core/src/test/org/apache/solr/util/SolrLogPostToolTest.java b/solr/core/src/test/org/apache/solr/util/SolrLogPostToolTest.java
index 390c8ac..aa39e4d 100644
--- a/solr/core/src/test/org/apache/solr/util/SolrLogPostToolTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SolrLogPostToolTest.java
@@ -304,7 +304,7 @@ public class SolrLogPostToolTest extends SolrTestCaseJ4 {
 
   private List<SolrInputDocument> readDocs(String records) throws Exception {
     BufferedReader bufferedReader = new BufferedReader(new StringReader(records));
-    ArrayList<SolrInputDocument> list = new ArrayList();
+    ArrayList<SolrInputDocument> list = new ArrayList<>();
 
     try {
       LogRecordReader logRecordReader = new SolrLogPostTool.LogRecordReader(bufferedReader);
diff --git a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
index f5034c4..d18b575 100644
--- a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
@@ -248,7 +248,7 @@ public class SolrPluginUtilsTest extends SolrTestCaseJ4 {
         
   }
 
-  private static int countItems(Iterator i) {
+  private static int countItems(@SuppressWarnings({"rawtypes"})Iterator i) {
     int count = 0;
     while (i.hasNext()) {
       count++;
diff --git a/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java b/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java
index f668aa1..443e55d 100644
--- a/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java
+++ b/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java
@@ -75,11 +75,14 @@ public class TestRTimerTree extends SolrTestCase {
     assertEquals(120, (int) subt.getTime());
     assertEquals(220, (int) rt.getTime());
 
+    @SuppressWarnings({"rawtypes"})
     NamedList nl = rt.asNamedList();
     assertEquals(220, ((Double) nl.get("time")).intValue());
+    @SuppressWarnings({"rawtypes"})
     NamedList sub1nl = (NamedList) nl.get("sub1");
     assertNotNull(sub1nl);
     assertEquals(120, ((Double) sub1nl.get("time")).intValue());
+    @SuppressWarnings({"rawtypes"})
     NamedList sub11nl = (NamedList) sub1nl.get("sub1.1");
     assertNotNull(sub11nl);
     assertEquals(20, ((Double) sub11nl.get("time")).intValue());
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index 1b8c6ae..0ef5851 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -583,6 +583,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
           "      {'nodeRole':'overseer', 'replica':0}" +
           "    ]" +
           "}";
+      @SuppressWarnings({"rawtypes"})
       SolrRequest req = AutoScalingRequest.create(SolrRequest.METHOD.POST, setClusterPolicyCommand);
       NamedList<Object> response = cloudClient.request(req);
       assertEquals(response.get("result").toString(), "success");
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java b/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
index f0b9036..f8a7aa4 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
@@ -29,6 +29,7 @@ import org.apache.solr.common.util.Utils;
 
 public class TestSolrJacksonAnnotation extends SolrTestCase {
 
+  @SuppressWarnings({"unchecked"})
   public void testSerDe() throws Exception {
     ObjectMapper mapper = new ObjectMapper();
     mapper.setAnnotationIntrospector(new SolrJacksonAnnotationInspector());
@@ -39,6 +40,7 @@ public class TestSolrJacksonAnnotation extends SolrTestCase {
     o.ifld = 1234;
     String json = mapper.writeValueAsString(o);
 
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) Utils.fromJSONString(json);
     assertEquals("v1",  m.get("field"));
     assertEquals("v2",  m.get("friendlyName"));
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index beb0bf6..761070c 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -197,12 +197,13 @@ public class TestUtils extends SolrTestCaseJ4 {
     }
 
     ContentStream stream = new ContentStreamBase.ByteArrayStream(baos.toByteArray(),null, "application/javabin");
+    @SuppressWarnings({"rawtypes"})
     List<CommandOperation> commands = CommandOperation.readCommands(Collections.singletonList(stream), new NamedList(), Collections.singleton("single"));
 
     assertEquals(5, commands.size());
   }
 
-  private void assertNoggitJsonValues(Map m) {
+  private void assertNoggitJsonValues(@SuppressWarnings({"rawtypes"})Map m) {
     assertEquals( "c" ,Utils.getObjectByPath(m, true, "/a/b"));
     assertEquals( "v1" ,Utils.getObjectByPath(m, true, "/a/d[0]/k1"));
     assertEquals( "v2" ,Utils.getObjectByPath(m, true, "/a/d[1]/k2"));
@@ -223,6 +224,7 @@ public class TestUtils extends SolrTestCaseJ4 {
         "        'path':'/update/*',\n" +
         "        'role':'dev'}],\n" +
         "    '':{'v':4}}}";
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) fromJSONString(json);
     Utils.setObjectByPath(m,"authorization/permissions[1]/role","guest");
     Utils.setObjectByPath(m,"authorization/permissions[0]/role[-1]","dev");
@@ -248,11 +250,13 @@ public class TestUtils extends SolrTestCaseJ4 {
         "        'path':'/update/*',\n" +
         "        'role':'dev'}],\n" +
         "    '':{'v':4}}}";
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) fromJSONString(json);
     assertEquals("x-update", Utils.getObjectByPath(m,false, "authorization/permissions[1]/name"));
 
   }
   
+  @SuppressWarnings({"unchecked"})
   public void testMapWriterIdx(){
     String json = "{" +
         "  'responseHeader':{" +
@@ -279,6 +283,7 @@ public class TestUtils extends SolrTestCaseJ4 {
         "        'status':0," +
         "        'QTime':5033}," +
         "      'core':'corestatus_test_shard2_replica_n3'}}}";
+    @SuppressWarnings({"rawtypes"})
     Map m = (Map) fromJSONString(json);
 
     assertEquals("127.0.0.1:56443_solr", Utils.getObjectByPath(m,false, "success[0]/key"));
@@ -289,6 +294,7 @@ public class TestUtils extends SolrTestCaseJ4 {
     assertEquals("corestatus_test_shard2_replica_n3", Utils.getObjectByPath(m, false,asList("success[3]", "value", "core") ));
     assertEquals(5033L, Utils.getObjectByPath(m, false,asList("success[3]", "value", "responseHeader", "QTime") ));
 
+    @SuppressWarnings({"rawtypes"})
     Map nodes = (Map) m.get("success");
     m.put("success", (MapWriter) ew -> nodes.forEach((o, o2) -> ew.putNoEx((String) o,o2)));
     assertEquals("127.0.0.1:56443_solr", Utils.getObjectByPath(m,false, "success[0]/key"));
@@ -299,11 +305,13 @@ public class TestUtils extends SolrTestCaseJ4 {
     assertEquals("corestatus_test_shard2_replica_n3", Utils.getObjectByPath(m, false,asList("success[3]", "value", "core") ));
     assertEquals(5033L, Utils.getObjectByPath(m, false,asList("success[3]", "value", "responseHeader", "QTime") ));
     final int[] count = {0};
+    @SuppressWarnings({"unchecked", "rawtypes"})
     NamedList nl = new NamedList(m);
     nl._forEachEntry("success", (o, o2) -> count[0]++);
     assertEquals(count[0], 4);
   }
 
+  @SuppressWarnings({"unchecked"})
   public void testMergeJson() {
     Map<String, Object> sink = (Map<String, Object>) Utils.fromJSONString("{k2:v2, k1: {a:b, p:r, k21:{xx:yy}}}");
     assertTrue(Utils.mergeJson(sink, (Map<String, Object>) Utils.fromJSONString("k1:{a:c, e:f, p :null, k11:{a1:b1}, k21:{pp : qq}}")));
diff --git a/solr/core/src/test/org/apache/solr/util/stats/MetricUtilsTest.java b/solr/core/src/test/org/apache/solr/util/stats/MetricUtilsTest.java
index 4c2f966..f9595e1 100644
--- a/solr/core/src/test/org/apache/solr/util/stats/MetricUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/stats/MetricUtilsTest.java
@@ -38,6 +38,7 @@ import org.junit.Test;
 public class MetricUtilsTest extends SolrTestCaseJ4 {
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testSolrTimerGetSnapshot() {
     // create a timer with up to 100 data points
     final Timer timer = new Timer();
@@ -50,6 +51,7 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
     MetricUtils.convertTimer("", timer, MetricUtils.PropertyFilter.ALL, false, false, ".", (k, v) -> {
       map.putAll((Map<String,Object>)v);
     });
+    @SuppressWarnings({"rawtypes"})
     NamedList lst = new NamedList(map);
     // check that expected metrics were obtained
     assertEquals(14, lst.size());
@@ -67,6 +69,7 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void testMetrics() throws Exception {
     MetricRegistry registry = new MetricRegistry();
     Counter counter = registry.counter("counter");
@@ -102,6 +105,7 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
     registry.register("memory.expected.error", error);
     MetricUtils.toMaps(registry, Collections.singletonList(MetricFilter.ALL), MetricFilter.ALL,
         MetricUtils.PropertyFilter.ALL, false, false, false, false, (k, o) -> {
+      @SuppressWarnings({"rawtypes"})
       Map v = (Map)o;
       if (k.startsWith("counter")) {
         assertEquals(1L, v.get("count"));
@@ -149,19 +153,23 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
             assertEquals("foobar", o);
           } else if (k.startsWith("timer")) {
             assertTrue(o instanceof Map);
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(1L, v.get("count"));
             assertTrue(((Number)v.get("min_ms")).intValue() > 100);
           } else if (k.startsWith("meter")) {
             assertTrue(o instanceof Map);
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(1L, v.get("count"));
           } else if (k.startsWith("histogram")) {
             assertTrue(o instanceof Map);
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(1L, v.get("count"));
           } else if (k.startsWith("aggregate1")) {
             assertTrue(o instanceof Map);
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(4, v.get("count"));
             Map<String, Object> values = (Map<String, Object>)v.get("values");
@@ -175,6 +183,7 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
             assertEquals(2, update.get("updateCount"));
           } else if (k.startsWith("aggregate2")) {
             assertTrue(o instanceof Map);
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(2, v.get("count"));
             Map<String, Object> values = (Map<String, Object>)v.get("values");
@@ -189,6 +198,7 @@ public class MetricUtilsTest extends SolrTestCaseJ4 {
           } else if (k.startsWith("memory.expected.error")) {
             assertNull(o);
           } else {
+            @SuppressWarnings({"rawtypes"})
             Map v = (Map)o;
             assertEquals(1L, v.get("count"));
           }
diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java
index 790c5bd..a3cb025 100644
--- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java
+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletCarrier.java
@@ -37,6 +37,7 @@ import static org.mockito.Mockito.when;
 public class TestHttpServletCarrier extends SolrTestCaseJ4 {
 
   @Test
+  @SuppressWarnings({"unchecked"})
   public void test() {
     SolrTestCaseJ4.assumeWorkingMockito();
     HttpServletRequest req = mock(HttpServletRequest.class);