You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/08/15 18:02:08 UTC
[lucene-solr] 02/05: SOLR-13452: More work on removing compile
warnings.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 7208a46af27cbb113f7c03445c0a115b3f33785b
Author: markrmiller <ma...@apache.org>
AuthorDate: Thu Aug 15 09:42:23 2019 -0500
SOLR-13452: More work on removing compile warnings.
---
.../java/org/apache/solr/analytics/ExpressionFactory.java | 2 ++
.../handler/clustering/carrot2/CarrotClusteringEngine.java | 1 +
.../apache/solr/handler/dataimport/MailEntityProcessor.java | 1 +
.../apache/solr/handler/dataimport/TikaEntityProcessor.java | 1 +
solr/contrib/dataimporthandler/build.gradle | 3 ++-
.../org/apache/solr/handler/dataimport/ClobTransformer.java | 1 +
.../java/org/apache/solr/handler/dataimport/Context.java | 2 ++
.../org/apache/solr/handler/dataimport/ContextImpl.java | 3 ++-
.../apache/solr/handler/dataimport/DataImportHandler.java | 5 +----
.../org/apache/solr/handler/dataimport/DataImporter.java | 4 ++--
.../solr/handler/dataimport/DateFormatTransformer.java | 2 +-
.../org/apache/solr/handler/dataimport/DebugLogger.java | 2 ++
.../java/org/apache/solr/handler/dataimport/DocBuilder.java | 1 +
.../solr/handler/dataimport/EntityProcessorWrapper.java | 5 ++---
.../solr/handler/dataimport/HTMLStripTransformer.java | 2 +-
.../org/apache/solr/handler/dataimport/JdbcDataSource.java | 1 +
.../apache/solr/handler/dataimport/LineEntityProcessor.java | 1 +
.../solr/handler/dataimport/NumberFormatTransformer.java | 2 +-
.../solr/handler/dataimport/PlainTextEntityProcessor.java | 1 +
.../apache/solr/handler/dataimport/RegexTransformer.java | 5 ++---
.../apache/solr/handler/dataimport/TemplateTransformer.java | 2 +-
.../solr/handler/dataimport/XPathEntityProcessor.java | 7 ++++---
.../apache/solr/handler/dataimport/XPathRecordReader.java | 1 +
.../solr/handler/dataimport/AbstractDIHCacheTestCase.java | 2 +-
.../solr/handler/dataimport/AbstractDIHJdbcTestCase.java | 2 +-
.../dataimport/AbstractDataImportHandlerTestCase.java | 7 +++++--
.../dataimport/AbstractSqlEntityProcessorTestCase.java | 2 +-
.../solr/handler/dataimport/MockInitialContextFactory.java | 1 -
.../apache/solr/handler/dataimport/TestClobTransformer.java | 2 +-
.../handler/dataimport/TestContentStreamDataSource.java | 1 +
.../org/apache/solr/handler/dataimport/TestDataConfig.java | 2 +-
.../org/apache/solr/handler/dataimport/TestDocBuilder.java | 6 ++++++
.../org/apache/solr/handler/dataimport/TestDocBuilder2.java | 12 +-----------
.../apache/solr/handler/dataimport/TestEphemeralCache.java | 2 +-
.../apache/solr/handler/dataimport/TestErrorHandling.java | 1 +
.../org/apache/solr/handler/dataimport/TestFieldReader.java | 1 +
.../handler/dataimport/TestFileListEntityProcessor.java | 3 +--
.../handler/dataimport/TestJdbcDataSourceConvertType.java | 2 ++
.../solr/handler/dataimport/TestLineEntityProcessor.java | 10 +++++++---
.../handler/dataimport/TestPlainTextEntityProcessor.java | 3 +++
.../solr/handler/dataimport/TestRegexTransformer.java | 4 ++++
.../solr/handler/dataimport/TestScriptTransformer.java | 1 +
.../handler/dataimport/TestSolrEntityProcessorUnit.java | 5 +++++
.../solr/handler/dataimport/TestSortedMapBackedCache.java | 1 +
.../solr/handler/dataimport/TestTemplateTransformer.java | 3 +--
.../solr/handler/dataimport/TestVariableResolver.java | 2 +-
.../handler/dataimport/TestVariableResolverEndToEnd.java | 2 +-
.../org/apache/solr/handler/dataimport/TestWriterImpl.java | 2 +-
.../solr/handler/dataimport/TestXPathEntityProcessor.java | 2 +-
.../solr/handler/dataimport/TestXPathRecordReader.java | 1 +
.../solr/handler/dataimport/TestZKPropertiesWriter.java | 1 +
.../solr/handler/extraction/ExtractingDocumentLoader.java | 13 +++++--------
.../solr/handler/extraction/ExtractingRequestHandler.java | 2 +-
.../apache/solr/handler/extraction/XLSXResponseWriter.java | 4 +++-
.../handler/extraction/ExtractingRequestHandlerTest.java | 2 ++
.../processor/OpenNLPLangDetectUpdateProcessorFactory.java | 2 ++
.../processor/TikaLanguageIdentifierUpdateProcessor.java | 4 ++--
.../LanguageIdentifierUpdateProcessorFactoryTestCase.java | 1 +
.../ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java | 1 +
.../ltr/src/java/org/apache/solr/ltr/model/LinearModel.java | 1 +
.../apache/solr/ltr/model/MultipleAdditiveTreesModel.java | 1 +
.../java/org/apache/solr/ltr/model/NeuralNetworkModel.java | 1 +
.../transform/LTRFeatureLoggerTransformerFactory.java | 1 +
.../java/org/apache/solr/ltr/search/LTRQParserPlugin.java | 1 +
.../org/apache/solr/ltr/store/rest/ManagedModelStore.java | 2 +-
.../org/apache/solr/prometheus/exporter/MetricsQuery.java | 1 +
.../prometheus/exporter/PrometheusExporterSettings.java | 2 ++
.../solr/prometheus/exporter/SolrExporterTestBase.java | 1 +
.../org/apache/solr/response/VelocityResponseWriter.java | 4 ++--
.../java/org/apache/solr/common/util/JsonRecordReader.java | 2 +-
70 files changed, 116 insertions(+), 68 deletions(-)
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.java
index 9407d1d..29ce7ed 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.java
@@ -465,6 +465,7 @@ public class ExpressionFactory {
* @return an analytics representation of the field
* @throws SolrException if the field is not supported by the analytics framework
*/
+ @SuppressWarnings("deprecation")
private AnalyticsField createField(SchemaField field) throws SolrException {
String fieldName = field.getName();
if (fields.containsKey(fieldName)) {
@@ -577,6 +578,7 @@ public class ExpressionFactory {
* @return an array of param strings
* @throws SolrException if the function has incorrect syntax
*/
+ @SuppressWarnings("unused")
private static String[] getFunctionParams(String function) throws SolrException {
return getParams(function, null, null);
}
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
index b75b8c6..cb72bbe 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
@@ -286,6 +286,7 @@ public class CarrotClusteringEngine extends SearchClusteringEngine {
/**
* Prepares Carrot2 documents for clustering.
*/
+ @SuppressWarnings("deprecation")
private List<Document> getDocuments(SolrDocumentList solrDocList, Map<SolrDocument, Integer> docIds,
Query query, final SolrQueryRequest sreq) throws IOException {
SolrHighlighter highlighter = null;
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
index f19a4ca..45ce4f6 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
@@ -52,6 +52,7 @@ import com.sun.mail.gimap.GmailRawSearchTerm;
*
* @since solr 1.4
*/
+@SuppressWarnings("unchecked")
public class MailEntityProcessor extends EntityProcessorBase {
private static final SimpleDateFormat sinceDateParser =
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
index 875032b..1245dd8 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
@@ -124,6 +124,7 @@ public class TikaEntityProcessor extends EntityProcessorBase {
spatialMetadataField = context.getResolvedEntityAttribute("spatialMetadataField");
}
+ @SuppressWarnings({"unchecked", "deprecation"})
@Override
public Map<String, Object> nextRow() {
if(done) return null;
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index a0f59ec..8e55c35 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -43,7 +43,8 @@ dependencies {
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('commons-io:commons-io') { transitive = false }
implementation ('com.google.guava:guava')
- implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
+ implementation ('org.apache.httpcomponents:httpclient')
+ implementation ('org.apache.httpcomponents:httpcore')
implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
implementation ('org.apache.zookeeper:zookeeper-jute')
implementation ('io.dropwizard.metrics:metrics-core') { transitive = false }
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ClobTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ClobTransformer.java
index 4bbe046..52656fe 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ClobTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ClobTransformer.java
@@ -36,6 +36,7 @@ import java.util.Map;
* @since solr 1.4
*/
public class ClobTransformer extends Transformer {
+ @SuppressWarnings("unchecked")
@Override
public Object transformRow(Map<String, Object> aRow, Context context) {
for (Map<String, String> map : context.getAllEntityFields()) {
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java
index 4d0cb3a..9cdfa0a 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java
@@ -102,6 +102,7 @@ public abstract class Context {
* @see org.apache.solr.handler.dataimport.DataSource
* @see #getDataSource(String)
*/
+ @SuppressWarnings("rawtypes")
public abstract DataSource getDataSource();
/**
@@ -112,6 +113,7 @@ public abstract class Context {
* @return a new DataSource instance
* @see org.apache.solr.handler.dataimport.DataSource
*/
+ @SuppressWarnings("rawtypes")
public abstract DataSource getDataSource(String name);
/**
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
index 20a2aad..98028cdd 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
@@ -31,6 +31,7 @@ import java.util.Map;
*
* @since solr 1.3
*/
+@SuppressWarnings("rawtypes")
public class ContextImpl extends Context {
protected EntityProcessorWrapper epw;
@@ -84,7 +85,7 @@ public class ContextImpl extends Context {
@Override
public List<Map<String, String>> getAllEntityFields() {
- return epw==null || epw.getEntity() == null ? Collections.EMPTY_LIST : epw.getEntity().getAllFieldsList();
+ return epw==null || epw.getEntity() == null ? Collections.emptyList() : epw.getEntity().getAllFieldsList();
}
@Override
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
index 50938e4..6953265 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
@@ -65,6 +65,7 @@ import static org.apache.solr.handler.dataimport.DataImporter.IMPORT_CMD;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class DataImportHandler extends RequestHandlerBase implements
SolrCoreAware {
@@ -89,7 +90,6 @@ public class DataImportHandler extends RequestHandlerBase implements
}
@Override
- @SuppressWarnings("unchecked")
public void init(NamedList args) {
super.init(args);
Map<String,String> macro = new HashMap<>();
@@ -98,7 +98,6 @@ public class DataImportHandler extends RequestHandlerBase implements
}
@Override
- @SuppressWarnings("unchecked")
public void inform(SolrCore core) {
try {
String name = getPluginInfo().name;
@@ -116,7 +115,6 @@ public class DataImportHandler extends RequestHandlerBase implements
}
@Override
- @SuppressWarnings("unchecked")
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp)
throws Exception {
rsp.setHttpCaching(false);
@@ -250,7 +248,6 @@ public class DataImportHandler extends RequestHandlerBase implements
&& !writerClassStr.equals(DocBuilder.class.getPackage().getName() + "."
+ DEFAULT_WRITER_NAME)) {
try {
- @SuppressWarnings("unchecked")
Class<DIHWriter> writerClass = DocBuilder.loadClass(writerClassStr, req.getCore());
Constructor<DIHWriter> cnstr = writerClass.getConstructor(new Class[] {
UpdateRequestProcessor.class, SolrQueryRequest.class});
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
index 932849b..89ad15b 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
@@ -68,6 +68,7 @@ import java.util.concurrent.locks.ReentrantLock;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class DataImporter {
public enum Status {
@@ -187,6 +188,7 @@ public class DataImporter {
config = loadDataConfig(configFile);
}
+ @SuppressWarnings("deprecation")
public DIHConfiguration loadDataConfig(InputSource configFile) {
DIHConfiguration dihcfg = null;
@@ -327,7 +329,6 @@ public class DataImporter {
return new DIHConfiguration(documentTags.get(0), this, functions, script, dataSources, pw);
}
- @SuppressWarnings("unchecked")
private DIHProperties createPropertyWriter() {
DIHProperties propWriter = null;
PropertyWriter configPw = config.getPropertyWriter();
@@ -489,7 +490,6 @@ public class DataImporter {
}
}
- @SuppressWarnings("unchecked")
Map<String, String> getStatusMessages() {
//this map object is a Collections.synchronizedMap(new LinkedHashMap()). if we
// synchronize on the object it must be safe to iterate through the map
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
index 6da9cc1..f514e21 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
@@ -42,7 +42,6 @@ public class DateFormatTransformer extends Transformer {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
- @SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> aRow, Context context) {
for (Map<String, String> map : context.getAllEntityFields()) {
@@ -68,6 +67,7 @@ public class DateFormatTransformer extends Transformer {
try {
Object o = aRow.get(srcCol);
if (o instanceof List) {
+ @SuppressWarnings("rawtypes")
List inputs = (List) o;
List<Date> results = new ArrayList<>();
for (Object input : inputs) {
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
index 2fd9303..e4751be 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
@@ -41,6 +41,7 @@ import java.util.Stack;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
class DebugLogger {
private Stack<DebugInfo> debugStack;
@@ -54,6 +55,7 @@ class DebugLogger {
boolean enabled = true;
+ @SuppressWarnings("serial")
public DebugLogger() {
// writer = solrWriter;
output = new NamedList();
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
index 285b135..f4181f0 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicLong;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class DocBuilder {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
index 984f030..517b00d 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
@@ -40,6 +40,7 @@ import java.util.Map;
*
* @since solr 1.4
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class EntityProcessorWrapper extends EntityProcessor {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -78,7 +79,7 @@ public class EntityProcessorWrapper extends EntityProcessor {
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("serial")
void loadTransformers() {
String transClasses = context.getEntityAttribute(TRANSFORMER);
@@ -149,7 +150,6 @@ public class EntityProcessorWrapper extends EntityProcessor {
}
}
- @SuppressWarnings("unchecked")
static class ReflectionTransformer extends Transformer {
final Method meth;
@@ -185,7 +185,6 @@ public class EntityProcessorWrapper extends EntityProcessor {
return r;
}
- @SuppressWarnings("unchecked")
protected Map<String, Object> applyTransformer(Map<String, Object> row) {
if(row == null) return null;
if (transformers == null)
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
index e62c329..62754b7 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
@@ -35,7 +35,7 @@ import java.util.Map;
public class HTMLStripTransformer extends Transformer {
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Object transformRow(Map<String, Object> row, Context context) {
List<Map<String, String>> fields = context.getAllEntityFields();
for (Map<String, String> field : fields) {
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
index 5eb3517..a8cacce 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
@@ -170,6 +170,7 @@ public class JdbcDataSource extends
}
return factory = new Callable<Connection>() {
+ @SuppressWarnings("unchecked")
@Override
public Connection call() throws Exception {
log.info("Creating a connection for entity "
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
index 0940cbd..1a87160 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
@@ -129,6 +129,7 @@ public class LineEntityProcessor extends EntityProcessorBase {
}
}
+ @SuppressWarnings("deprecation")
public void closeResources() {
if (reader != null) {
IOUtils.closeQuietly(reader);
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
index 349b14e..665ba6d 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
@@ -44,7 +44,7 @@ import java.util.Map;
public class NumberFormatTransformer extends Transformer {
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Object transformRow(Map<String, Object> row, Context context) {
for (Map<String, String> fld : context.getAllEntityFields()) {
String style = context.replaceTokens(fld.get(FORMAT_STYLE));
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
index c75608c..e378488 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
@@ -42,6 +42,7 @@ public class PlainTextEntityProcessor extends EntityProcessorBase {
ended = false;
}
+ @SuppressWarnings({"unchecked", "deprecation"})
@Override
public Map<String, Object> nextRow() {
if (ended) return null;
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
index 7a919de..1ed6dfa 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
@@ -43,7 +43,7 @@ public class RegexTransformer extends Transformer {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Map<String, Object> transformRow(Map<String, Object> row,
Context ctx) {
List<Map<String, String>> fields = ctx.getAllEntityFields();
@@ -128,7 +128,6 @@ public class RegexTransformer extends Transformer {
}
}
- @SuppressWarnings("unchecked")
private List<String> readBySplit(String splitBy, String value) {
String[] vals = value.split(splitBy);
List<String> l = new ArrayList<>();
@@ -136,7 +135,7 @@ public class RegexTransformer extends Transformer {
return l;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
private Object readfromRegExp(String reStr, String value, String columnName, String gNames) {
String[] groupNames = null;
if(gNames != null && gNames.trim().length() >0){
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
index f655edd..2995509 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
@@ -52,7 +52,6 @@ public class TemplateTransformer extends Transformer {
private Map<String ,List<String>> templateVsVars = new HashMap<>();
@Override
- @SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
@@ -94,6 +93,7 @@ public class TemplateTransformer extends Transformer {
return row;
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void addToRow(String key, Map<String, Object> row, Object value) {
Object prevVal = row.get(key);
if (prevVal != null) {
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
index c93b581..addee54 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
@@ -100,6 +100,7 @@ public class XPathEntityProcessor extends EntityProcessorBase {
}
+ @SuppressWarnings("deprecation")
private void initXpathReader(VariableResolver resolver) {
reinitXPathReader = false;
useSolrAddXml = Boolean.parseBoolean(context
@@ -183,7 +184,7 @@ public class XPathEntityProcessor extends EntityProcessorBase {
}
}
String url = context.getEntityAttribute(URL);
- List<String> l = url == null ? Collections.EMPTY_LIST : resolver.getVariables(url);
+ List<String> l = url == null ? Collections.emptyList() : resolver.getVariables(url);
for (String s : l) {
if (s.startsWith(entityName + ".")) {
if (placeHolderVariables == null)
@@ -224,7 +225,6 @@ public class XPathEntityProcessor extends EntityProcessorBase {
readUsefulVars(r);
}
- @SuppressWarnings("unchecked")
private Map<String, Object> fetchNextRow() {
Map<String, Object> r = null;
while (true) {
@@ -283,6 +283,7 @@ public class XPathEntityProcessor extends EntityProcessorBase {
}
+ @SuppressWarnings("unchecked")
private void initQuery(String s) {
Reader data = null;
try {
@@ -355,6 +356,7 @@ public class XPathEntityProcessor extends EntityProcessorBase {
}
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
protected Map<String, Object> readRow(Map<String, Object> record, String xpath) {
if (useSolrAddXml) {
List<String> names = (List<String>) record.get("name");
@@ -391,7 +393,6 @@ public class XPathEntityProcessor extends EntityProcessorBase {
}
- @SuppressWarnings("unchecked")
private Map<String, Object> readUsefulVars(Map<String, Object> r) {
Object val = r.get(HAS_MORE);
if (val != null)
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
index 13daf49..db0fbeb 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
@@ -585,6 +585,7 @@ public class XPathRecordReader {
* records values. If a fields value is a List then they have to be
* deep-copied for thread safety
*/
+ @SuppressWarnings("unchecked")
private static Map<String, Object> getDeepCopy(Map<String, Object> values) {
Map<String, Object> result = new HashMap<>();
for (Map.Entry<String, Object> entry : values.entrySet()) {
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
index 9a0f3a7..7a7b3ec 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
@@ -81,7 +81,7 @@ public class AbstractDIHCacheTestCase {
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public int compareTo(ControlData cd) {
Comparable c1 = (Comparable) data[0];
Comparable c2 = (Comparable) cd.data[0];
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
index 5428e18..c8c94bf 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.junit.After;
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..2c4c438 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,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
/**
* Helper for creating a Context instance. Useful for testing Transformers
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public static TestContext getContext(EntityProcessorWrapper parent,
VariableResolver resolver, DataSource parentDataSource,
String currProcess, final List<Map<String, String>> entityFields,
@@ -150,7 +151,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 +217,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
return delegate.getVariableResolver();
}
+ @SuppressWarnings("rawtypes")
@Override
public DataSource getDataSource() {
return delegate.getDataSource();
@@ -256,6 +258,7 @@ public abstract class AbstractDataImportHandlerTestCase extends
return delegate.getParentContext();
}
+ @SuppressWarnings("rawtypes")
@Override
public DataSource getDataSource(String name) {
return delegate.getDataSource(name);
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
index 2774044..dc06fc2 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
@@ -16,7 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.solr.common.util.SuppressForbidden;
import org.junit.After;
import org.junit.Before;
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockInitialContextFactory.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockInitialContextFactory.java
index 7568210..b32660a 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockInitialContextFactory.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockInitialContextFactory.java
@@ -41,7 +41,6 @@ public class MockInitialContextFactory implements InitialContextFactory {
}
@Override
- @SuppressWarnings("unchecked")
public javax.naming.Context getInitialContext(Hashtable env) {
return context;
}
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
index fe00d49..215234b 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
@@ -42,7 +42,7 @@ public class TestClobTransformer extends AbstractDataImportHandlerTestCase {
f.put(ClobTransformer.CLOB, "true");
f.put(DataImporter.NAME, "description");
flds.add(f);
- Context ctx = getContext(null, new VariableResolver(), null, Context.FULL_DUMP, flds, Collections.EMPTY_MAP);
+ Context ctx = getContext(null, new VariableResolver(), null, Context.FULL_DUMP, flds, Collections.emptyMap());
Transformer t = new ClobTransformer();
Map<String, Object> row = new HashMap<>();
Clob clob = (Clob) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[]{Clob.class}, new InvocationHandler() {
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 34e50e0..b006665 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -65,6 +65,7 @@ public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCa
super.tearDown();
}
+ @SuppressWarnings("rawtypes")
@Test
public void testSimple() throws Exception {
DirectXmlRequest req = new DirectXmlRequest("/dataimport", xml);
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
index 7a56fd2..1ea4a5e 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
@@ -42,7 +42,7 @@ public class TestDataConfig extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void testDataConfigWithDataSource() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
index 7f7278e..0cbee68 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
@@ -51,6 +51,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertNotNull(clz);
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityNoRows() {
DataImporter di = new DataImporter();
@@ -70,6 +71,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void testDeltaImportNoRows_MustNotCommit() {
DataImporter di = new DataImporter();
@@ -92,6 +94,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityOneRow() {
DataImporter di = new DataImporter();
@@ -121,6 +124,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testImportCommand() {
DataImporter di = new DataImporter();
@@ -150,6 +154,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityMultipleRows() {
DataImporter di = new DataImporter();
@@ -182,6 +187,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(3, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void templateXPath() {
DataImporter di = new DataImporter();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
index 27865cd..6279a23 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
@@ -36,6 +36,7 @@ import java.nio.charset.StandardCharsets;
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
@BeforeClass
@@ -44,7 +45,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSingleEntity() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -60,7 +60,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSingleEntity_CaseInsensitive() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desC", "one"));
@@ -88,7 +87,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDynamicFields() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -101,7 +99,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestParamsAsVariable() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "101", "desc", "ApacheSolr"));
@@ -116,7 +113,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDynamicFieldNames() throws Exception {
List rows = new ArrayList();
rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
@@ -130,7 +126,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestParamsAsFieldName() throws Exception {
List rows = new ArrayList();
rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
@@ -145,7 +140,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testContext() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -155,7 +149,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSkipDoc() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -169,7 +162,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSkipRow() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -204,7 +196,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testStopTransform() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -219,7 +210,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDeleteDocs() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
index ddccafe..351ec46 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
@@ -44,7 +44,7 @@ public class TestEphemeralCache extends AbstractDataImportHandlerTestCase {
assertFullImport(getDataConfigDotXml());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void setupMockData() {
List parentRows = new ArrayList();
parentRows.add(createMap("id", new BigDecimal("1"), "parent_s", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
index 1ea1ad4..4411251 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
@@ -80,6 +80,7 @@ public class TestErrorHandling extends AbstractDataImportHandlerTestCase {
assertQ(req("*:*"), "//*[@numFound='0']");
}
+ @SuppressWarnings("unchecked")
public void testTransformerErrorContinue() throws Exception {
StringDataSource.xml = wellformedXml;
List<Map<String, Object>> rows = new ArrayList<>();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
index 347a40b..fc57c14 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
@@ -31,6 +31,7 @@ import java.util.Map;
*/
public class TestFieldReader extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("unchecked")
@Test
public void simple() {
DataImporter di = new DataImporter();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
index dd2cf72..6cbac9a 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
@@ -40,10 +40,10 @@ import org.junit.Test;
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class TestFileListEntityProcessor extends AbstractDataImportHandlerTestCase {
@Test
- @SuppressWarnings("unchecked")
public void testSimple() throws IOException {
File tmpdir = createTempDir().toFile();
@@ -119,7 +119,6 @@ public class TestFileListEntityProcessor extends AbstractDataImportHandlerTestCa
assertEquals(l, new HashSet<>(fList));
}
- @SuppressWarnings("unchecked")
static List<String> getFiles(VariableResolver resolver, Map attrs) {
Context c = getContext(null,
resolver, null, Context.FULL_DUMP, Collections.EMPTY_LIST, attrs);
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
index 94f437c..80436a8 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+@SuppressWarnings("deprecation")
@ThreadLeakAction({ThreadLeakAction.Action.WARN})
@ThreadLeakLingering(linger = 0)
@ThreadLeakZombies(ThreadLeakZombies.Consequence.CONTINUE)
@@ -48,6 +49,7 @@ public class TestJdbcDataSourceConvertType extends AbstractDataImportHandlerTest
convertTypeTest("true", Long.class);
}
+ @SuppressWarnings("rawtypes")
private void convertTypeTest(String convertType, Class resultClass) throws Throwable {
JdbcDataSource dataSource = new JdbcDataSource();
Properties p = new Properties();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
index eb9989c..7aced3b 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
@@ -31,6 +31,7 @@ import java.util.*;
*/
public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testSimple() throws IOException {
@@ -71,6 +72,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(24, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testOnly_xml_files() throws IOException {
@@ -93,7 +95,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
@@ -109,6 +111,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(5, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testOnly_xml_files_no_xsd() throws IOException {
@@ -131,7 +134,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
@@ -147,6 +150,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(4, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testNo_xsd_files() throws IOException {
@@ -167,7 +171,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
index 2385438..be9eb4b 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
@@ -39,6 +39,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
* @since solr 1.4
*/
public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("unchecked")
@Test
public void testSimple() throws IOException {
DataImporter di = new DataImporter();
@@ -114,6 +115,7 @@ public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestC
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testSimple2() throws IOException {
DataImporter di = new DataImporter();
@@ -148,6 +150,7 @@ public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestC
}
+ @SuppressWarnings("rawtypes")
public static class DS extends DataSource {
static String s = "hello world";
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
index e792804..0d4971d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
@@ -36,6 +36,7 @@ import java.util.Map;
*/
public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("rawtypes")
@Test
public void testCommaSeparated() {
List<Map<String, String>> fields = new ArrayList<>();
@@ -52,6 +53,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
@Test
public void testGroupNames() {
List<Map<String, String>> fields = new ArrayList<>();
@@ -114,6 +116,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
assertEquals("valueWithoutSpaces", result.get("title_underscore")); // value should be returned as-is
}
+ @SuppressWarnings("unchecked")
@Test
public void testMileage() {
// init a whole pile of fields
@@ -163,6 +166,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
assertEquals("Fuel Economy range: 26 mpg Hwy, 19 mpg City", result.get("t3"));
}
+ @SuppressWarnings("unchecked")
@Test
public void testMultiValuedRegex(){
List<Map<String, String>> fields = new ArrayList<>();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java
index c106f8e..3262bfd 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestScriptTransformer.java
@@ -35,6 +35,7 @@ import java.util.Map;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class TestScriptTransformer extends AbstractDataImportHandlerTestCase {
@Test
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
index a2a9fff..1916210 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java
@@ -27,6 +27,7 @@ import org.junit.Test;
/**
* Unit test of SolrEntityProcessor. A very basic test outside of the DIH.
*/
+@SuppressWarnings("rawtypes")
public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCase {
private static final class NoNextMockProcessor extends SolrEntityProcessor {
@@ -66,6 +67,7 @@ public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCa
}
}
+ @SuppressWarnings("serial")
private MockSolrEntityProcessor createAndInit(List<Doc> docs, int rowsNum) {
MockSolrEntityProcessor processor = new MockSolrEntityProcessor(docs, rowsNum);
HashMap<String,String> entityAttrs = new HashMap<String,String>(){{put(SolrEntityProcessor.SOLR_SERVER,"http://route:66/no");}};
@@ -97,6 +99,7 @@ public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCa
processor.destroy();
}
}
+ @SuppressWarnings("serial")
@Test (expected = DataImportHandlerException.class)
public void testNoQuery() {
SolrEntityProcessor processor = new SolrEntityProcessor();
@@ -111,6 +114,7 @@ public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCa
}
}
+ @SuppressWarnings("serial")
public void testPagingQuery() {
SolrEntityProcessor processor = new NoNextMockProcessor() ;
@@ -135,6 +139,7 @@ public class TestSolrEntityProcessorUnit extends AbstractDataImportHandlerTestCa
}
}
+ @SuppressWarnings("serial")
public void testCursorQuery() {
SolrEntityProcessor processor = new NoNextMockProcessor() ;
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
index 7b0e613..8d6a5c6 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
@@ -105,6 +105,7 @@ public class TestSortedMapBackedCache extends AbstractDIHCacheTestCase {
}
}
+ @SuppressWarnings("unused")
@Test
public void testCacheReopensWithUpdate() {
DIHCache cache = null;
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
index b5c3811..b189895 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
@@ -31,10 +31,10 @@ import java.util.Arrays;
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class TestTemplateTransformer extends AbstractDataImportHandlerTestCase {
@Test
- @SuppressWarnings("unchecked")
public void testTransformRow() {
List fields = new ArrayList();
fields.add(createMap("column", "firstName"));
@@ -71,7 +71,6 @@ public class TestTemplateTransformer extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testTransformRowMultiValue() {
List fields = new ArrayList();
fields.add(createMap("column", "year"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java
index 0028564..1431de2 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java
@@ -147,7 +147,7 @@ public class TestVariableResolver extends AbstractDataImportHandlerTestCase {
l.add(m);
resolver.setEvaluators(new DataImporter().getEvaluators(l));
ContextImpl context = new ContextImpl(null, resolver, null,
- Context.FULL_DUMP, Collections.EMPTY_MAP, null, null);
+ Context.FULL_DUMP, Collections.emptyMap(), null, null);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
index 8ee6878..7847710 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
@@ -23,7 +23,7 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.Test;
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestWriterImpl.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestWriterImpl.java
index e5c2a94..c56d658 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestWriterImpl.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestWriterImpl.java
@@ -41,7 +41,7 @@ public class TestWriterImpl extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void testDataConfigWithDataSource() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
index 72da77a..62f638d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
@@ -36,6 +36,7 @@ import org.junit.Test;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class TestXPathEntityProcessor extends AbstractDataImportHandlerTestCase {
boolean simulateSlowReader;
boolean simulateSlowResultProcessor;
@@ -93,7 +94,6 @@ public class TestXPathEntityProcessor extends AbstractDataImportHandlerTestCase
assertEquals("ΓΌ", l.get(2));
}
- @SuppressWarnings({"rawtypes", "unchecked"})
@Test
public void testMultiValuedWithMultipleDocuments() throws Exception {
Map entityAttrs = createMap("name", "e", "url", "testdata.xml", XPathEntityProcessor.FOR_EACH, "/documents/doc");
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
index 2b0757a..47409fc 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
@@ -29,6 +29,7 @@ import org.junit.Test;
*
* @since solr 1.3
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
@Test
public void testBasic() {
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
index 9279d28..0476a44 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
@@ -93,6 +93,7 @@ public class TestZKPropertiesWriter extends AbstractDataImportHandlerTestCase {
zkDir = null;
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
@SuppressForbidden(reason = "Needs currentTimeMillis to construct date stamps")
@Test
public void testZKPropertiesWriter() throws Exception {
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index cd5d4af..8cc6313 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -51,10 +51,6 @@ import org.apache.tika.sax.XHTMLContentHandler;
import org.apache.tika.sax.xpath.Matcher;
import org.apache.tika.sax.xpath.MatchingContentHandler;
import org.apache.tika.sax.xpath.XPathParser;
-import org.apache.xml.serialize.BaseMarkupSerializer;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.TextSerializer;
-import org.apache.xml.serialize.XMLSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
@@ -131,6 +127,7 @@ public class ExtractingDocumentLoader extends ContentStreamLoader {
doAdd(handler, templateAdd);
}
+ @SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
@Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp,
ContentStream stream, UpdateRequestProcessor processor) throws Exception {
@@ -176,16 +173,16 @@ public class ExtractingDocumentLoader extends ContentStreamLoader {
ContentHandler parsingHandler = handler;
StringWriter writer = null;
- BaseMarkupSerializer serializer = null;
+ org.apache.xml.serialize.BaseMarkupSerializer serializer = null;
if (extractOnly == true) {
String extractFormat = params.get(ExtractingParams.EXTRACT_FORMAT, "xml");
writer = new StringWriter();
if (extractFormat.equals(TEXT_FORMAT)) {
- serializer = new TextSerializer();
+ serializer = new org.apache.xml.serialize.TextSerializer();
serializer.setOutputCharStream(writer);
- serializer.setOutputFormat(new OutputFormat("Text", "UTF-8", true));
+ serializer.setOutputFormat(new org.apache.xml.serialize.OutputFormat("Text", "UTF-8", true));
} else {
- serializer = new XMLSerializer(writer, new OutputFormat("XML", "UTF-8", true));
+ serializer = new org.apache.xml.serialize.XMLSerializer(writer, new org.apache.xml.serialize.OutputFormat("XML", "UTF-8", true));
}
if (xpathExpr != null) {
Matcher matcher =
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
index 3af9b5b..dfa068b 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
@@ -55,7 +55,7 @@ public class ExtractingRequestHandler extends ContentStreamHandlerBase implement
}
@Override
- public void init(NamedList args) {
+ public void init(@SuppressWarnings("rawtypes") NamedList args) {
super.init(args);
}
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
index 9264a1d..e42caad 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
@@ -85,6 +85,7 @@ public class XLSXResponseWriter extends RawResponseWriter {
}
}
+@SuppressWarnings("rawtypes")
class XLSXWriter extends TabularResponseWriter {
static class SerialWriteWorkbook {
@@ -144,7 +145,7 @@ class XLSXWriter extends TabularResponseWriter {
} catch (IOException e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- String stacktrace = sw.toString();
+ String cd = sw.toString();
}finally {
swb.dispose();
}
@@ -232,6 +233,7 @@ class XLSXWriter extends TabularResponseWriter {
//NOTE: a document cannot currently contain another document
List tmpList;
+ @SuppressWarnings({"unchecked"})
@Override
public void writeSolrDocument(String name, SolrDocument doc, ReturnFields returnFields, int idx ) throws IOException {
if (tmpList == null) {
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 14de842..96152f0 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -461,6 +461,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
// Note: If you load a plain text file specifying neither MIME type nor filename, extraction will silently fail. This is because Tika's
// automatic MIME type detection will fail, and it will default to using an empty-string-returning default parser
+ @SuppressWarnings("rawtypes")
@Test
public void testExtractOnly() throws Exception {
ExtractingRequestHandler handler = (ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
@@ -498,6 +499,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
}
+ @SuppressWarnings("rawtypes")
@Test
public void testXPath() throws Exception {
ExtractingRequestHandler handler = (ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.java
index b4e0253..dd42e3c 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.java
@@ -60,6 +60,7 @@ public class OpenNLPLangDetectUpdateProcessorFactory extends UpdateRequestProces
protected SolrParams invariants;
private SolrResourceLoader solrResourceLoader;
+ @SuppressWarnings("rawtypes")
@Override
public void init( NamedList args )
{
@@ -107,6 +108,7 @@ public class OpenNLPLangDetectUpdateProcessorFactory extends UpdateRequestProces
return new OpenNLPLangDetectUpdateProcessor(req, rsp, next, model);
}
+ @SuppressWarnings("deprecation")
private void loadModel() throws IOException {
InputStream is = null;
try{
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
index 5a43bd5..75d175c 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.tika.language.LanguageIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,12 +43,13 @@ public class TikaLanguageIdentifierUpdateProcessor extends LanguageIdentifierUpd
super(req, rsp, next);
}
+ @SuppressWarnings("deprecation")
@Override
protected List<DetectedLanguage> detectLanguage(Reader solrDocReader) {
String content = SolrInputDocumentReader.asString(solrDocReader);
List<DetectedLanguage> languages = new ArrayList<>();
if (content.length() != 0) {
- LanguageIdentifier identifier = new LanguageIdentifier(content);
+ org.apache.tika.language.LanguageIdentifier identifier = new org.apache.tika.language.LanguageIdentifier(content);
// FIXME: Hack - we get the distance from toString and calculate our own certainty score
Double distance = Double.parseDouble(tikaSimilarityPattern.matcher(identifier.toString()).replaceFirst("$1"));
// This formula gives: 0.02 => 0.8, 0.1 => 0.5 which is a better sweetspot than isReasonablyCertain()
diff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
index a74c80f..efb4f25 100644
--- a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
+++ b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
@@ -384,6 +384,7 @@ public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends S
/*
Utility test method to process a clone of a document
*/
+ @SuppressWarnings("rawtypes")
private SolrInputDocument process(SolrInputDocument origDoc) {
SolrInputDocument modifiedDoc = origDoc.deepCopy();
if (random().nextBoolean()) {
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
index e142610..9d70995 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java
@@ -57,6 +57,7 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
* <code>totalPoolThreads</code> imposes a contention between the queries if
* <code>(totalPoolThreads < numThreadsPerRequest * total parallel queries)</code>.
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
final public class LTRThreadModule extends CloseHook implements NamedListInitializedPlugin {
public static LTRThreadModule getInstance(NamedList args) {
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
index 908b073..0c33daf 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
@@ -78,6 +78,7 @@ public class LinearModel extends LTRScoringModel {
*/
protected Float[] featureToWeight;
+ @SuppressWarnings("unchecked")
public void setWeights(Object weights) {
final Map<String,Double> modelWeights = (Map<String,Double>) weights;
for (int ii = 0; ii < features.size(); ++ii) {
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
index c3e434b..2587eed 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
@@ -88,6 +88,7 @@ import org.apache.solr.util.SolrPluginUtils;
* Advances in Neural Information Processing Systems (NIPS), 2007.</a>
* </ul>
*/
+@SuppressWarnings("unchecked")
public class MultipleAdditiveTreesModel extends LTRScoringModel {
/**
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java
index d72b29b..e46b7d4 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java
@@ -92,6 +92,7 @@ import org.apache.solr.util.SolrPluginUtils;
* Proceedings of the 22nd International Conference on Machine Learning (ICML), ACM, 2005.</a>
* </ul>
*/
+@SuppressWarnings("unchecked")
public class NeuralNetworkModel extends LTRScoringModel {
/**
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
index c6c4d7b..cc9246f 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
@@ -110,6 +110,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
this.csvFeatureSeparator = csvFeatureSeparator.charAt(0);
}
+ @SuppressWarnings("unchecked")
@Override
public void init(@SuppressWarnings("rawtypes") NamedList args) {
super.init(args);
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
index af99775..e9e8a53 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java
@@ -78,6 +78,7 @@ public class LTRQParserPlugin extends QParserPlugin implements ResourceLoaderAwa
**/
public static final String RERANK_DOCS = "reRankDocs";
+ @SuppressWarnings("unchecked")
@Override
public void init(@SuppressWarnings("rawtypes") NamedList args) {
super.init(args);
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.java
index 60cabcc..f735fc9 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.java
@@ -105,7 +105,6 @@ public class ManagedModelStore extends ManagedResource implements ManagedResourc
private Object managedData;
- @SuppressWarnings("unchecked")
@Override
protected void onManagedDataLoadedFromStorage(NamedList<?> managedInitArgs,
Object managedData) throws SolrException {
@@ -119,6 +118,7 @@ public class ManagedModelStore extends ManagedResource implements ManagedResourc
}
+ @SuppressWarnings("unchecked")
public void loadStoredModels() {
log.info("------ managed models ~ loading ------");
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
index 9e79f7d..621ef5c 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
@@ -88,6 +88,7 @@ public class MetricsQuery {
return jsonQueries;
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static List<MetricsQuery> from(Node node) throws JsonQueryException {
List<MetricsQuery> metricsQueries = new ArrayList<>();
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
index 85f0ec8..12214c9 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
@@ -56,11 +56,13 @@ public class PrometheusExporterSettings {
}
+ @SuppressWarnings("rawtypes")
public static PrometheusExporterSettings from(Node settings) {
NamedList config = DOMUtil.childNodesToNamedList(settings);
Builder builder = builder();
+ @SuppressWarnings("unchecked")
List<NamedList> httpClientSettings = config.getAll("httpClients");
for (NamedList entry : httpClientSettings) {
diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
index 3f43843..13171e3 100644
--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
@@ -47,6 +47,7 @@ public class SolrExporterTestBase extends PrometheusExporterTestBase {
private CloseableHttpClient httpClient;
private int promtheusExporterPort;
+ @SuppressWarnings("deprecation")
@Override
@After
public void tearDown() throws Exception {
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
index 828d29b..e55be12 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
@@ -18,7 +18,6 @@ package org.apache.solr.response;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.io.Writer;
@@ -58,6 +57,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.SORT;
+@SuppressWarnings("rawtypes")
public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAware {
// init param names, these are _only_ loaded at init time (no per-request control of these)
// - multiple different named writers could be created with different init params
@@ -128,7 +128,6 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
public void inform(SolrCore core) {
// need to leverage SolrResourceLoader, so load init.properties.file here instead of init()
if (initPropertiesFileName != null) {
- InputStream is = null;
try {
velocityInitProps.load(new InputStreamReader(core.getResourceLoader().openResource(initPropertiesFileName), StandardCharsets.UTF_8));
} catch (IOException e) {
@@ -195,6 +194,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
}
}
+ @SuppressWarnings("unchecked")
private VelocityContext createContext(SolrQueryRequest request, SolrQueryResponse response) {
VelocityContext context = new VelocityContext();
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
index f66c88e..efbb0bd 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
@@ -28,7 +28,7 @@ import static org.noggit.JSONParser.*;
/**
* A Streaming parser for json to emit one record at a time.
*/
-
+@SuppressWarnings({"unchecked", "rawtypes"})
public class JsonRecordReader {
public static final String DELIM = ".";