[lucene-solr] 02/21: Merge remote-tracking branch 'remotes/origin/jira/SOLR-13452_gradle_8'

[er...@apache.org]

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

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

commit a1bd5e04bf72b708d2c6ed722cd31a855a595295
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Thu Nov 21 17:33:38 2019 -0500

    Merge remote-tracking branch 'remotes/origin/jira/SOLR-13452_gradle_8'
    
    # Conflicts:
    #	solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java
    #	solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java
---
 .../solr/handler/dataimport/AbstractDataImportHandlerTestCase.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
index 3674a3d..1ebc2f6 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
@@ -115,6 +115,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
    * @param extraParams any extra request parameters needed to be passed to DataImportHandler
    * @throws Exception in case of any error
    */
+  @SuppressWarnings({"rawtypes", "unchecked"})
   protected void runFullImport(String dataConfig, Map<String, String> extraParams) throws Exception {
     HashMap<String, String> params = new HashMap<>();
     params.put("command", "full-import");
@@ -134,7 +135,6 @@ public abstract class AbstractDataImportHandlerTestCase extends
   /**
    * Helper for creating a Context instance. Useful for testing Transformers
    */
-  @SuppressWarnings("unchecked")
   public static TestContext getContext(EntityProcessorWrapper parent,
                                    VariableResolver resolver, DataSource parentDataSource,
                                    String currProcess, final List<Map<String, String>> entityFields,
@@ -150,7 +150,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
    * Strings at even index are keys, odd-index strings are values in the
    * returned map
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("rawtypes")
   public static Map createMap(Object... args) {
    return Utils.makeMap(args);
   }
@@ -216,6 +216,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
       return delegate.getVariableResolver();
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public DataSource getDataSource() {
       return delegate.getDataSource();
@@ -256,6 +257,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
       return delegate.getParentContext();
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public DataSource getDataSource(String name) {
       return delegate.getDataSource(name);