Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15385 RawTypes Part II, Searching for NamedList (#165)

Mike Drob916b7a04f654
diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java
index 7e60e9a7f13..351edc3f513 100644
--- a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java
+++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java
@@ -214,7 +214,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
// high level (loose) check for which type of config we have.
//
@@ -258,7 +258,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
* init helper method that should only be called when we know for certain that both the
* "source" and "dest" init params do <em>not</em> exist.
*/
- private void initSimpleRegexReplacement(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private void initSimpleRegexReplacement(NamedList<?> args) {
// The syntactic sugar for the case where there is only one regex pattern for source and the same pattern
// is used for the destination pattern...
//
@@ -313,8 +313,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
* init helper method that should only be called when we know for certain that both the
* "source" and "dest" init params <em>do</em> exist.
*/
- @SuppressWarnings("unchecked")
- private void initSourceSelectorSyntax(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private void initSourceSelectorSyntax(NamedList<?> args) {
// Full and complete syntax where source and dest are mandatory.
//
// source may be a single string or a selector.
@@ -332,18 +331,17 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
Object d = args.remove(DEST_PARAM);
assert null != d;
- List<Object> sources = args.getAll(SOURCE_PARAM);
+ List<?> sources = args.getAll(SOURCE_PARAM);
assert null != sources;
if (1 == sources.size()) {
if (sources.get(0) instanceof NamedList) {
// nested set of selector options
- @SuppressWarnings({"rawtypes"})
- NamedList selectorConfig = (NamedList) args.remove(SOURCE_PARAM);
+ NamedList<?> selectorConfig = (NamedList<?>) args.remove(SOURCE_PARAM);
srcInclusions = parseSelectorParams(selectorConfig);
- List<Object> excList = selectorConfig.getAll("exclude");
+ List<?> excList = selectorConfig.getAll("exclude");
for (Object excObj : excList) {
if (null == excObj) {
@@ -354,8 +352,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
throw new SolrException(SERVER_ERROR, "Init param '" + SOURCE_PARAM +
"' child 'exclude' must be <lst/>");
}
- @SuppressWarnings({"rawtypes"})
- NamedList exc = (NamedList) excObj;
+ NamedList<?> exc = (NamedList<?>) excObj;
srcExclusions.add(parseSelectorParams(exc));
if (0 < exc.size()) {
throw new SolrException(SERVER_ERROR, "Init param '" + SOURCE_PARAM +
@@ -387,8 +384,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
}
if (d instanceof NamedList) {
- @SuppressWarnings({"rawtypes"})
- NamedList destList = (NamedList) d;
+ NamedList<?> destList = (NamedList<?>) d;
Object patt = destList.remove(PATTERN_PARAM);
Object replacement = destList.remove(REPLACEMENT_PARAM);
@@ -572,7 +568,7 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory
}
/** macro */
- private static SelectorParams parseSelectorParams(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private static SelectorParams parseSelectorParams(NamedList<?> args) {
return FieldMutatingUpdateProcessorFactory.parseSelectorParams(args);
}
}
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.java
index d6ff05e19aa..c01f9332b74 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.java
@@ -32,10 +32,9 @@ import org.apache.solr.common.util.NamedList;
public class PivotFacet extends AnalyticsFacet implements StreamingFacet {
private final PivotHead<?> pivotHead;
- @SuppressWarnings({"unchecked", "rawtypes"})
public PivotFacet(String name, PivotNode<?> topPivot) {
super(name);
- this.pivotHead = new PivotHead(topPivot);
+ this.pivotHead = new PivotHead<>(topPivot);
}
@Override
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
index 16903aa7b71..e68add3aa0d 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
@@ -79,13 +79,12 @@ public abstract class SortableFacet extends AnalyticsFacet {
* @param facetResults to apply sorting options to
* @return the sorted results
*/
- @SuppressWarnings({"unchecked", "rawtypes"})
protected Iterable<FacetBucket> applyOptions(List<FacetBucket> facetResults) {
// Sorting the buckets if a sort specification is provided
if (sort == null || facetResults.isEmpty()) {
return facetResults;
}
- Comparator comp = sort.getComparator();
+ Comparator<FacetBucket> comp = sort.getComparator();
Collections.sort(facetResults, comp);
Iterable<FacetBucket> facetResultsIter = facetResults;
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
index 5248181b76b..a743586ecfd 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
@@ -36,7 +36,7 @@ public class AnalyticsComponent extends SearchComponent {
public static final String COMPONENT_NAME = "analytics";
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
AnalyticsRequestParser.init();
}
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.java b/solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.java
index ac796a68974..aa7fed0d69f 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.java
@@ -27,7 +27,6 @@ import org.apache.solr.analytics.AnalyticsRequestManager;
import org.apache.solr.analytics.stream.AnalyticsShardResponseParser;
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
@@ -54,9 +53,6 @@ public class AnalyticsShardResponseWriter implements BinaryQueryResponseWriter {
return BinaryResponseParser.BINARY_CONTENT_TYPE;
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
/**
* Manages the streaming of analytics reduction data if no exception occurred.
* Otherwise the exception is streamed over.
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
index 7d728f46063..afb4c9f92fb 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
@@ -225,20 +225,17 @@ public class ClusteringComponent extends SearchComponent implements SolrCoreAwar
}
@Override
- @SuppressWarnings({"rawtypes", "unchecked"})
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
if (args != null) {
- @SuppressWarnings("unchecked")
- NamedList<Object> initParams = (NamedList<Object>) args;
- for (Map.Entry<String, Object> entry : initParams) {
+ for (Map.Entry<String, ?> entry : args) {
if (!INIT_SECTION_ENGINE.equals(entry.getKey())) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Unrecognized configuration entry: " + entry.getKey());
}
- declaredEngines.add(new EngineEntry(((NamedList<Object>) entry.getValue()).toSolrParams()));
+ declaredEngines.add(new EngineEntry(((NamedList<?>) entry.getValue()).toSolrParams()));
}
}
}
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 ccbdb1a2de2..340ca8f0eff 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
@@ -21,7 +21,6 @@ import java.io.InputStream;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.ContentStreamHandlerBase;
import org.apache.solr.handler.loader.ContentStreamLoader;
@@ -51,11 +50,6 @@ public class ExtractingRequestHandler extends ContentStreamHandlerBase implement
return PermissionNameProvider.Name.READ_PERM;
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- super.init(args);
- }
-
@Override
public void inform(SolrCore core) {
try {
diff --git a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java b/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
index c9555256675..ca6a602ebcd 100644
--- a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
+++ b/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
@@ -71,7 +71,7 @@ public class GCSBackupRepository implements BackupRepository {
protected Storage storage;
- private NamedList<Object> config = null;
+ private NamedList<?> config = null;
protected String bucketName = null;
protected String credentialPath = null;
protected int writeBufferSizeBytes;
@@ -99,9 +99,8 @@ public class GCSBackupRepository implements BackupRepository {
}
@Override
- @SuppressWarnings({"rawtypes", "unchecked"})
- public void init(NamedList args) {
- this.config = (NamedList<Object>) args;
+ public void init(NamedList<?> args) {
+ this.config = args;
final GCSConfigParser configReader = new GCSConfigParser();
final GCSConfigParser.GCSConfig parsedConfig = configReader.parseConfiguration(config);
diff --git a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java b/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java
index 0e364d0afb5..17ec5ddb24b 100644
--- a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java
+++ b/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java
@@ -60,11 +60,11 @@ public class GCSConfigParser {
private static final int DEFAULT_RPC_MAX_TIMEOUT_MILLIS = 30000;
private static final double DEFAULT_RPC_SUBSEQUENT_TIMEOUT_MULTIPLIER = 1.0;
- public GCSConfig parseConfiguration(NamedList<Object> repositoryConfig) {
+ public GCSConfig parseConfiguration(NamedList<?> repositoryConfig) {
return parseConfiguration(repositoryConfig, System.getenv());
}
- public GCSConfig parseConfiguration(NamedList<Object> repoConfig, Map<String, String> envVars) {
+ public GCSConfig parseConfiguration(NamedList<?> repoConfig, Map<String, String> envVars) {
final String bucketName = parseBucket(repoConfig, envVars);
final String credentialPathStr = parseCredentialPath(repoConfig, envVars);
final int writeBufferSizeBytes = getIntOrDefault(repoConfig, GCS_WRITE_BUFFER_SIZE_PARAM_NAME, DEFAULT_GCS_WRITE_BUFFER_SIZE_VALUE);
@@ -77,7 +77,7 @@ public class GCSConfigParser {
* The GCS bucket name is retrieved from the NL 'bucket' key, or the 'GCS_BUCKET' env-var, or the value
* 'solrBackupsBucket' is used (in that order).
*/
- private String parseBucket(NamedList<Object> repoConfig, Map<String, String> envVars) {
+ private String parseBucket(NamedList<?> repoConfig, Map<String, String> envVars) {
if (repoConfig.get(GCS_BUCKET_PARAM_NAME) != null) {
return repoConfig.get(GCS_BUCKET_PARAM_NAME).toString();
}
@@ -85,7 +85,7 @@ public class GCSConfigParser {
return envVars.getOrDefault(GCS_BUCKET_ENV_VAR_NAME, DEFAULT_GCS_BUCKET_VALUE);
}
- private String parseCredentialPath(NamedList<Object> repoConfig, Map<String, String> envVars) {
+ private String parseCredentialPath(NamedList<?> repoConfig, Map<String, String> envVars) {
if (repoConfig.get(GCS_CREDENTIAL_PARAM_NAME) != null) {
return repoConfig.get(GCS_CREDENTIAL_PARAM_NAME).toString();
}
@@ -100,21 +100,21 @@ public class GCSConfigParser {
GCS_CREDENTIAL_ENV_VAR_NAME + "'";
}
- private int getIntOrDefault(NamedList<Object> config, String propName, int defaultValue) {
+ private int getIntOrDefault(NamedList<?> config, String propName, int defaultValue) {
if (config.get(propName) != null) {
return Integer.parseInt(config.get(propName).toString());
}
return defaultValue;
}
- private double getDoubleOrDefault(NamedList<Object> config, String propName, double defaultValue) {
+ private double getDoubleOrDefault(NamedList<?> config, String propName, double defaultValue) {
if (config.get(propName) != null) {
return Double.parseDouble(config.get(propName).toString());
}
return defaultValue;
}
- private StorageOptions.Builder parseStorageOptions(NamedList<Object> repoConfig) {
+ private StorageOptions.Builder parseStorageOptions(NamedList<?> repoConfig) {
final StorageOptions.Builder builder = StorageOptions.newBuilder();
builder.setTransportOptions(StorageOptions.getDefaultHttpTransportOptions().toBuilder()
.setConnectTimeout(getIntOrDefault(repoConfig, HTTP_CONNECT_TIMEOUT_MILLIS_NAME, DEFAULT_HTTP_CONNECT_TIMEOUT_MILLIS))
diff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
index f52e5806d99..f9b9f1711c5 100644
--- a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
+++ b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
@@ -19,7 +19,6 @@ package org.apache.solr.jaeger;
import io.jaegertracing.Configuration;
import io.opentracing.Tracer;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.TracerConfigurator;
public class JaegerTracerConfigurator extends TracerConfigurator {
@@ -29,9 +28,4 @@ public class JaegerTracerConfigurator extends TracerConfigurator {
// See javadocs on Configuration for how to configure via sys props or env vars
return Configuration.fromEnv("solr").getTracer();
}
-
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
}
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java
index a140807f3a5..e312f5c5869 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java
@@ -67,11 +67,10 @@ public class LangDetectLanguageIdentifierUpdateProcessorFactory extends
/**
* The UpdateRequestProcessor may be initialized in solrconfig.xml similarly
* to a RequestHandler, with defaults, appends and invariants.
- * @param args a NamedList with the configuration parameters
+ * @param args a NamedList with the configuration parameters
*/
@Override
- @SuppressWarnings("rawtypes")
- public void init( NamedList args )
+ public void init(NamedList<?> args )
{
try {
loadData();
@@ -81,18 +80,18 @@ public class LangDetectLanguageIdentifierUpdateProcessorFactory extends
if (args != null) {
Object o;
o = args.get("defaults");
- if (o != null && o instanceof NamedList) {
- defaults = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ defaults = ((NamedList<?>) o).toSolrParams();
} else {
defaults = args.toSolrParams();
}
o = args.get("appends");
- if (o != null && o instanceof NamedList) {
- appends = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ appends = ((NamedList<?>) o).toSolrParams();
}
o = args.get("invariants");
- if (o != null && o instanceof NamedList) {
- invariants = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ invariants = ((NamedList<?>) o).toSolrParams();
}
}
}
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 c5aa3a71ee1..8bcc6de6c12 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
@@ -61,23 +61,23 @@ public class OpenNLPLangDetectUpdateProcessorFactory extends UpdateRequestProces
private SolrResourceLoader solrResourceLoader;
@Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args )
+ public void init(NamedList<?> args )
{
if (args != null) {
Object o;
o = args.get("defaults");
- if (o != null && o instanceof NamedList) {
- defaults = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ defaults = ((NamedList<?>) o).toSolrParams();
} else {
defaults = args.toSolrParams();
}
o = args.get("appends");
- if (o != null && o instanceof NamedList) {
- appends = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ appends = ((NamedList<?>) o).toSolrParams();
}
o = args.get("invariants");
- if (o != null && o instanceof NamedList) {
- invariants = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ invariants = ((NamedList<?>) o).toSolrParams();
}
// Look for model filename in invariants, then in args, then defaults
@@ -86,8 +86,8 @@ public class OpenNLPLangDetectUpdateProcessorFactory extends UpdateRequestProces
}
if (modelFile == null) {
o = args.get(MODEL_PARAM);
- if (o != null && o instanceof String) {
- modelFile = (String)o;
+ if (o instanceof String) {
+ modelFile = (String) o;
} else {
modelFile = defaults.get(MODEL_PARAM);
if (modelFile == null) {
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java
index 838311b94de..0c5f9e6520f 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java
@@ -55,27 +55,26 @@ public class TikaLanguageIdentifierUpdateProcessorFactory extends
/**
* The UpdateRequestProcessor may be initialized in solrconfig.xml similarly
* to a RequestHandler, with defaults, appends and invariants.
- * @param args a NamedList with the configuration parameters
+ * @param args a NamedList with the configuration parameters
*/
@Override
- @SuppressWarnings("rawtypes")
- public void init( NamedList args )
+ public void init(NamedList<?> args )
{
if (args != null) {
Object o;
o = args.get("defaults");
- if (o != null && o instanceof NamedList) {
- defaults = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ defaults = ((NamedList<?>) o).toSolrParams();
} else {
defaults = args.toSolrParams();
}
o = args.get("appends");
- if (o != null && o instanceof NamedList) {
- appends = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ appends = ((NamedList<?>) o).toSolrParams();
}
o = args.get("invariants");
- if (o != null && o instanceof NamedList) {
- invariants = ((NamedList) o).toSolrParams();
+ if (o instanceof NamedList) {
+ invariants = ((NamedList<?>) o).toSolrParams();
}
}
}
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 856f4dfea7f..acef049bdde 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.ltr;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Semaphore;
@@ -59,11 +58,10 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
*/
final public class LTRThreadModule extends CloseHook implements NamedListInitializedPlugin {
- public static LTRThreadModule getInstance(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public static LTRThreadModule getInstance(NamedList<?> args) {
final LTRThreadModule threadManager;
- @SuppressWarnings({"rawtypes"})
- final NamedList threadManagerArgs = extractThreadModuleParams(args);
+ final NamedList<Object> threadManagerArgs = extractThreadModuleParams(args);
// if and only if there are thread module args then we want a thread module!
if (threadManagerArgs.size() > 0) {
// create and initialize the new instance
@@ -78,14 +76,11 @@ final public class LTRThreadModule extends CloseHook implements NamedListInitial
private static String CONFIG_PREFIX = "threadModule.";
- @SuppressWarnings({"unchecked", "rawtypes"})
- private static NamedList extractThreadModuleParams(NamedList args) {
+ private static NamedList<Object> extractThreadModuleParams(NamedList<?> args) {
// gather the thread module args from amongst the general args
- final NamedList extractedArgs = new NamedList();
- for (Iterator<Map.Entry<String,Object>> it = args.iterator();
- it.hasNext(); ) {
- final Map.Entry<String,Object> entry = it.next();
+ final NamedList<Object> extractedArgs = new NamedList<>();
+ for (final Map.Entry<String, ?> entry : args) {
final String key = entry.getKey();
if (key.startsWith(CONFIG_PREFIX)) {
extractedArgs.add(key.substring(CONFIG_PREFIX.length()), entry.getValue());
@@ -120,8 +115,7 @@ final public class LTRThreadModule extends CloseHook implements NamedListInitial
}
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
if (args != null) {
SolrPluginUtils.invokeSetters(this, args);
}
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 3e301858c65..310efb68f32 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
@@ -113,8 +113,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
}
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
threadManager = LTRThreadModule.getInstance(args);
SolrPluginUtils.invokeSetters(this, args);
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
index f126e3ee2bc..bffa0b3be3c 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
@@ -32,8 +32,7 @@ import org.apache.solr.util.SolrPluginUtils;
public class LTRInterleavingTransformerFactory extends TransformerFactory {
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
SolrPluginUtils.invokeSetters(this, 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 d8832ffa233..f29e7f3828e 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
@@ -86,8 +86,7 @@ public class LTRQParserPlugin extends QParserPlugin implements ResourceLoaderAwa
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
threadManager = LTRThreadModule.getInstance(args);
SolrPluginUtils.invokeSetters(this, args);
diff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java b/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java
index e0de01bec1e..4543b97f6b4 100644
--- a/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java
+++ b/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java
@@ -178,8 +178,7 @@ public class ScriptUpdateProcessorFactory extends UpdateRequestProcessorFactory
private ScriptEngineCustomizer scriptEngineCustomizer;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- @SuppressWarnings({"unchecked"})
+ public void init(NamedList<?> args) {
Collection<String> scripts =
args.removeConfigArgs(SCRIPT_ARG);
if (scripts.isEmpty()) {
diff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java b/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java
index cebdb4adb30..22b21b26f45 100644
--- a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java
+++ b/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java
@@ -51,7 +51,7 @@ public class XSLTResponseWriter implements QueryResponseWriter {
private Integer xsltCacheLifetimeSeconds = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
+ public void init(NamedList<?> n) {
final SolrParams p = n.toSolrParams();
xsltCacheLifetimeSeconds = p.getInt(XSLT_CACHE_PARAM, XSLT_CACHE_DEFAULT);
}
diff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.java b/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.java
index 9ea91ba6c00..d58e03c1630 100644
--- a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.java
+++ b/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.java
@@ -49,7 +49,7 @@ import org.xml.sax.XMLReader;
public class XSLTUpdateRequestHandler extends UpdateRequestHandler {
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
setAssumeContentType("application/xml");
diff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java b/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java
index 78ea2eca135..bdde784674c 100644
--- a/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java
+++ b/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java
@@ -83,7 +83,7 @@ public class XSLTUpdateRequestHandlerTest extends SolrTestCaseJ4 {
SolrQueryResponse rsp = new SolrQueryResponse();
//try (UpdateRequestHandler handler = new UpdateRequestHandler()) {
try (XSLTUpdateRequestHandler handler = new XSLTUpdateRequestHandler()) {
- handler.init(new NamedList<String>());
+ handler.init(new NamedList<>());
handler.handleRequestBody(req, rsp);
}
StringWriter sw = new StringWriter(32000);
diff --git a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
index 6587d1f89df..f268733fbea 100644
--- a/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
+++ b/solr/core/src/java/org/apache/solr/api/AnnotatedApi.java
@@ -215,8 +215,7 @@ public class AnnotatedApi extends Api implements PermissionNameProvider , Closea
commands.get(cmd.name).invoke(req, rsp, cmd);
}
- @SuppressWarnings({"rawtypes"})
- List<Map> errs = CommandOperation.captureErrors(cmds);
+ List<Map<String, Object>> errs = CommandOperation.captureErrors(cmds);
if (!errs.isEmpty()) {
log.error("{}{}", ERR, Utils.toJSONString(errs));
throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST, ERR, errs);
diff --git a/solr/core/src/java/org/apache/solr/api/ApiBag.java b/solr/core/src/java/org/apache/solr/api/ApiBag.java
index 7efcdec9649..25ff09f9519 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiBag.java
+++ b/solr/core/src/java/org/apache/solr/api/ApiBag.java
@@ -167,7 +167,7 @@ public class ApiBag {
this.isCoreSpecific = isCoreSpecific;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({"unchecked"})
public void call(SolrQueryRequest req, SolrQueryResponse rsp) {
String cmd = req.getParams().get("command");
@@ -199,8 +199,8 @@ public class ApiBag {
.collect(Collectors.toList()));
}
}
- List l = (List) rsp.getValues().get("spec");
- if (l == null) rsp.getValues().add("spec", l = new ArrayList());
+ List<Object> l = (List<Object>) rsp.getValues().get("spec");
+ if (l == null) rsp.getValues().add("spec", l = new ArrayList<>());
l.add(result);
}
}
@@ -208,10 +208,10 @@ public class ApiBag {
public static Map<String, JsonSchemaValidator> getParsedSchema(ValidatingJsonMap commands) {
Map<String, JsonSchemaValidator> validators = new HashMap<>();
for (Object o : commands.entrySet()) {
- @SuppressWarnings({"rawtypes"})
- Map.Entry cmd = (Map.Entry) o;
+ @SuppressWarnings("unchecked")
+ Map.Entry<String, Map<?,?>> cmd = (Map.Entry<String, Map<?,?>>) o;
try {
- validators.put((String) cmd.getKey(), new JsonSchemaValidator((Map) cmd.getValue()));
+ validators.put(cmd.getKey(), new JsonSchemaValidator(cmd.getValue()));
} catch (Exception e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error in api spec", e);
}
@@ -301,19 +301,19 @@ public class ApiBag {
Object specObj = info == null ? null : info.attributes.get("spec");
if (specObj == null) specObj = "emptySpec";
if (specObj instanceof Map) {
- @SuppressWarnings({"rawtypes"})
- Map map = (Map) specObj;
+ // Value from Map<String,String> can be a Map because in PluginInfo(String, Map) we assign a Map<String, Object>
+ // assert false : "got a map when this should only be Strings";
+ Map<?,?> map = (Map<?,?>) specObj;
return () -> ValidatingJsonMap.getDeepCopy(map, 4, false);
} else {
return Utils.getSpec((String) specObj);
}
}
- @SuppressWarnings({"rawtypes"})
public static List<CommandOperation> getCommandOperations(ContentStream stream, Map<String, JsonSchemaValidator> validators, boolean validate) {
List<CommandOperation> parsedCommands = null;
try {
- parsedCommands = CommandOperation.readCommands(Collections.singleton(stream), new NamedList());
+ parsedCommands = CommandOperation.readCommands(Collections.singleton(stream), new NamedList<>());
} catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Unable to parse commands",e);
}
@@ -341,8 +341,7 @@ public class ApiBag {
}
}
- @SuppressWarnings({"rawtypes"})
- List<Map> errs = CommandOperation.captureErrors(commandsCopy);
+ List<Map<String, Object>> errs = CommandOperation.captureErrors(commandsCopy);
if (!errs.isEmpty()) {
throw new ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST, "Error in command payload", errs);
}
@@ -350,16 +349,14 @@ public class ApiBag {
}
public static class ExceptionWithErrObject extends SolrException {
- @SuppressWarnings({"rawtypes"})
- private List<Map> errs;
+ private final List<Map<String, Object>> errs;
- public ExceptionWithErrObject(ErrorCode code, String msg, @SuppressWarnings({"rawtypes"})List<Map> errs) {
+ public ExceptionWithErrObject(ErrorCode code, String msg, List<Map<String, Object>> errs) {
super(code, msg);
this.errs = errs;
}
- @SuppressWarnings({"rawtypes"})
- public List<Map> getErrs() {
+ public List<Map<String, Object>> getErrs() {
return errs;
}
diff --git a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java
index 06015b4b8a8..8b798e174da 100644
--- a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java
+++ b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java
@@ -279,7 +279,6 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapW
}
}
- @SuppressWarnings({"rawtypes"})
public class ApiInfo implements ReflectMapWriter {
List<ApiHolder> holders;
@@ -379,7 +378,7 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapW
}
if (!errs.isEmpty()) return;
- Constructor constructor = klas.getConstructors()[0];
+ Constructor<?> constructor = klas.getConstructors()[0];
if (constructor.getParameterTypes().length > 1 ||
(constructor.getParameterTypes().length == 1 && constructor.getParameterTypes()[0] != CoreContainer.class)) {
errs.add("Must have a no-arg constructor or CoreContainer constructor and it must not be a non static inner class");
@@ -394,7 +393,7 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapW
@SuppressWarnings({"unchecked"})
public void init() throws Exception {
if (this.holders != null) return;
- Constructor constructor = klas.getConstructors()[0];
+ Constructor<?> constructor = klas.getConstructors()[0];
if (constructor.getParameterTypes().length == 0) {
instance = constructor.newInstance();
} else if (constructor.getParameterTypes().length == 1 && constructor.getParameterTypes()[0] == CoreContainer.class) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ConfigSetCmds.java b/solr/core/src/java/org/apache/solr/cloud/ConfigSetCmds.java
index 8568f1493ac..967463510fb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ConfigSetCmds.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ConfigSetCmds.java
@@ -23,7 +23,6 @@ import java.io.InputStreamReader;
import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import com.jayway.jsonpath.internal.Utils;
@@ -72,8 +71,7 @@ public class ConfigSetCmds {
}
- @SuppressWarnings({"rawtypes"})
- private static NamedList getConfigSetProperties(ConfigSetService configSetService, String configName, String propertyPath) throws IOException {
+ private static NamedList<Object> getConfigSetProperties(ConfigSetService configSetService, String configName, String propertyPath) throws IOException {
byte[] oldPropsData = configSetService.downloadFileFromConfig(configName, propertyPath);
if (oldPropsData != null) {
InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(oldPropsData), StandardCharsets.UTF_8);
@@ -100,11 +98,8 @@ public class ConfigSetCmds {
return properties;
}
- private static void mergeOldProperties(Map<String, Object> newProps, @SuppressWarnings({"rawtypes"})NamedList oldProps) {
- @SuppressWarnings({"unchecked"})
- Iterator<Map.Entry<String, Object>> it = oldProps.iterator();
- while (it.hasNext()) {
- Map.Entry<String, Object> oldEntry = it.next();
+ private static void mergeOldProperties(Map<String, Object> newProps, NamedList<Object> oldProps) {
+ for (Map.Entry<String, Object> oldEntry : oldProps) {
if (!newProps.containsKey(oldEntry.getKey())) {
newProps.put(oldEntry.getKey(), oldEntry.getValue());
}
@@ -144,8 +139,7 @@ public class ConfigSetCmds {
Map<String, Object> props = getNewProperties(message);
if (props != null) {
// read the old config properties and do a merge, if necessary
- @SuppressWarnings({"rawtypes"})
- NamedList oldProps = getConfigSetProperties(coreContainer.getConfigSetService(), baseConfigSetName, propertyPath);
+ NamedList<Object> oldProps = getConfigSetProperties(coreContainer.getConfigSetService(), baseConfigSetName, propertyPath);
if (oldProps != null) {
mergeOldProperties(props, oldProps);
}
@@ -200,8 +194,7 @@ public class ConfigSetCmds {
}
String propertyPath = ConfigSetProperties.DEFAULT_FILENAME;
- @SuppressWarnings({"rawtypes"})
- NamedList properties = getConfigSetProperties(coreContainer.getConfigSetService(), configSetName, propertyPath);
+ NamedList<Object> properties = getConfigSetProperties(coreContainer.getConfigSetService(), configSetName, propertyPath);
if (properties != null) {
Object immutable = properties.get(ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG);
boolean isImmutableConfigSet = immutable != null ? Boolean.parseBoolean(immutable.toString()) : false;
diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java b/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java
index cc007fd18de..8cf4f8d47fb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java
@@ -204,7 +204,6 @@ public class DistributedApiAsyncTracker {
* {@link RequestStatusState} is {@link RequestStatusState#COMPLETED} or {@link RequestStatusState#FAILED} (and will be
* {@code null} in all other cases).
*/
- @SuppressWarnings("unchecked")
public Pair<RequestStatusState, OverseerSolrResponse> getAsyncTaskRequestStatus(String asyncId) throws Exception {
if (asyncId == null || !trackedAsyncTasks.contains(asyncId)) {
// This return addresses the whole "No persistent node" column from the table
@@ -233,8 +232,7 @@ public class DistributedApiAsyncTracker {
if (response == null) {
// Node crash has removed the ephemeral node, but the command did not complete execution (or didn't even start it, who
// knows). We have a failure to report though so let's create a reasonable return response.
- @SuppressWarnings({"rawtypes"})
- NamedList results = new NamedList();
+ NamedList<Object> results = new NamedList<>();
SimpleOrderedMap<Object> nl = new SimpleOrderedMap<>();
nl.add("msg", "Operation (asyncId: " + asyncId + ") failed due to server restart. Please resubmit.");
nl.add("rspCode", SERVER_ERROR.code);
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 47fa0cc6dc9..05635692b7b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -417,8 +417,7 @@ public class Overseer implements SolrCloseable {
return;
}
try {
- @SuppressWarnings({"rawtypes"})
- Map m = (Map) Utils.fromJSON(data);
+ Map<?,?> m = (Map<?,?>) Utils.fromJSON(data);
String id = (String) m.get(ID);
if(overseerCollectionConfigSetProcessor.getId().equals(id)){
try {
@@ -731,10 +730,8 @@ public class Overseer implements SolrCloseable {
.setWithSegments(true)
.setWithFieldInfo(true);
CollectionAdminResponse rsp = req.process(client);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> status = (NamedList<Object>)rsp.getResponse().get(CollectionAdminParams.SYSTEM_COLL);
- @SuppressWarnings({"unchecked"})
- Collection<String> nonCompliant = (Collection<String>)status.get("schemaNonCompliant");
+ NamedList<?> status = (NamedList<?>)rsp.getResponse().get(CollectionAdminParams.SYSTEM_COLL);
+ Collection<?> nonCompliant = (Collection<?>)status.get("schemaNonCompliant");
if (!nonCompliant.contains("(NONE)")) {
consumer.accept("indexFieldsNotMatchingSchema", nonCompliant);
}
@@ -744,32 +741,26 @@ public class Overseer implements SolrCloseable {
String currentVersion = Version.LATEST.toString();
segmentVersions.add(currentVersion);
segmentCreatedMajorVersions.add(currentMajorVersion);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> shards = (NamedList<Object>)status.get("shards");
- for (Map.Entry<String, Object> entry : shards) {
- @SuppressWarnings({"unchecked"})
- NamedList<Object> leader = (NamedList<Object>)((NamedList<Object>)entry.getValue()).get("leader");
+ NamedList<?> shards = (NamedList<?>)status.get("shards");
+ for (Map.Entry<String, ?> entry : shards) {
+ NamedList<?> leader = (NamedList<?>)((NamedList<?>)entry.getValue()).get("leader");
if (leader == null) {
continue;
}
- @SuppressWarnings({"unchecked"})
- NamedList<Object> segInfos = (NamedList<Object>)leader.get("segInfos");
+ NamedList<?> segInfos = (NamedList<?>)leader.get("segInfos");
if (segInfos == null) {
continue;
}
- @SuppressWarnings({"unchecked"})
- NamedList<Object> infos = (NamedList<Object>)segInfos.get("info");
+ NamedList<?> infos = (NamedList<?>)segInfos.get("info");
if (((Number)infos.get("numSegments")).intValue() > 0) {
segmentVersions.add(infos.get("minSegmentLuceneVersion").toString());
}
if (infos.get("commitLuceneVersion") != null) {
segmentVersions.add(infos.get("commitLuceneVersion").toString());
}
- @SuppressWarnings({"unchecked"})
- NamedList<Object> segmentInfos = (NamedList<Object>)segInfos.get("segments");
+ NamedList<?> segmentInfos = (NamedList<?>)segInfos.get("segments");
segmentInfos.forEach((k, v) -> {
- @SuppressWarnings({"unchecked"})
- NamedList<Object> segment = (NamedList<Object>)v;
+ NamedList<?> segment = (NamedList<?>)v;
segmentVersions.add(segment.get("version").toString());
if (segment.get("minVersion") != null) {
segmentVersions.add(segment.get("version").toString());
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
index 2596b296ed5..e0ce58ca65b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
@@ -54,10 +54,8 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
// in this way, we prevent a Base ConfigSet from being deleted while it is being copied
// but don't prevent different ConfigSets from being created with the same Base ConfigSet
// at the same time.
- @SuppressWarnings({"rawtypes"})
- final private Set configSetWriteWip;
- @SuppressWarnings({"rawtypes"})
- final private Set configSetReadWip;
+ final private Set<String> configSetWriteWip;
+ final private Set<String> configSetReadWip;
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -69,10 +67,8 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
}
@Override
- @SuppressWarnings({"unchecked"})
public OverseerSolrResponse processMessage(ZkNodeProps message, String operation) {
- @SuppressWarnings({"rawtypes"})
- NamedList results = new NamedList();
+ NamedList<Object> results = new NamedList<>();
try {
if (!operation.startsWith(CONFIGSETS_ACTION_PREFIX)) {
throw new SolrException(ErrorCode.BAD_REQUEST,
@@ -108,8 +104,7 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
}
results.add("Operation " + operation + " caused exception:", e);
- @SuppressWarnings({"rawtypes"})
- SimpleOrderedMap nl = new SimpleOrderedMap();
+ SimpleOrderedMap<Object> nl = new SimpleOrderedMap<>();
nl.add("msg", e.getMessage());
nl.add("rspCode", e instanceof SolrException ? ((SolrException) e).code() : -1);
results.add("exception", nl);
@@ -148,7 +143,6 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
markExclusive(configSetName, baseConfigSet);
}
- @SuppressWarnings({"unchecked"})
private void markExclusive(String configSetName, String baseConfigSetName) {
synchronized (configSetWriteWip) {
configSetWriteWip.add(configSetName);
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
index a027a052c9e..bb3c3d98f0e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java
@@ -60,11 +60,9 @@ public class OverseerNodePrioritizer {
public synchronized void prioritizeOverseerNodes(String overseerId) throws Exception {
SolrZkClient zk = zkStateReader.getZkClient();
if(!zk.exists(ZkStateReader.ROLES,true))return;
- @SuppressWarnings({"rawtypes"})
- Map m = (Map) Utils.fromJSON(zk.getData(ZkStateReader.ROLES, null, new Stat(), true));
+ Map<?,?> m = (Map<?,?>) Utils.fromJSON(zk.getData(ZkStateReader.ROLES, null, new Stat(), true));
- @SuppressWarnings({"rawtypes"})
- List overseerDesignates = (List) m.get("overseer");
+ List<?> overseerDesignates = (List<?>) m.get("overseer");
if(overseerDesignates==null || overseerDesignates.isEmpty()) return;
String ldr = OverseerTaskProcessor.getLeaderNode(zk);
if(overseerDesignates.contains(ldr)) return;
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java b/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java
index 4257a762ab3..c5a2cb032f4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java
@@ -21,12 +21,11 @@ import org.apache.solr.common.util.NamedList;
public class OverseerSolrResponse extends SolrResponse {
- @SuppressWarnings({"rawtypes"})
- NamedList responseList = null;
+ NamedList<Object> responseList = null;
private long elapsedTime;
- public OverseerSolrResponse(@SuppressWarnings({"rawtypes"})NamedList list) {
+ public OverseerSolrResponse(NamedList<Object> list) {
responseList = list;
}
@@ -46,7 +45,6 @@ public class OverseerSolrResponse extends SolrResponse {
}
@Override
- @SuppressWarnings({"unchecked"})
public NamedList<Object> getResponse() {
return responseList;
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
index d35583cda55..10918de3595 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -441,8 +441,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
} catch (KeeperException.NoNodeException e) {
return null;
}
- @SuppressWarnings({"rawtypes"})
- Map m = (Map) Utils.fromJSON(data);
+ Map<?,?> m = (Map<?,?>) Utils.fromJSON(data);
return (String) m.get(ID);
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index fcbe2344e08..cd5b1548bf6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -79,16 +79,14 @@ import org.slf4j.LoggerFactory;
public class RecoveryStrategy implements Runnable, Closeable {
public static class Builder implements NamedListInitializedPlugin {
- @SuppressWarnings({"rawtypes"})
- private NamedList args;
+ private NamedList<?> args;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
this.args = args;
}
// this should only be used from SolrCoreState
- @SuppressWarnings({"unchecked"})
public RecoveryStrategy create(CoreContainer cc, CoreDescriptor cd,
RecoveryStrategy.RecoveryListener recoveryListener) {
final RecoveryStrategy recoveryStrategy = newRecoveryStrategy(cc, cd, recoveryListener);
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
index a54be75141f..11add589377 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
@@ -258,8 +258,7 @@ public class ZkCLI implements CLIO {
zkClient.printLayoutToStream(stdout);
} else if (line.getOptionValue(CMD).equals(LS)) {
- @SuppressWarnings({"rawtypes"})
- List argList = line.getArgList();
+ List<String> argList = line.getArgList();
if (argList.size() != 1) {
stdout.println("-" + LS + " requires one arg - the path to list");
System.exit(1);
@@ -271,24 +270,21 @@ public class ZkCLI implements CLIO {
stdout.println(sb.toString());
} else if (line.getOptionValue(CMD).equalsIgnoreCase(CLEAR)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 1) {
stdout.println("-" + CLEAR + " requires one arg - the path to clear");
System.exit(1);
}
zkClient.clean(arglist.get(0).toString());
} else if (line.getOptionValue(CMD).equalsIgnoreCase(MAKEPATH)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 1) {
stdout.println("-" + MAKEPATH + " requires one arg - the path to make");
System.exit(1);
}
zkClient.makePath(arglist.get(0).toString(), true);
} else if (line.getOptionValue(CMD).equalsIgnoreCase(PUT)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 2) {
stdout.println("-" + PUT + " requires two args - the path to create and the data string");
System.exit(1);
@@ -300,8 +296,7 @@ public class ZkCLI implements CLIO {
zkClient.create(path, arglist.get(1).toString().getBytes(StandardCharsets.UTF_8), CreateMode.PERSISTENT, true);
}
} else if (line.getOptionValue(CMD).equalsIgnoreCase(PUT_FILE)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 2) {
stdout.println("-" + PUT_FILE + " requires two args - the path to create in ZK and the path to the local file");
System.exit(1);
@@ -320,8 +315,7 @@ public class ZkCLI implements CLIO {
}
} else if (line.getOptionValue(CMD).equalsIgnoreCase(GET)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 1) {
stdout.println("-" + GET + " requires one arg - the path to get");
System.exit(1);
@@ -329,8 +323,7 @@ public class ZkCLI implements CLIO {
byte [] data = zkClient.getData(arglist.get(0).toString(), null, null, true);
stdout.println(new String(data, StandardCharsets.UTF_8));
} else if (line.getOptionValue(CMD).equalsIgnoreCase(GET_FILE)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 2) {
stdout.println("-" + GET_FILE + "requires two args - the path to get and the file to save it to");
System.exit(1);
@@ -338,8 +331,7 @@ public class ZkCLI implements CLIO {
byte [] data = zkClient.getData(arglist.get(0).toString(), null, null, true);
FileUtils.writeByteArrayToFile(new File(arglist.get(1).toString()), data);
} else if (line.getOptionValue(CMD).equals(UPDATEACLS)) {
- @SuppressWarnings({"rawtypes"})
- List arglist = line.getArgList();
+ List<String> arglist = line.getArgList();
if (arglist.size() != 1) {
stdout.println("-" + UPDATEACLS + " requires one arg - the path to update");
System.exit(1);
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java b/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
index 3db4efe5932..3c69861aafe 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
@@ -105,8 +105,7 @@ public class ZkConfigSetService extends ConfigSetService {
}
@Override
- @SuppressWarnings({"rawtypes"})
- protected NamedList loadConfigSetFlags(CoreDescriptor cd, SolrResourceLoader loader) {
+ protected NamedList<Object> loadConfigSetFlags(CoreDescriptor cd, SolrResourceLoader loader) {
try {
return ConfigSetProperties.readFromResourceLoader(loader, ".");
} catch (Exception ex) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index c0cf7f08415..fe8c1dd14c7 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2194,8 +2194,7 @@ public class ZkController implements Closeable {
@SuppressWarnings({"rawtypes"})
Map roles = (Map) Utils.fromJSON(data);
if (roles == null) return;
- @SuppressWarnings({"rawtypes"})
- List nodeList = (List) roles.get("overseer");
+ List<?> nodeList = (List<?>) roles.get("overseer");
if (nodeList == null) return;
if (nodeList.contains(getNodeName())) {
ZkNodeProps props = new ZkNodeProps(Overseer.QUEUE_OPERATION, CollectionParams.CollectionAction.ADDROLE.toString().toLowerCase(Locale.ROOT),
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
index 9c0eb81c073..c4301925e2a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
@@ -53,8 +53,7 @@ abstract class AliasCmd implements CollApiCmds.CollectionApiCommand {
* Creates a collection (for use in a routed alias), waiting for it to be ready before returning.
* If the collection already exists then this is not an error.<p>
*/
- @SuppressWarnings({"rawtypes"})
- static NamedList createCollectionAndWait(ClusterState clusterState, String aliasName, Map<String, String> aliasMetadata,
+ static NamedList<Object> createCollectionAndWait(ClusterState clusterState, String aliasName, Map<String, String> aliasMetadata,
String createCollName, CollectionCommandContext ccc) throws Exception {
// Map alias metadata starting with a prefix to a create-collection API request
final ModifiableSolrParams createReqParams = new ModifiableSolrParams();
@@ -76,7 +75,7 @@ abstract class AliasCmd implements CollApiCmds.CollectionApiCommand {
ccc.getCoreContainer().getCollectionsHandler());
createMsgMap.put(Overseer.QUEUE_OPERATION, CollectionParams.CollectionAction.CREATE.toLower());
- NamedList results = new NamedList();
+ NamedList<Object> results = new NamedList<>();
try {
// Since we are running in the Overseer here, send the message directly to the Overseer CreateCollectionCmd.
// note: there's doesn't seem to be any point in locking on the collection name, so we don't. We currently should
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
index 3c6caa77368..c153f2585b0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
@@ -129,8 +129,7 @@ public class CreateSnapshotCmd implements CollApiCmds.CollectionApiCommand {
Set<String> failedShards = new HashSet<>();
shardRequestTracker.processResponses(shardRequestResults, shardHandler, false, null);
- @SuppressWarnings({"rawtypes"})
- NamedList success = (NamedList) shardRequestResults.get("success");
+ NamedList<?> success = (NamedList<?>) shardRequestResults.get("success");
List<CoreSnapshotMetaData> replicas = new ArrayList<>();
if (success != null) {
for ( int i = 0 ; i < success.size() ; i++) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
index 57ad7635370..bc420ccdcdc 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
@@ -238,7 +238,7 @@ public class DistributedCollectionConfigSetCommandRunner {
// Following the call below returning true, we must eventually cancel or complete the task. Happens either in the
// CollectionCommandRunner below or in the catch when the runner would not execute.
if (!asyncTaskTracker.createNewAsyncJobTracker(asyncId)) {
- NamedList<String> resp = new NamedList<>();
+ NamedList<Object> resp = new NamedList<>();
resp.add("error", "Task with the same requestid already exists. (" + asyncId + ")");
resp.add(CoreAdminParams.REQUESTID, asyncId);
return new OverseerSolrResponse(resp);
@@ -269,7 +269,7 @@ public class DistributedCollectionConfigSetCommandRunner {
}
} else {
// Async calls do not wait for the command to finish but get instead back the async id (that they just sent...)
- NamedList<String> resp = new NamedList<>();
+ NamedList<Object> resp = new NamedList<>();
resp.add(CoreAdminParams.REQUESTID, asyncId);
return new OverseerSolrResponse(resp);
}
diff --git a/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java b/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java
index 9d278749601..2fbbdf67b5c 100644
--- a/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java
+++ b/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java
@@ -29,13 +29,11 @@ public class AbstractSolrEventListener implements SolrEventListener {
public AbstractSolrEventListener(SolrCore core) {
this.core = core;
}
- @SuppressWarnings({"rawtypes"})
- private NamedList args;
- @SuppressWarnings({"rawtypes"})
- public NamedList getArgs() { return args; }
+ private NamedList<?> args;
+ public NamedList<?> getArgs() { return args; }
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
this.args = args.clone();
}
@@ -69,9 +67,8 @@ public class AbstractSolrEventListener implements SolrEventListener {
* @param currentSearcher If null, add FIRST_SEARCHER, otherwise NEW_SEARCHER
* @param nlst The named list to add the EVENT value to
*/
- @SuppressWarnings({"unchecked", "rawtypes"})
- protected NamedList addEventParms(SolrIndexSearcher currentSearcher, NamedList nlst) {
- NamedList result = new NamedList();
+ protected NamedList<Object> addEventParms(SolrIndexSearcher currentSearcher, NamedList<Object> nlst) {
+ NamedList<Object> result = new NamedList<>();
result.addAll(nlst);
if (currentSearcher != null) {
result.add(EventParams.EVENT, EventParams.NEW_SEARCHER);
diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
index c76389bce0c..bf5097b24c5 100644
--- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
@@ -404,7 +404,7 @@ public abstract class CachingDirectoryFactory extends DirectoryFactory {
}
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
maxWriteMBPerSecFlush = (Double) args.get("maxWriteMBPerSecFlush");
maxWriteMBPerSecMerge = (Double) args.get("maxWriteMBPerSecMerge");
maxWriteMBPerSecRead = (Double) args.get("maxWriteMBPerSecRead");
diff --git a/solr/core/src/java/org/apache/solr/core/CodecFactory.java b/solr/core/src/java/org/apache/solr/core/CodecFactory.java
index 7ded16990f7..950cdf52db6 100644
--- a/solr/core/src/java/org/apache/solr/core/CodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/CodecFactory.java
@@ -17,16 +17,11 @@
package org.apache.solr.core;
import org.apache.lucene.codecs.Codec;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**
* Factory for plugging in a custom {@link Codec}
*/
public abstract class CodecFactory implements NamedListInitializedPlugin {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
public abstract Codec getCodec();
}
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSet.java b/solr/core/src/java/org/apache/solr/core/ConfigSet.java
index 7e175592590..fb47bfed5e4 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSet.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSet.java
@@ -34,14 +34,12 @@ public class ConfigSet {
private final SchemaSupplier schemaSupplier;
- @SuppressWarnings({"rawtypes"})
- private final NamedList properties;
+ private final NamedList<?> properties;
private final boolean trusted;
- @SuppressWarnings({"rawtypes"})
public ConfigSet(String name, SolrConfig solrConfig, SchemaSupplier indexSchemaSupplier,
- NamedList properties, boolean trusted) {
+ NamedList<?> properties, boolean trusted) {
this.name = name;
this.solrconfig = solrConfig;
this.schemaSupplier = indexSchemaSupplier;
@@ -70,8 +68,7 @@ public class ConfigSet {
return schema;
}
- @SuppressWarnings({"rawtypes"})
- public NamedList getProperties() {
+ public NamedList<?> getProperties() {
return properties;
}
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
index 7330d76ae84..bab3870ce07 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java
@@ -52,8 +52,7 @@ public class ConfigSetProperties {
* @param name the name of the config set properties file
* @return the properties in a NamedList
*/
- @SuppressWarnings({"rawtypes"})
- public static NamedList readFromResourceLoader(SolrResourceLoader loader, String name) {
+ public static NamedList<Object> readFromResourceLoader(SolrResourceLoader loader, String name) {
InputStreamReader reader;
try {
reader = new InputStreamReader(loader.openResource(name), StandardCharsets.UTF_8);
@@ -73,15 +72,16 @@ public class ConfigSetProperties {
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- public static NamedList readFromInputStream(InputStreamReader reader) {
+ public static NamedList<Object> readFromInputStream(InputStreamReader reader) {
try {
Object object = fromJSON(reader);
if (!(object instanceof Map)) {
final String objectClass = object == null ? "null" : object.getClass().getName();
throw new SolrException(ErrorCode.SERVER_ERROR, "Invalid JSON type " + objectClass + ", expected Map");
}
- return new NamedList((Map) object);
+ @SuppressWarnings("unchecked")
+ Map<String, Object> map = (Map<String, Object>) object;
+ return new NamedList<>(map);
} catch (Exception ex) {
throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to load ConfigSet properties", ex);
} finally {
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
index f5d5c60ca05..a4b246a03fc 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
@@ -196,17 +196,15 @@ public abstract class ConfigSetService {
* @param dcore the core's CoreDescriptor
* @return a ConfigSet
*/
- @SuppressWarnings({"rawtypes"})
public final ConfigSet loadConfigSet(CoreDescriptor dcore) {
SolrResourceLoader coreLoader = createCoreResourceLoader(dcore);
try {
-
// ConfigSet properties are loaded from ConfigSetProperties.DEFAULT_FILENAME file.
- NamedList properties = loadConfigSetProperties(dcore, coreLoader);
+ NamedList<?> properties = loadConfigSetProperties(dcore, coreLoader);
// ConfigSet flags are loaded from the metadata of the ZK node of the configset.
- NamedList flags = loadConfigSetFlags(dcore, coreLoader);
+ NamedList<?> flags = loadConfigSetFlags(dcore, coreLoader);
boolean trusted =
(coreLoader instanceof ZkSolrResourceLoader
@@ -301,8 +299,7 @@ public abstract class ConfigSetService {
* @param loader the core's resource loader
* @return the ConfigSet properties
*/
- @SuppressWarnings({"rawtypes"})
- protected NamedList loadConfigSetProperties(CoreDescriptor cd, SolrResourceLoader loader) {
+ protected NamedList<Object> loadConfigSetProperties(CoreDescriptor cd, SolrResourceLoader loader) {
return ConfigSetProperties.readFromResourceLoader(loader, cd.getConfigSetPropertiesName());
}
@@ -310,8 +307,7 @@ public abstract class ConfigSetService {
* Return the ConfigSet flags or null if none.
*/
// TODO should fold into configSetProps -- SOLR-14059
- @SuppressWarnings({"rawtypes"})
- protected NamedList loadConfigSetFlags(CoreDescriptor cd, SolrResourceLoader loader) {
+ protected NamedList<Object> loadConfigSetFlags(CoreDescriptor cd, SolrResourceLoader loader) {
return null;
}
diff --git a/solr/core/src/java/org/apache/solr/core/DelegatingEventListener.java b/solr/core/src/java/org/apache/solr/core/DelegatingEventListener.java
index eafd52ae689..ae04d57f7ce 100644
--- a/solr/core/src/java/org/apache/solr/core/DelegatingEventListener.java
+++ b/solr/core/src/java/org/apache/solr/core/DelegatingEventListener.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.core;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.pkg.PackagePluginHolder;
import org.apache.solr.search.SolrIndexSearcher;
@@ -47,9 +46,4 @@ public class DelegatingEventListener implements SolrEventListener {
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
holder.getInstance().ifPresent(it -> it.newSearcher(newSearcher, currentSearcher));
}
-
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
-
- }
}
diff --git a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
index 59c833bc9fa..f83ededbad6 100644
--- a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
@@ -159,7 +159,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
}
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
params = args.toSolrParams();
this.hdfsDataDir = getConfig(HDFS_HOME, null);
diff --git a/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java b/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
index bf30d838c80..ede9186dc3b 100644
--- a/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
@@ -32,10 +32,9 @@ public abstract class IndexReaderFactory implements NamedListInitializedPlugin {
* <p>
* The args are user-level initialization parameters that may be specified
* when declaring an indexReaderFactory in solrconfig.xml
- *
*/
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
Object v = args.get("setTermIndexDivisor");
if (v != null) {
throw new IllegalArgumentException("Illegal parameter 'setTermIndexDivisor'");
diff --git a/solr/core/src/java/org/apache/solr/core/InitParams.java b/solr/core/src/java/org/apache/solr/core/InitParams.java
index ad31cf6fd8f..7ede90858c6 100644
--- a/solr/core/src/java/org/apache/solr/core/InitParams.java
+++ b/solr/core/src/java/org/apache/solr/core/InitParams.java
@@ -38,12 +38,9 @@ public class InitParams {
public static final String TYPE = "initParams";
public final String name;
public final Set<String> paths;
- @SuppressWarnings({"rawtypes"})
- public final NamedList defaults;
- @SuppressWarnings({"rawtypes"})
- public final NamedList invariants;
- @SuppressWarnings({"rawtypes"})
- public final NamedList appends;
+ public final NamedList<?> defaults;
+ public final NamedList<?> invariants;
+ public final NamedList<?> appends;
final private PluginInfo pluginInfo;
private final Set<String> KNOWN_KEYS = ImmutableSet.of(DEFAULTS, INVARIANTS, APPENDS);
@@ -56,12 +53,11 @@ public class InitParams {
paths = Set.copyOf(StrUtils.splitSmart(pathStr, ','));
}
this.paths = paths;
- @SuppressWarnings({"rawtypes"})
- NamedList nl = (NamedList) p.initArgs.get(DEFAULTS);
+ NamedList<?> nl = (NamedList<?>) p.initArgs.get(DEFAULTS);
defaults = nl == null ? null : nl.getImmutableCopy();
- nl = (NamedList) p.initArgs.get(INVARIANTS);
+ nl = (NamedList<?>) p.initArgs.get(INVARIANTS);
invariants = nl == null ? null : nl.getImmutableCopy();
- nl = (NamedList) p.initArgs.get(APPENDS);
+ nl = (NamedList<?>) p.initArgs.get(APPENDS);
appends = nl == null ? null : nl.getImmutableCopy();
}
@@ -94,17 +90,16 @@ public class InitParams {
}
- @SuppressWarnings({"unchecked", "rawtypes"})
public void apply(PluginInfo info) {
if (!info.isFromSolrConfig()) {
//if this is a component implicitly defined in code it should be overridden by initPrams
- merge(defaults, (NamedList) info.initArgs.get(DEFAULTS), info.initArgs, DEFAULTS, false);
+ merge(defaults, (NamedList<?>) info.initArgs.get(DEFAULTS), info.initArgs, DEFAULTS, false);
} else {
//if the args is initialized from solrconfig.xml inside the requestHandler it should be taking precedence over initParams
- merge((NamedList) info.initArgs.get(DEFAULTS), defaults, info.initArgs, DEFAULTS, false);
+ merge((NamedList<?>) info.initArgs.get(DEFAULTS), defaults, info.initArgs, DEFAULTS, false);
}
- merge((NamedList) info.initArgs.get(INVARIANTS), invariants, info.initArgs, INVARIANTS, false);
- merge((NamedList) info.initArgs.get(APPENDS), appends, info.initArgs, APPENDS, true);
+ merge((NamedList<?>) info.initArgs.get(INVARIANTS), invariants, info.initArgs, INVARIANTS, false);
+ merge((NamedList<?>) info.initArgs.get(APPENDS), appends, info.initArgs, APPENDS, true);
if (pluginInfo.initArgs != null) {
for (int i = 0; i < pluginInfo.initArgs.size(); i++) {
@@ -117,23 +112,21 @@ public class InitParams {
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- private static void merge(NamedList first, NamedList second, NamedList sink, String name, boolean appends) {
+ @SuppressWarnings("unchecked")
+ private static void merge(NamedList<?> first, NamedList<?> second, NamedList<Object> sink, String name, boolean appends) {
if (first == null && second == null) return;
- if (first == null) first = new NamedList();
- NamedList nl = first.clone();
+ if (first == null) first = new NamedList<>();
+ NamedList<Object> nl = (NamedList<Object>) first.clone();
if (appends) {
- if (second != null) nl.addAll(second);
+ if (second != null) nl.addAll((NamedList<Object>) second);
} else {
Set<String> a = new HashSet<>();
Set<String> b = new HashSet<>();
- for (Object o : first) {
- Map.Entry<String, Object> e = (Map.Entry) o;
+ for (Map.Entry<String, ?> e : first) {
a.add(e.getKey());
}
if (second != null) {
- for (Object o : second) {
- Map.Entry<String, Object> e = (Map.Entry) o;
+ for (Map.Entry<String, ?> e : second) {
b.add(e.getKey());
}
}
diff --git a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java
index a7e7675a5c3..c64f9da38ba 100644
--- a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java
@@ -46,8 +46,7 @@ public class MMapDirectoryFactory extends StandardDirectoryFactory {
private int maxChunk;
@Override
- @SuppressWarnings({"rawtypes"})
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
SolrParams params = args.toSolrParams();
maxChunk = params.getInt("maxChunkSize", MMapDirectory.DEFAULT_MAX_CHUNK_SIZE);
diff --git a/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java
index e260a116151..1d1a77df368 100644
--- a/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java
@@ -36,8 +36,7 @@ public class NRTCachingDirectoryFactory extends StandardDirectoryFactory {
private double maxCachedMB = DEFAULT_MAX_CACHED_MB;
@Override
- @SuppressWarnings({"rawtypes"})
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
SolrParams params = args.toSolrParams();
maxMergeSizeMB = params.getDouble("maxMergeSizeMB", DEFAULT_MAX_MERGE_SIZE_MB);
diff --git a/solr/core/src/java/org/apache/solr/core/PluginInfo.java b/solr/core/src/java/org/apache/solr/core/PluginInfo.java
index 9dff7d26569..fe433389c53 100644
--- a/solr/core/src/java/org/apache/solr/core/PluginInfo.java
+++ b/solr/core/src/java/org/apache/solr/core/PluginInfo.java
@@ -42,23 +42,28 @@ import static org.apache.solr.schema.FieldType.CLASS_NAME;
public class PluginInfo implements MapSerializable {
public final String name, className, type, pkgName;
public final ClassName cName;
- @SuppressWarnings({"rawtypes"})
- public final NamedList initArgs;
+ public final NamedList<Object> initArgs;
public final Map<String, String> attributes;
public final List<PluginInfo> children;
private boolean isFromSolrConfig;
- public PluginInfo(String type, Map<String, String> attrs, @SuppressWarnings({"rawtypes"})NamedList initArgs, List<PluginInfo> children) {
+ public PluginInfo(String type, Map<String, String> attrs, NamedList<?> initArgs, List<PluginInfo> children) {
this.type = type;
this.name = attrs.get(NAME);
cName = parseClassName(attrs.get(CLASS_NAME));
this.className = cName.className;
this.pkgName = cName.pkg;
- this.initArgs = initArgs;
+ // Make a shallow copy for type safety
+ this.initArgs = new NamedList<>();
+ if (initArgs != null) {
+ for (Map.Entry<String, ?> entry : initArgs) {
+ this.initArgs.add(entry.getKey(), entry.getValue());
+ }
+ }
attributes = unmodifiableMap(attrs);
- this.children = children == null ? Collections.<PluginInfo>emptyList(): unmodifiableList(children);
+ this.children = children == null ? Collections.emptyList(): unmodifiableList(children);
isFromSolrConfig = false;
}
@@ -114,12 +119,12 @@ public class PluginInfo implements MapSerializable {
@SuppressWarnings({"unchecked", "rawtypes"})
public PluginInfo(String type, Map<String,Object> map) {
LinkedHashMap m = new LinkedHashMap<>(map);
- initArgs = new NamedList();
+ initArgs = new NamedList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
if (NAME.equals(entry.getKey()) || CLASS_NAME.equals(entry.getKey())) continue;
Object value = entry.getValue();
if (value instanceof List) {
- List list = (List) value;
+ List<?> list = (List<?>) value;
if (!list.isEmpty() && list.get(0) instanceof Map) {//this is a subcomponent
for (Object o : list) {
if (o instanceof Map) o = new NamedList<>((Map) o);
@@ -138,8 +143,9 @@ public class PluginInfo implements MapSerializable {
cName = parseClassName((String) m.get(CLASS_NAME));
this.className = cName.className;
this.pkgName = cName.pkg;
+ // TODO This is not type-safe and needs to be fixed - https://issues.apache.org/jira/browse/SOLR-14696
attributes = unmodifiableMap(m);
- this.children = Collections.<PluginInfo>emptyList();
+ this.children = Collections.emptyList();
isFromSolrConfig = true;
}
@@ -154,7 +160,7 @@ public class PluginInfo implements MapSerializable {
PluginInfo pluginInfo = new PluginInfo(nd, null, false, false);
if (pluginInfo.isEnabled()) children.add(pluginInfo);
}
- return children.isEmpty() ? Collections.<PluginInfo>emptyList() : unmodifiableList(children);
+ return children.isEmpty() ? Collections.emptyList() : unmodifiableList(children);
}
@Override
@@ -218,8 +224,7 @@ public class PluginInfo implements MapSerializable {
for (PluginInfo child : children) if(type.equals(child.type)) result.add(child);
return result;
}
- @SuppressWarnings({"rawtypes"})
- public static final PluginInfo EMPTY_INFO = new PluginInfo("",Collections.<String,String>emptyMap(), new NamedList(),Collections.<PluginInfo>emptyList());
+ public static final PluginInfo EMPTY_INFO = new PluginInfo("", Collections.emptyMap(), new NamedList<>(), Collections.emptyList());
private static final HashSet<String> NL_TAGS = new HashSet<>
(asList("lst", "arr",
diff --git a/solr/core/src/java/org/apache/solr/core/RequestParams.java b/solr/core/src/java/org/apache/solr/core/RequestParams.java
index 7094991fb38..7dbaf733287 100644
--- a/solr/core/src/java/org/apache/solr/core/RequestParams.java
+++ b/solr/core/src/java/org/apache/solr/core/RequestParams.java
@@ -51,16 +51,14 @@ public class RequestParams implements MapSerializable {
private final Map<String, ParamSet> paramsets = new LinkedHashMap<>();
private final int znodeVersion;
- @SuppressWarnings("rawtypes")
public RequestParams(Map<String, Object> data, int znodeVersion) {
if (data == null) data = Collections.emptyMap();
this.data = data;
- Map paramsets = (Map) data.get(NAME);
+ Map<?,?> paramsets = (Map<?,?>) data.get(NAME);
if (paramsets != null) {
- for (Object o : paramsets.entrySet()) {
- Map.Entry e = (Map.Entry) o;
+ for (Map.Entry<?,?> e : paramsets.entrySet()) {
if (e.getValue() instanceof Map) {
- Map value = (Map) e.getValue();
+ Map<?,?> value = (Map<?,?>) e.getValue();
this.paramsets.put((String) e.getKey(), createParamSet(value, 0l));
}
}
@@ -71,7 +69,7 @@ public class RequestParams implements MapSerializable {
@SuppressWarnings({"rawtypes"})
public static ParamSet createParamSet(Map map, Long version) {
Map copy = getDeepCopy(map, 3);
- Map meta = (Map) copy.remove("");
+ Map<?,?> meta = (Map<?,?>) copy.remove("");
if (meta == null && version != null) {
meta = Collections.singletonMap("v", version);
}
diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
index a7668a2f33e..eb1223b3a31 100644
--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
@@ -73,8 +73,7 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {
}
@Override
- @SuppressWarnings({"rawtypes"})
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
assert codec == null;
String compressionModeStr = (String)args.get(COMPRESSION_MODE);
diff --git a/solr/core/src/java/org/apache/solr/core/SimpleTextCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SimpleTextCodecFactory.java
index 9f3929aa7f5..a90bc09caf7 100644
--- a/solr/core/src/java/org/apache/solr/core/SimpleTextCodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/SimpleTextCodecFactory.java
@@ -25,8 +25,7 @@ public class SimpleTextCodecFactory extends CodecFactory {
private Codec codec;
@Override
- @SuppressWarnings({"rawtypes"})
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
assert codec == null;
codec = new SimpleTextCodec();
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 7c670ec37ea..cda9175e421 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -860,12 +860,11 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
}
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public Map<String, Object> toMap(Map<String, Object> result) {
if (getZnodeVersion() > -1) result.put(ZNODEVER, getZnodeVersion());
if(luceneMatchVersion != null) result.put(IndexSchema.LUCENE_MATCH_VERSION_PARAM, luceneMatchVersion.toString());
result.put("updateHandler", getUpdateHandlerInfo());
- Map m = new LinkedHashMap();
+ Map<String, Object> m = new LinkedHashMap<>();
result.put("query", m);
m.put("useFilterForSortedQuery", useFilterForSortedQuery);
m.put("queryResultWindowSize", queryResultWindowSize);
@@ -879,13 +878,15 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
String tag = plugin.getCleanTag();
tag = tag.replace("/", "");
if (plugin.options.contains(PluginOpts.REQUIRE_NAME)) {
- LinkedHashMap items = new LinkedHashMap();
+ LinkedHashMap<String, Object> items = new LinkedHashMap<>();
for (PluginInfo info : infos) {
//TODO remove after fixing https://issues.apache.org/jira/browse/SOLR-13706
if (info.type.equals("searchComponent") && info.name.equals("highlight")) continue;
items.put(info.name, info);
}
- for (Map.Entry e : overlay.getNamedPlugins(plugin.tag).entrySet()) items.put(e.getKey(), e.getValue());
+ for (Map.Entry<String, Map<String, Object>> e : overlay.getNamedPlugins(plugin.tag).entrySet()) {
+ items.put(e.getKey(), e.getValue());
+ }
result.put(tag, items);
} else {
if (plugin.options.contains(MULTI_OK)) {
@@ -902,7 +903,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
addCacheConfig(m, filterCacheConfig, queryResultCacheConfig, documentCacheConfig, fieldValueCacheConfig);
- m = new LinkedHashMap();
+ m = new LinkedHashMap<>();
result.put("requestDispatcher", m);
m.put("handleSelect", handleSelect);
if (httpCachingConfig != null) m.put("httpCaching", httpCachingConfig);
@@ -916,8 +917,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
return result;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- private void addCacheConfig(Map queryMap, CacheConfig... cache) {
+ private void addCacheConfig(Map<String, Object> queryMap, CacheConfig... cache) {
if (cache == null) return;
for (CacheConfig config : cache) if (config != null) queryMap.put(config.getNodeName(), config);
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 7df1c2d70ae..b93bf2dc299 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -208,8 +208,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
private final SolrConfig solrConfig;
private final SolrResourceLoader resourceLoader;
private volatile IndexSchema schema;
- @SuppressWarnings({"rawtypes"})
- private final NamedList configSetProperties;
+ private final NamedList<?> configSetProperties;
private final String dataDir;
private final String ulogDir;
private final UpdateHandler updateHandler;
@@ -366,8 +365,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
this.schema = replacementSchema;
}
- @SuppressWarnings({"rawtypes"})
- public NamedList getConfigSetProperties() {
+ public NamedList<?> getConfigSetProperties() {
return configSetProperties;
}
@@ -2233,6 +2231,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
* @param waitSearcher if non-null, will be filled in with a {@link Future} that will return after the new searcher is registered.
* @param updateHandlerReopens if true, the UpdateHandler will be used when reopening a {@link SolrIndexSearcher}.
*/
+ // TODO waitSearcher should be an AtomicReference or something that is a more clear API
public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, @SuppressWarnings({"rawtypes"})final Future[] waitSearcher, boolean updateHandlerReopens) {
// it may take some time to open an index.... we may need to make
// sure that two threads aren't trying to open one at the same time
@@ -2909,7 +2908,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
* RestManager provides basic storage support for managed resource data, such as to
* persist stopwords to ZooKeeper if running in SolrCloud mode.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
protected RestManager initRestManager() throws SolrException {
PluginInfo restManagerPluginInfo =
@@ -2923,7 +2922,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {
}
if (restManagerPluginInfo.initArgs != null) {
- initArgs = (NamedList<String>) restManagerPluginInfo.initArgs;
+ // TODO this is actually unsafe, the RMPI.initArgs can have objects too.
+ initArgs = (NamedList<String>) (NamedList) restManagerPluginInfo.initArgs;
}
}
diff --git a/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java b/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
index 6c4c9eca47c..23c9c59bd3b 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
@@ -48,7 +48,7 @@ public class SolrDeletionPolicy extends IndexDeletionPolicy implements NamedList
private int maxOptimizedCommitsToKeep = 0;
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
String keepOptimizedOnlyString = (String) args.get("keepOptimizedOnly");
String maxCommitsToKeepString = (String) args.get("maxCommitsToKeep");
String maxOptimizedCommitsToKeepString = (String) args.get("maxOptimizedCommitsToKeep");
diff --git a/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheDefault.java b/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheDefault.java
index fcbfb0c8f67..5e3bfd34ba1 100644
--- a/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheDefault.java
+++ b/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheDefault.java
@@ -49,8 +49,7 @@ public class TransientSolrCoreCacheDefault extends TransientSolrCoreCache {
// deprecate this for 7.0?
this.cacheSize = cfg.getTransientCacheSize();
} else {
- @SuppressWarnings({"rawtypes"})
- NamedList args = cfg.getTransientCachePluginInfo().initArgs;
+ NamedList<?> args = cfg.getTransientCachePluginInfo().initArgs;
Object obj = args.get("transientCacheSize");
if (obj != null) {
this.cacheSize = (int) obj;
@@ -65,8 +64,7 @@ public class TransientSolrCoreCacheDefault extends TransientSolrCoreCache {
// Still handle just having transientCacheSize defined in the body of solr.xml not in a transient handler clause.
this.cacheSize = cfg.getTransientCacheSize();
} else {
- @SuppressWarnings({"rawtypes"})
- NamedList args = cfg.getTransientCachePluginInfo().initArgs;
+ NamedList<?> args = cfg.getTransientCachePluginInfo().initArgs;
Object obj = args.get("transientCacheSize");
if (obj != null) {
this.cacheSize = (int) obj;
@@ -103,8 +101,7 @@ public class TransientSolrCoreCacheDefault extends TransientSolrCoreCache {
public Collection<SolrCore> prepareForShutdown() {
// Return a copy of the values
- @SuppressWarnings({"unchecked", "rawtypes"})
- List<SolrCore> ret = new ArrayList(transientCores.values());
+ List<SolrCore> ret = new ArrayList<>(transientCores.values());
transientCores.clear();
return ret;
}
diff --git a/solr/core/src/java/org/apache/solr/core/backup/ShardBackupMetadata.java b/solr/core/src/java/org/apache/solr/core/backup/ShardBackupMetadata.java
index a6c0b2b95b0..ed3fdc24d61 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/ShardBackupMetadata.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/ShardBackupMetadata.java
@@ -112,8 +112,7 @@ public class ShardBackupMetadata {
}
private void store(OutputStream os) throws IOException {
- @SuppressWarnings({"rawtypes"})
- Map<String, Map> map = new HashMap<>();
+ Map<String, Map<String, Object>> map = new HashMap<>();
for (BackedFile backedFile : allFiles.values()) {
Map<String, Object> fileMap = new HashMap<>();
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
index 46143ca2083..58eef91f805 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
@@ -65,7 +65,6 @@ public class BackupRepositoryFactory {
}
}
- @SuppressWarnings({"unchecked"})
public BackupRepository newInstance(SolrResourceLoader loader, String name) {
Objects.requireNonNull(loader);
Objects.requireNonNull(name);
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
index b1f1c5e4bbb..632bca91e94 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
@@ -60,13 +60,11 @@ public class HdfsBackupRepository implements BackupRepository {
private Configuration hdfsConfig = null;
private FileSystem fileSystem = null;
private Path baseHdfsPath = null;
- @SuppressWarnings("rawtypes")
- private NamedList config = null;
+ private NamedList<?> config = null;
protected int copyBufferSize = HdfsDirectory.DEFAULT_BUFFER_SIZE;
- @SuppressWarnings("rawtypes")
@Override
- public void init(NamedList args) {
+ public void init(NamedList<?> args) {
this.config = args;
log.warn("HDFS support in Solr has been deprecated as of 8.6. See SOLR-14021 for details.");
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
index e8cfef5c275..88b0a2cfd23 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
@@ -49,11 +49,10 @@ import java.util.Objects;
*/
public class LocalFileSystemRepository implements BackupRepository {
- @SuppressWarnings("rawtypes")
- private NamedList config = null;
+ private NamedList<?> config = null;
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
this.config = args;
}
diff --git a/solr/core/src/java/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.java b/solr/core/src/java/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.java
index 4170861e0b1..ac017d2dace 100644
--- a/solr/core/src/java/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.java
+++ b/solr/core/src/java/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.java
@@ -51,8 +51,8 @@ public class CollectionSnapshotMetaData implements JSONWriter.Writable {
this.files = files;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- public CoreSnapshotMetaData(NamedList resp) {
+ @SuppressWarnings({"unchecked"})
+ public CoreSnapshotMetaData(NamedList<?> resp) {
this.coreName = (String)resp.get(CoreAdminParams.CORE);
this.indexDirPath = (String)resp.get(SolrSnapshotManager.INDEX_DIR_PATH);
this.generationNumber = (Long)resp.get(SolrSnapshotManager.GENERATION_NUM);
@@ -97,9 +97,8 @@ public class CollectionSnapshotMetaData implements JSONWriter.Writable {
arg0.write(info);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
- public NamedList toNamedList() {
- NamedList result = new NamedList();
+ public NamedList<Object> toNamedList() {
+ NamedList<Object> result = new NamedList<>();
result.add(CoreAdminParams.CORE, getCoreName());
result.add(SolrSnapshotManager.INDEX_DIR_PATH, getIndexDirPath());
result.add(SolrSnapshotManager.GENERATION_NUM, getGenerationNumber());
@@ -150,22 +149,22 @@ public class CollectionSnapshotMetaData implements JSONWriter.Writable {
}
}
- @SuppressWarnings("unchecked")
- public CollectionSnapshotMetaData(NamedList<Object> data) {
+ public CollectionSnapshotMetaData(NamedList<?> data) {
this.name = (String)data.get(CoreAdminParams.NAME);
String statusStr = (String)data.get(SolrSnapshotManager.SNAPSHOT_STATUS);
this.creationDate = new Date((Long)data.get(SolrSnapshotManager.CREATION_DATE));
this.status = SnapshotStatus.valueOf(statusStr);
this.replicaSnapshots = new ArrayList<>();
- NamedList<Object> r = (NamedList<Object>) data.get(SolrSnapshotManager.SNAPSHOT_REPLICAS);
- for (Map.Entry<String,Object> x : r) {
- NamedList<Object> info = (NamedList<Object>)x.getValue();
+ NamedList<?> r = (NamedList<?>) data.get(SolrSnapshotManager.SNAPSHOT_REPLICAS);
+ for (Map.Entry<String,?> x : r) {
+ NamedList<?> info = (NamedList<?>)x.getValue();
String coreName = (String)info.get(CoreAdminParams.CORE);
String indexDirPath = (String)info.get(SolrSnapshotManager.INDEX_DIR_PATH);
long generationNumber = (Long) info.get(SolrSnapshotManager.GENERATION_NUM);
String shardId = (String)info.get(SolrSnapshotManager.SHARD_ID);
boolean leader = (Boolean) info.get(SolrSnapshotManager.LEADER);
+ @SuppressWarnings("unchecked")
Collection<String> files = (Collection<String>)info.get(SolrSnapshotManager.FILE_LIST);
replicaSnapshots.add(new CoreSnapshotMetaData(coreName, indexDirPath, generationNumber, shardId, leader, files));
}
@@ -224,14 +223,13 @@ public class CollectionSnapshotMetaData implements JSONWriter.Writable {
arg0.write(result);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
- public NamedList toNamedList() {
- NamedList result = new NamedList();
+ public NamedList<Object> toNamedList() {
+ NamedList<Object> result = new NamedList<>();
result.add(CoreAdminParams.NAME, this.name);
result.add(SolrSnapshotManager.SNAPSHOT_STATUS, this.status.toString());
result.add(SolrSnapshotManager.CREATION_DATE, this.getCreationDate().getTime());
- NamedList replicas = new NamedList();
+ NamedList<NamedList<Object>> replicas = new NamedList<NamedList<Object>>();
for (CoreSnapshotMetaData x : replicaSnapshots) {
replicas.add(x.getCoreName(), x.toNamedList());
}
diff --git a/solr/core/src/java/org/apache/solr/core/snapshots/SolrSnapshotsTool.java b/solr/core/src/java/org/apache/solr/core/snapshots/SolrSnapshotsTool.java
index 6931f940634..eef0ffe2d49 100644
--- a/solr/core/src/java/org/apache/solr/core/snapshots/SolrSnapshotsTool.java
+++ b/solr/core/src/java/org/apache/solr/core/snapshots/SolrSnapshotsTool.java
@@ -129,7 +129,6 @@ public class SolrSnapshotsTool implements Closeable, CLIO {
}
}
- @SuppressWarnings("rawtypes")
public void listSnapshots(String collectionName) {
CollectionAdminRequest.ListSnapshots listSnaps = new CollectionAdminRequest.ListSnapshots(collectionName);
CollectionAdminResponse resp;
@@ -137,7 +136,7 @@ public class SolrSnapshotsTool implements Closeable, CLIO {
resp = listSnaps.process(solrClient);
Preconditions.checkState(resp.getStatus() == 0, "The LISTSNAPSHOTS request failed. The status code is " + resp.getStatus());
- NamedList apiResult = (NamedList) resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO);
+ NamedList<?> apiResult = (NamedList<?>) resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO);
for (int i = 0; i < apiResult.size(); i++) {
CLIO.out(apiResult.getName(i));
}
@@ -424,7 +423,6 @@ public class SolrSnapshotsTool implements Closeable, CLIO {
return false;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private Collection<CollectionSnapshotMetaData> listCollectionSnapshots(String collectionName)
throws SolrServerException, IOException {
CollectionAdminRequest.ListSnapshots listSnapshots = new CollectionAdminRequest.ListSnapshots(collectionName);
@@ -432,11 +430,11 @@ public class SolrSnapshotsTool implements Closeable, CLIO {
Preconditions.checkState(resp.getStatus() == 0);
- NamedList apiResult = (NamedList) resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO);
+ NamedList<?> apiResult = (NamedList<?>) resp.getResponse().get(SolrSnapshotManager.SNAPSHOTS_INFO);
Collection<CollectionSnapshotMetaData> result = new ArrayList<>();
for (int i = 0; i < apiResult.size(); i++) {
- result.add(new CollectionSnapshotMetaData((NamedList<Object>)apiResult.getVal(i)));
+ result.add(new CollectionSnapshotMetaData((NamedList<?>)apiResult.getVal(i)));
}
return result;
diff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
index 6d5f9be98c7..903f2f0ad8e 100644
--- a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
+++ b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
@@ -523,6 +523,8 @@ public class DistribPackageStore implements PackageStore {
@SuppressWarnings({"rawtypes"})
List myFiles = list(path, s -> true);
for (Object f : l) {
+ // TODO: https://issues.apache.org/jira/browse/SOLR-15426
+ // l should be a List<String> and myFiles should be a List<FileDetails>, so contains should always return false!
if (!myFiles.contains(f)) {
log.info("{} does not exist locally, downloading.. ", f);
fetch(path + "/" + f.toString(), "*");
diff --git a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
index 3beb6873f25..f0b1bfbf3c7 100644
--- a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
+++ b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
@@ -321,8 +321,7 @@ public class PackageStoreAPI {
int idx = path.lastIndexOf('/');
String fileName = path.substring(idx + 1);
String parentPath = path.substring(0, path.lastIndexOf('/'));
- @SuppressWarnings({"rawtypes"})
- List l = packageStore.list(parentPath, s -> s.equals(fileName));
+ List<PackageStore.FileDetails> l = packageStore.list(parentPath, s -> s.equals(fileName));
rsp.add("files", Collections.singletonMap(path, l.isEmpty() ? null : l.get(0)));
return;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
index ade59732ba8..a75aaafb484 100644
--- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
@@ -274,8 +274,7 @@ public class BlobHandler extends RequestHandlerBase implements PluginInfoInitial
public void init(PluginInfo info) {
super.init(info.initArgs);
if (info.initArgs != null) {
- @SuppressWarnings({"rawtypes"})
- NamedList invariants = (NamedList) info.initArgs.get(PluginInfo.INVARIANTS);
+ NamedList<?> invariants = (NamedList<?>) info.initArgs.get(PluginInfo.INVARIANTS);
if (invariants != null) {
Object o = invariants.get("maxSize");
if (o != null) {
diff --git a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
index c4ad16349f8..2abdc060bcc 100644
--- a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
@@ -33,7 +33,7 @@ import org.apache.solr.update.processor.UpdateRequestProcessorChain;
public abstract class ContentStreamHandlerBase extends RequestHandlerBase {
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
// Caching off by default
diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
index f40a03a3514..d461d2fb7bc 100644
--- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
@@ -87,7 +87,7 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
private XMLInputFactory inputFactory;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
inputFactory = XMLInputFactory.newInstance();
diff --git a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
index 4ce5fa57dab..5ef0b290836 100644
--- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
@@ -44,8 +44,7 @@ public class DumpRequestHandler extends RequestHandlerBase
rsp.add( "params", req.getParams().toNamedList() );
String[] parts = req.getParams().getParams("urlTemplateValues");
if (parts != null && parts.length > 0) {
- @SuppressWarnings({"rawtypes"})
- Map map = new LinkedHashMap<>();
+ Map<String, String> map = new LinkedHashMap<>();
rsp.getValues().add("urlTemplateValues", map);
for (String part : parts) {
map.put(part, req.getPathTemplateValues().get(part));
@@ -71,8 +70,7 @@ public class DumpRequestHandler extends RequestHandlerBase
}
if(req.getParams().getBool("getdefaults", false)){
- @SuppressWarnings({"rawtypes"})
- NamedList def = (NamedList) initArgs.get(PluginInfo.DEFAULTS);
+ NamedList<?> def = (NamedList<?>) initArgs.get(PluginInfo.DEFAULTS);
rsp.add("getdefaults", def);
}
@@ -120,13 +118,12 @@ public class DumpRequestHandler extends RequestHandlerBase
private List<String> subpaths;
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
if(args !=null) {
- @SuppressWarnings({"rawtypes"})
- NamedList nl = (NamedList) args.get(PluginInfo.DEFAULTS);
- if(nl!=null) subpaths = nl.getAll("subpath");
+ @SuppressWarnings("unchecked")
+ NamedList<String> nl = (NamedList<String>) args.get(PluginInfo.DEFAULTS);
+ if (nl!=null) subpaths = nl.getAll("subpath");
}
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index 2d202f021b5..fa89f7d42be 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -227,7 +227,7 @@ public class IndexFetcher {
return HttpClientUtil.createClient(httpClientParams, core.getCoreContainer().getUpdateShardHandler().getRecoveryOnlyConnectionManager(), true);
}
- public IndexFetcher(@SuppressWarnings({"rawtypes"})final NamedList initArgs, final ReplicationHandler handler, final SolrCore sc) {
+ public IndexFetcher(final NamedList<?> initArgs, final ReplicationHandler handler, final SolrCore sc) {
solrCore = sc;
Object fetchFromLeader = initArgs.get(FETCH_FROM_LEADER);
if (fetchFromLeader != null && fetchFromLeader instanceof Boolean) {
@@ -285,10 +285,10 @@ public class IndexFetcher {
this.leaderUrl = leaderUrl;
}
- @SuppressWarnings({"unchecked"})
- protected <T> T getParameter(@SuppressWarnings({"rawtypes"})NamedList initArgs, String configKey, T defaultValue, StringBuilder sb) {
+ protected <T> T getParameter(NamedList<?> initArgs, String configKey, T defaultValue, StringBuilder sb) {
T toReturn = defaultValue;
if (initArgs != null) {
+ @SuppressWarnings("unchecked")
T temp = (T) initArgs.get(configKey);
toReturn = (temp != null) ? temp : defaultValue;
}
@@ -299,8 +299,7 @@ public class IndexFetcher {
/**
* Gets the latest commit version and generation from the leader
*/
- @SuppressWarnings({"rawtypes"})
- NamedList getLatestVersion() throws IOException {
+ NamedList<Object> getLatestVersion() throws IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(COMMAND, CMD_INDEX_VERSION);
params.set(CommonParams.WT, JAVABIN);
@@ -338,8 +337,7 @@ public class IndexFetcher {
.withConnectionTimeout(connTimeout)
.withSocketTimeout(soTimeout)
.build()) {
- @SuppressWarnings({"rawtypes"})
- NamedList response = client.request(req);
+ NamedList<?> response = client.request(req);
List<Map<String, Object>> files = (List<Map<String,Object>>) response.get(CMD_GET_FILE_LIST);
if (files != null)
@@ -420,8 +418,7 @@ public class IndexFetcher {
}
}
//get the current 'replicateable' index version in the leader
- @SuppressWarnings({"rawtypes"})
- NamedList response;
+ NamedList<?> response;
try {
response = getLatestVersion();
} catch (Exception e) {
@@ -1406,14 +1403,12 @@ public class IndexFetcher {
*
* @return a list of configuration files which have changed on the leader and need to be downloaded.
*/
- @SuppressWarnings({"unchecked"})
private Collection<Map<String, Object>> getModifiedConfFiles(List<Map<String, Object>> confFilesToDownload) {
if (confFilesToDownload == null || confFilesToDownload.isEmpty())
return Collections.emptyList();
//build a map with alias/name as the key
Map<String, Map<String, Object>> nameVsFile = new HashMap<>();
- @SuppressWarnings({"rawtypes"})
- NamedList names = new NamedList();
+ NamedList<String> names = new NamedList<>();
for (Map<String, Object> map : confFilesToDownload) {
//if alias is present that is the name the file may have in the follower
String name = (String) (map.get(ALIAS) == null ? map.get(NAME) : map.get(ALIAS));
@@ -1770,8 +1765,7 @@ public class IndexFetcher {
}
- @SuppressWarnings({"rawtypes"})
- NamedList response;
+ NamedList<?> response;
InputStream is = null;
// TODO use shardhandler
@@ -1880,8 +1874,7 @@ public class IndexFetcher {
}
}
- @SuppressWarnings({"rawtypes"})
- NamedList getDetails() throws IOException, SolrServerException {
+ NamedList<Object> getDetails() throws IOException, SolrServerException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(COMMAND, CMD_DETAILS);
params.set("follower", false);
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index e97210362c6..5d8a3186c99 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -90,11 +90,6 @@ public class MoreLikeThisHandler extends RequestHandlerBase
static final String ERR_MSG_SINGLE_STREAM_ONLY =
"MoreLikeThis does not support multiple ContentStreams";
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- super.init(args);
- }
-
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception
{
@@ -258,19 +253,16 @@ public class MoreLikeThisHandler extends RequestHandlerBase
// TODO resolve duplicated code with DebugComponent. Perhaps it should be added to doStandardDebug?
if (dbg == true) {
try {
- @SuppressWarnings({"unchecked"})
NamedList<Object> dbgInfo = SolrPluginUtils.doStandardDebug(req, q, mlt.getRawMLTQuery(), mltDocs.docList, dbgQuery, dbgResults);
- if (null != dbgInfo) {
- if (null != filters) {
- dbgInfo.add("filter_queries", req.getParams().getParams(CommonParams.FQ));
- List<String> fqs = new ArrayList<>(filters.size());
- for (Query fq : filters) {
- fqs.add(QueryParsing.toString(fq, req.getSchema()));
- }
- dbgInfo.add("parsed_filter_queries", fqs);
+ if (null != filters) {
+ dbgInfo.add("filter_queries", req.getParams().getParams(CommonParams.FQ));
+ List<String> fqs = new ArrayList<>(filters.size());
+ for (Query fq : filters) {
+ fqs.add(QueryParsing.toString(fq, req.getSchema()));
}
- rsp.add("debug", dbgInfo);
+ dbgInfo.add("parsed_filter_queries", fqs);
}
+ rsp.add("debug", dbgInfo);
} catch (Exception e) {
SolrException.log(log, "Exception during debug", e);
rsp.add("exception_during_debug", SolrException.toStr(e));
diff --git a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
index c96f79f307a..c3a2021e4b0 100644
--- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
@@ -139,7 +139,7 @@ public class PingRequestHandler extends RequestHandlerBase implements SolrCoreAw
private Path healthcheck = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
Object tmp = args.get(HEALTHCHECK_FILE_PARAM);
healthFileName = (null == tmp ? null : tmp.toString());
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index f4649c22f01..3f726a98da4 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -960,8 +960,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
Properties props = loadReplicationProperties();
if (showFollowerDetails) {
try {
- @SuppressWarnings({"rawtypes"})
- NamedList nl = fetcher.getDetails();
+ NamedList<Object> nl = fetcher.getDetails();
follower.add("leaderDetails", nl.get(CMD_DETAILS));
} catch (Exception e) {
log.warn(
@@ -1072,8 +1071,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (follower.size() > 0)
details.add("follower", follower);
- @SuppressWarnings({"rawtypes"})
- NamedList snapshotStats = snapShootDetails;
+ NamedList<?> snapshotStats = snapShootDetails;
if (snapshotStats != null)
details.add(CMD_BACKUP, snapshotStats);
@@ -1241,16 +1239,14 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
} else {
numberBackupsToKeep = 0;
}
- @SuppressWarnings({"rawtypes"})
- NamedList follower = getObjectWithBackwardCompatibility(initArgs, "follower", "slave");
+ NamedList<?> follower = getObjectWithBackwardCompatibility(initArgs, "follower", "slave");
boolean enableFollower = isEnabled( follower );
if (enableFollower) {
currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(follower, this, core);
setupPolling((String) follower.get(POLL_INTERVAL));
isFollower = true;
}
- @SuppressWarnings({"rawtypes"})
- NamedList leader = getObjectWithBackwardCompatibility(initArgs, "leader", "master");
+ NamedList<?> leader = getObjectWithBackwardCompatibility(initArgs, "leader", "master");
boolean enableLeader = isEnabled( leader );
if (enableLeader || (enableFollower && !currentIndexFetcher.fetchFromLeader)) {
@@ -1279,12 +1275,10 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
log.info("Replication enabled for following config files: {}", includeConfFiles);
}
- @SuppressWarnings({"rawtypes"})
- List backup = leader.getAll("backupAfter");
+ List<?> backup = leader.getAll("backupAfter");
boolean backupOnCommit = backup.contains("commit");
boolean backupOnOptimize = !backupOnCommit && backup.contains("optimize");
- @SuppressWarnings({"rawtypes"})
- List replicateAfter = leader.getAll(REPLICATE_AFTER);
+ List<?> replicateAfter = leader.getAll(REPLICATE_AFTER);
replicateOnCommit = replicateAfter.contains("commit");
replicateOnOptimize = !replicateOnCommit && replicateAfter.contains("optimize");
@@ -1365,7 +1359,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
// check leader or follower is enabled
- private boolean isEnabled( @SuppressWarnings({"rawtypes"})NamedList params ){
+ private boolean isEnabled(NamedList<?> params ){
if( params == null ) return false;
Object enable = params.get( "enable" );
if( enable == null ) return true;
@@ -1435,9 +1429,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
*/
private SolrEventListener getEventListener(final boolean snapshoot, final boolean getCommit) {
return new SolrEventListener() {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {/*no op*/ }
-
/**
* This refreshes the latest replicateable index commit and optionally can create Snapshots as well
*/
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 3fad45a0018..d761c55aed1 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -55,8 +55,7 @@ import static org.apache.solr.core.RequestParams.USEPARAM;
*/
public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoBean, NestedRequestHandler, ApiSupport {
- @SuppressWarnings({"rawtypes"})
- protected NamedList initArgs = null;
+ protected NamedList<?> initArgs = null;
protected SolrParams defaults;
protected SolrParams appends;
protected SolrParams invariants;
@@ -129,7 +128,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
* See also the example solrconfig.xml located in the Solr codebase (example/solr/conf).
*/
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
initArgs = args;
if (args != null) {
@@ -170,16 +169,15 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
solrMetricsContext.gauge(() -> handlerStart, true, "handlerStart", getCategory().toString(), scope);
}
- public static SolrParams getSolrParamsFromNamedList(@SuppressWarnings({"rawtypes"})NamedList args, String key) {
+ public static SolrParams getSolrParamsFromNamedList(NamedList<?> args, String key) {
Object o = args.get(key);
if (o != null && o instanceof NamedList) {
- return ((NamedList) o).toSolrParams();
+ return ((NamedList<?>) o).toSolrParams();
}
return null;
}
- @SuppressWarnings({"rawtypes"})
- public NamedList getInitArgs() {
+ public NamedList<?> getInitArgs() {
return initArgs;
}
@@ -213,8 +211,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
rsp.setHttpCaching(httpCaching);
handleRequestBody(req, rsp);
// count timeouts
- @SuppressWarnings({"rawtypes"})
- NamedList header = rsp.getResponseHeader();
+ NamedList<?> header = rsp.getResponseHeader();
if (header != null) {
if (Boolean.TRUE.equals(header.getBooleanArg(
SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY))) {
diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
index e5f44e30aae..44b4d602023 100644
--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
@@ -151,8 +151,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
public static boolean getImmutable(SolrCore core) {
- @SuppressWarnings({"rawtypes"})
- NamedList configSetProperties = core.getConfigSetProperties();
+ NamedList<?> configSetProperties = core.getConfigSetProperties();
if (configSetProperties == null) return false;
Object immutable = configSetProperties.get(IMMUTABLE_CONFIGSET_ARG);
return immutable != null && Boolean.parseBoolean(immutable.toString());
@@ -343,8 +342,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
LocalSolrQueryRequest r = new LocalSolrQueryRequest(req.getCore(), req.getOriginalParams());
r.getContext().put(USEPARAM, useParams);
- @SuppressWarnings({"rawtypes"})
- NamedList nl = new PluginInfo(SolrRequestHandler.TYPE, pluginInfo).initArgs;
+ NamedList<?> nl = new PluginInfo(SolrRequestHandler.TYPE, pluginInfo).initArgs;
SolrPluginUtils.setDefaults(r,
getSolrParamsFromNamedList(nl, DEFAULTS),
getSolrParamsFromNamedList(nl, APPENDS),
diff --git a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
index 969ed0fd318..b0f4f14138b 100644
--- a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
@@ -113,7 +113,7 @@ public class UpdateRequestHandler extends ContentStreamHandlerBase implements Pe
};
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
// Since backed by a non-thread safe Map, it should not be modifiable
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ColStatus.java b/solr/core/src/java/org/apache/solr/handler/admin/ColStatus.java
index 90b7625e57b..91f04d08341 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ColStatus.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ColStatus.java
@@ -185,9 +185,9 @@ public class ColStatus {
NamedList<Object> rsp = client.request(req);
rsp.remove("responseHeader");
leaderMap.add("segInfos", rsp);
- NamedList<Object> segs = (NamedList<Object>)rsp.get("segments");
+ NamedList<?> segs = (NamedList<?>)rsp.get("segments");
if (segs != null) {
- for (Map.Entry<String, Object> entry : segs) {
+ for (Map.Entry<String, ?> entry : segs) {
NamedList<Object> fields = (NamedList<Object>)((NamedList<Object>)entry.getValue()).get("fields");
if (fields != null) {
for (Map.Entry<String, Object> fEntry : fields) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 3310700c044..60b16b235aa 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -172,7 +172,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
}
@Override
- final public void init(@SuppressWarnings({"rawtypes"}) NamedList args) {
+ final public void init(NamedList<?> args) {
}
@@ -299,7 +299,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
}
if (m.get(ASYNC) != null) {
String asyncId = m.getStr(ASYNC);
- NamedList<String> r = new NamedList<>();
+ NamedList<Object> r = new NamedList<>();
if (coreContainer.getZkController().claimAsyncId(asyncId)) {
boolean success = false;
@@ -321,7 +321,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
} else {
r.add("error", "Task with the same requestid already exists. (" + asyncId + ")");
}
- r.add(CoreAdminParams.REQUESTID, (String) m.get(ASYNC));
+ r.add(CoreAdminParams.REQUESTID, m.get(ASYNC));
return new OverseerSolrResponse(r);
}
@@ -756,7 +756,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
String extCollectionName = req.getParams().get(COLLECTION_PROP);
String collectionName = followAliases ? h.coreContainer.getZkController().getZkStateReader()
.getAliases().resolveSimpleAlias(extCollectionName) : extCollectionName;
- if (!ImplicitDocRouter.NAME.equals(((Map) clusterState.getCollection(collectionName).get(DOC_ROUTER)).get(NAME)))
+ if (!ImplicitDocRouter.NAME.equals(((Map<?,?>) clusterState.getCollection(collectionName).get(DOC_ROUTER)).get(NAME)))
throw new SolrException(ErrorCode.BAD_REQUEST, "shards can be added only to 'implicit' collections");
copy(req.getParams(), map,
REPLICATION_FACTOR,
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 69706ac5524..a738e43ae1b 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -115,7 +115,7 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa
@Override
- final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ final public void init(NamedList<?> args) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"CoreAdminHandler should not be configured in solrconf.xml\n" +
"it is a special Handler configured directly by the RequestDispatcher");
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java
index 1365a017275..8fcbef310fc 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java
@@ -75,8 +75,7 @@ public class HealthCheckHandler extends RequestHandlerBase {
}
@Override
- final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
+ final public void init(NamedList<?> args) { }
public CoreContainer getCoreContainer() {
return this.coreContainer;
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
index 2d514b1de00..29032dab97a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
@@ -59,9 +59,7 @@ public class InfoHandler extends RequestHandlerBase {
@Override
- final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
-
- }
+ final public void init(NamedList<?> args) { }
/**
* The instance of CoreContainer this handler handles. This should be the CoreContainer instance that created this
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java
index c017f152b8a..a445c0d4b8b 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java
@@ -93,7 +93,7 @@ public class MetricsCollectorHandler extends RequestHandlerBase {
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList initArgs) {
+ public void init(NamedList<?> initArgs) {
super.init(initArgs);
if (initArgs != null) {
params = initArgs.toSolrParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
index 1f3d066ae80..9ed4dfd7e4f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
@@ -86,7 +86,6 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private void doEdit(SolrQueryRequest req, SolrQueryResponse rsp, String path, final String key, final Object plugin)
throws IOException {
ConfigEditablePlugin configEditablePlugin = null;
@@ -110,14 +109,16 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
for (int count = 1; count <= 3 ; count++ ) {
SecurityConfig securityConfig = getSecurityConfig(true);
Map<String, Object> data = securityConfig.getData();
+ @SuppressWarnings("unchecked")
Map<String, Object> latestConf = (Map<String, Object>) data.get(key);
if (latestConf == null) {
throw new SolrException(SERVER_ERROR, "No configuration present for " + key);
}
List<CommandOperation> commandsCopy = CommandOperation.clone(ops);
+ @SuppressWarnings("unchecked")
Map<String, Object> out = configEditablePlugin.edit(Utils.getDeepCopy(latestConf, 4) , commandsCopy);
if (out == null) {
- List<Map> errs = CommandOperation.captureErrors(commandsCopy);
+ List<Map<String, Object>> errs = CommandOperation.captureErrors(commandsCopy);
if (!errs.isEmpty()) {
rsp.add(CommandOperation.ERR_MSGS, errs);
return;
@@ -128,7 +129,7 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
if(!Objects.equals(latestConf.get("class") , out.get("class"))){
throw new SolrException(SERVER_ERROR, "class cannot be modified");
}
- Map meta = getMapValue(out, "");
+ Map<String, Object> meta = getMapValue(out, "");
meta.put("v", securityConfig.getVersion()+1);//encode the expected zkversion
data.put(key, out);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
index a0002901913..b83e70e06f3 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
@@ -103,7 +103,7 @@ public class ShowFileRequestHandler extends RequestHandlerBase
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init( args );
hiddenFiles = initHidden(invariants);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
index ec33974ef25..faf591b492c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
@@ -78,7 +78,6 @@ public class DebugComponent extends SearchComponent
}
}
- @SuppressWarnings("unchecked")
@Override
public void process(ResponseBuilder rb) throws IOException
{
@@ -92,12 +91,10 @@ public class DebugComponent extends SearchComponent
results = rb.getResults().docList;
}
- @SuppressWarnings({"rawtypes"})
- NamedList stdinfo = SolrPluginUtils.doStandardDebug( rb.req,
+ NamedList<Object> stdinfo = SolrPluginUtils.doStandardDebug( rb.req,
rb.getQueryString(), rb.wrap(rb.getQuery()), results, rb.isDebugQuery(), rb.isDebugResults());
- @SuppressWarnings({"rawtypes"})
- NamedList info = rb.getDebugInfo();
+ NamedList<Object> info = rb.getDebugInfo();
if( info == null ) {
rb.setDebugInfo( stdinfo );
info = stdinfo;
@@ -217,15 +214,13 @@ public class DebugComponent extends SearchComponent
// this should only happen when using shards.tolerant=true
continue;
}
- @SuppressWarnings({"rawtypes"})
- NamedList sdebug = (NamedList)srsp.getSolrResponse().getResponse().get("debug");
+ NamedList<Object> sdebug = (NamedList<Object>)srsp.getSolrResponse().getResponse().get("debug");
- info = (NamedList)merge(sdebug, info, EXCLUDE_SET);
+ info = (NamedList<Object>)merge(sdebug, info, EXCLUDE_SET);
if ((sreq.purpose & ShardRequest.PURPOSE_GET_DEBUG) != 0) {
hasGetDebugResponses = true;
if (rb.isDebugResults()) {
- @SuppressWarnings({"rawtypes"})
- NamedList sexplain = (NamedList)sdebug.get("explain");
+ NamedList<Object> sexplain = (NamedList<Object>)sdebug.get("explain");
SolrPluginUtils.copyNamedListIntoArrayByDocPosInResponse(sexplain, rb.resultIds, arr);
}
}
@@ -270,8 +265,7 @@ public class DebugComponent extends SearchComponent
return namedList;
}
NamedList<Object> responseNL = shardResponse.getSolrResponse().getResponse();
- @SuppressWarnings("unchecked")
- NamedList<Object> responseHeader = (NamedList<Object>)responseNL.get("responseHeader");
+ NamedList<?> responseHeader = (NamedList<?>)responseNL.get("responseHeader");
if(responseHeader != null) {
namedList.add("QTime", responseHeader.get("QTime").toString());
}
@@ -302,7 +296,7 @@ public class DebugComponent extends SearchComponent
dest = new LinkedHashSet<>((Collection<?>) dest);
}
if (source instanceof Collection) {
- ((Collection)dest).addAll((Collection)source);
+ ((Collection)dest).addAll((Collection<?>)source);
} else {
((Collection)dest).add(source);
}
@@ -326,8 +320,7 @@ public class DebugComponent extends SearchComponent
if (source instanceof NamedList && dest instanceof NamedList) {
NamedList<Object> tmp = new NamedList<>();
- @SuppressWarnings("unchecked")
- NamedList<Object> sl = (NamedList<Object>)source;
+ NamedList<?> sl = (NamedList<?>)source;
@SuppressWarnings("unchecked")
NamedList<Object> dl = (NamedList<Object>)dest;
for (int i=0; i<sl.size(); i++) {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
index 62b72d268b2..4a70709ddca 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -168,8 +168,7 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
// No highlighting if there is no query -- consider q.alt=*:*
if( highlightQuery != null ) {
- @SuppressWarnings({"rawtypes"})
- NamedList sumData = highlighter.doHighlighting(
+ NamedList<Object> sumData = highlighter.doHighlighting(
rb.getResults().docList,
highlightQuery,
req, defaultHighlightFields );
@@ -277,7 +276,7 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
return "highlighting";
}
- protected Object convertHighlights(@SuppressWarnings({"rawtypes"})NamedList hl) {
+ protected Object convertHighlights(NamedList<Object> hl) {
return hl;
}
@@ -289,8 +288,8 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
protected void addHighlights(Object[] objArr, Object obj, Map<Object, ShardDoc> resultIds) {
@SuppressWarnings({"unchecked"})
Map.Entry<String, Object>[] arr = (Map.Entry<String, Object>[])objArr;
- @SuppressWarnings({"rawtypes"})
- NamedList hl = (NamedList)obj;
+ @SuppressWarnings("unchecked")
+ NamedList<Object> hl = (NamedList<Object>) obj;
SolrPluginUtils.copyNamedListIntoArrayByDocPosInResponse(hl, resultIds, arr);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 79c872cfbd4..d15d01ef136 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -153,13 +153,12 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
}
}
- @SuppressWarnings({"unchecked"})
- private void initReplicaListTransformers(@SuppressWarnings({"rawtypes"})NamedList routingConfig) {
+ private void initReplicaListTransformers(NamedList<?> routingConfig) {
String defaultRouting = null;
ReplicaListTransformerFactory stableRltFactory = null;
ReplicaListTransformerFactory defaultRltFactory;
if (routingConfig != null && routingConfig.size() > 0) {
- Iterator<Entry<String,?>> iter = routingConfig.iterator();
+ Iterator<? extends Entry<String,?>> iter = routingConfig.iterator();
do {
Entry<String, ?> e = iter.next();
String key = e.getKey();
@@ -195,8 +194,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
@Override
public void init(PluginInfo info) {
StringBuilder sb = new StringBuilder();
- @SuppressWarnings({"rawtypes"})
- NamedList args = info.initArgs;
+ NamedList<?> args = info.initArgs;
this.scheme = getParameter(args, INIT_URL_SCHEME, null,sb);
if(StringUtils.endsWith(this.scheme, "://")) {
this.scheme = StringUtils.removeEnd(this.scheme, "://");
@@ -276,7 +274,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
clientBuilderPlugin.setup(defaultClient);
}
- protected <T> T getParameter(@SuppressWarnings({"rawtypes"})NamedList initArgs, String configKey, T defaultValue, StringBuilder sb) {
+ protected <T> T getParameter(NamedList<?> initArgs, String configKey, T defaultValue, StringBuilder sb) {
T toReturn = defaultValue;
if (initArgs != null) {
@SuppressWarnings({"unchecked"})
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 1eab71cf9a2..e05609143fe 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -162,7 +162,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
protected long cacheVersion;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
this.initArgs = args.toSolrParams();
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
index fb27f686af0..efe5d740b71 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.search.facet.FacetModule;
@@ -89,14 +88,6 @@ public abstract class SearchComponent implements SolrInfoBean, NamedListInitiali
this.name = name;
}
-
- //////////////////////// NamedListInitializedPlugin methods //////////////////////
- @Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args )
- {
- // By default do nothing
- }
-
//////////////////////// SolrInfoBean methods //////////////////////
@Override
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
index 83fb1dea9b4..03bbd2c6180 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
@@ -97,8 +97,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
*/
public static final String COMPONENT_NAME = "spellcheck";
- @SuppressWarnings({"rawtypes"})
- protected NamedList initParams;
+ protected NamedList<?> initParams;
/**
@@ -109,7 +108,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
protected QueryConverter queryConverter;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
this.initParams = args;
}
@@ -715,7 +714,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
}
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({"unchecked"})
public void inform(SolrCore core) {
if (initParams != null) {
log.info("Initializing spell checkers");
@@ -724,13 +723,13 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
if (initParams.getName(i).equals("spellchecker")) {
Object cfg = initParams.getVal(i);
if (cfg instanceof NamedList) {
- addSpellChecker(core, hasDefault, (NamedList) cfg);
+ addSpellChecker(core, hasDefault, (NamedList<?>) cfg);
} else if (cfg instanceof Map) {
- addSpellChecker(core, hasDefault, new NamedList((Map) cfg));
+ addSpellChecker(core, hasDefault, new NamedList<>((Map<String, ?>) cfg));
} else if (cfg instanceof List) {
- for (Object o : (List) cfg) {
+ for (Object o : (List<?>) cfg) {
if (o instanceof Map) {
- addSpellChecker(core, hasDefault, new NamedList((Map) o));
+ addSpellChecker(core, hasDefault, new NamedList<>((Map<String, ?>) o));
}
}
}
@@ -760,7 +759,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
}
}
- @SuppressWarnings({"rawtypes"})private boolean addSpellChecker(SolrCore core, boolean hasDefault, @SuppressWarnings({"rawtypes"})NamedList spellchecker) {
+ private boolean addSpellChecker(SolrCore core, boolean hasDefault, NamedList<?> spellchecker) {
String className = (String) spellchecker.get("classname");
if (className == null) className = (String) spellchecker.get("class");
// TODO: this is a little bit sneaky: warn if class isnt supplied
@@ -816,10 +815,6 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
this.buildOnOptimize = buildOnOptimize;
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
@Override
public void newSearcher(SolrIndexSearcher newSearcher,
SolrIndexSearcher currentSearcher) {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
index fd72be9c9b7..440286237c1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
@@ -86,8 +86,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
/** SolrConfig label to identify boolean value to build suggesters on startup */
private static final String BUILD_ON_STARTUP_LABEL = "buildOnStartup";
- @SuppressWarnings({"rawtypes"})
- protected NamedList initParams;
+ protected NamedList<?> initParams;
/**
* Key is the dictionary name used in SolrConfig, value is the corresponding {@link SolrSuggester}
@@ -105,7 +104,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
this.initParams = args;
}
@@ -117,8 +116,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
boolean hasDefault = false;
for (int i = 0; i < initParams.size(); i++) {
if (initParams.getName(i).equals(CONFIG_PARAM_LABEL)) {
- @SuppressWarnings({"rawtypes"})
- NamedList suggesterParams = (NamedList) initParams.getVal(i);
+ NamedList<?> suggesterParams = (NamedList<?>) initParams.getVal(i);
SolrSuggester suggester = new SolrSuggester();
String dictionary = suggester.init(suggesterParams, core);
if (dictionary != null) {
@@ -500,9 +498,6 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
this.isCoreReload = isCoreReload;
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
@Override
public void newSearcher(SolrIndexSearcher newSearcher,
SolrIndexSearcher currentSearcher) {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
index f28e6e3e62c..977b5c6a383 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
@@ -84,8 +84,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
private static final String TV_KEY_WARNINGS = "warnings";
- @SuppressWarnings({"rawtypes"})
- protected NamedList initParams;
+ protected NamedList<?> initParams;
/**
* Helper method for determining the list of fields that we should
@@ -122,7 +121,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
return (null != fieldNames) ?
fieldNames :
// return empty set indicating no fields should be used
- Collections.<String>emptySet();
+ Collections.emptySet();
}
// otherwise us the raw fldList as is, no special parsing or globs
@@ -454,7 +453,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
//////////////////////// NamedListInitializedPlugin methods //////////////////////
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
this.initParams = args;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
index 6ab2dd20d2e..be57192bc3c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
@@ -78,12 +78,6 @@ public class TermsComponent extends SearchComponent {
public static final int UNLIMITED_MAX_COUNT = -1;
public static final String COMPONENT_NAME = "terms";
- @Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args )
- {
- super.init(args);
- }
-
@Override
public void prepare(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
diff --git a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
index 1e7b0d65915..7cbbda88fe7 100644
--- a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
+++ b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
@@ -36,7 +36,7 @@ public abstract class HighlightingPluginBase implements SolrInfoBean
protected Set<String> metricNames = ConcurrentHashMap.newKeySet(1);
protected SolrMetricsContext solrMetricsContext;
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
if( args != null ) {
Object o = args.get("defaults");
if (o != null && o instanceof NamedList ) {
diff --git a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java
index b1206d01e5f..a84bb973849 100644
--- a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java
@@ -48,7 +48,7 @@ public class RegexFragmenter extends HighlightingPluginBase implements SolrFragm
protected Pattern defaultPattern;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
defaultPatternRaw = LuceneRegexFragmenter.DEFAULT_PATTERN_RAW;
if( defaults != null ) {
diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java
index a7a76b382f3..53229b36ccb 100644
--- a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java
+++ b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java
@@ -18,20 +18,10 @@ package org.apache.solr.highlight;
import org.apache.lucene.search.highlight.Encoder;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
public interface SolrEncoder extends SolrInfoBean, NamedListInitializedPlugin {
-
- /** <code>init</code> will be called just once, immediately after creation.
- * <p>The args are user-level initialization parameters that
- * may be specified when declaring a request handler in
- * solrconfig.xml
- */
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args);
-
/**
* Return an {@link org.apache.lucene.search.highlight.Encoder} appropriate for this field.
*
diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java
index 50ef986079e..8b6ebe773ff 100644
--- a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java
@@ -18,20 +18,11 @@ package org.apache.solr.highlight;
import org.apache.lucene.search.highlight.Formatter;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
public interface SolrFormatter extends SolrInfoBean, NamedListInitializedPlugin {
- /** <code>init</code> will be called just once, immediately after creation.
- * <p>The args are user-level initialization parameters that
- * may be specified when declaring a request handler in
- * solrconfig.xml
- */
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args);
-
/**
* Return a {@link org.apache.lucene.search.highlight.Formatter} appropriate for this field.
*
diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java
index 3b8b80d4238..9ef51430a27 100644
--- a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java
+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java
@@ -18,20 +18,10 @@ package org.apache.solr.highlight;
import org.apache.lucene.search.vectorhighlight.FragListBuilder;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
public interface SolrFragListBuilder extends SolrInfoBean, NamedListInitializedPlugin {
-
- /** <code>init</code> will be called just once, immediately after creation.
- * <p>The args are user-level initialization parameters that
- * may be specified when declaring a request handler in
- * solrconfig.xml
- */
- @Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args);
-
/**
* Return a FragListBuilder.
*
diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java
index e449fe223d3..1bf89be16e3 100644
--- a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java
@@ -18,20 +18,10 @@ package org.apache.solr.highlight;
import org.apache.lucene.search.highlight.Fragmenter;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
public interface SolrFragmenter extends SolrInfoBean, NamedListInitializedPlugin {
-
- /** <code>init</code> will be called just once, immediately after creation.
- * <p>The args are user-level initialization parameters that
- * may be specified when declaring a request handler in
- * solrconfig.xml
- */
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args);
-
/**
* Return a {@link org.apache.lucene.search.highlight.Fragmenter} appropriate for this field.
*
diff --git a/solr/core/src/java/org/apache/solr/index/MergePolicyFactoryArgs.java b/solr/core/src/java/org/apache/solr/index/MergePolicyFactoryArgs.java
index e2e6672826d..17cf5c053cb 100644
--- a/solr/core/src/java/org/apache/solr/index/MergePolicyFactoryArgs.java
+++ b/solr/core/src/java/org/apache/solr/index/MergePolicyFactoryArgs.java
@@ -31,9 +31,9 @@ public class MergePolicyFactoryArgs {
this.args = new HashMap<>();
}
- public MergePolicyFactoryArgs(Iterable<Map.Entry<String,Object>> args) {
+ public MergePolicyFactoryArgs(Iterable<? extends Map.Entry<String,?>> args) {
this.args = new HashMap<>();
- for (final Map.Entry<String,Object> arg : args) {
+ for (final Map.Entry<String,?> arg : args) {
this.args.put(arg.getKey(), arg.getValue());
}
}
diff --git a/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java b/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java
index a53fa4c2894..83e716ad9a9 100644
--- a/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java
+++ b/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java
@@ -141,7 +141,6 @@ public class MetricSuppliers {
private static final double DEFAULT_ALPHA = 0.015;
private static final long DEFAULT_WINDOW = 300;
- @SuppressWarnings({"unchecked"})
private static final Reservoir getReservoir(SolrResourceLoader loader, PluginInfo info) {
if (info == null) {
return new ExponentiallyDecayingReservoir();
diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java b/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java
index 0840af708ab..158363d003c 100644
--- a/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java
@@ -45,7 +45,7 @@ public interface SolrRequestHandler extends SolrInfoBean {
* may be specified when declaring a request handler in
* solrconfig.xml
*/
- public void init(@SuppressWarnings({"rawtypes"})NamedList args);
+ public void init(NamedList<?> args);
/**
diff --git a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
index 496cde2a0a0..6ae8e157a49 100644
--- a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
@@ -80,11 +80,6 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
return BinaryResponseParser.BINARY_CONTENT_TYPE;
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- /* NOOP */
- }
-
public static class Resolver implements JavaBinCodec.ObjectResolver , JavaBinCodec.WritableDocFields {
protected final SolrQueryRequest solrQueryRequest;
protected IndexSchema schema;
diff --git a/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java b/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
index 0d31d2df2c3..cb77aca0baa 100644
--- a/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
@@ -31,7 +31,6 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.FastWriter;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.internal.csv.CSVPrinter;
import org.apache.solr.internal.csv.CSVStrategy;
import org.apache.solr.request.SolrQueryRequest;
@@ -46,10 +45,6 @@ import org.apache.solr.search.ReturnFields;
public class CSVResponseWriter implements QueryResponseWriter {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
- }
-
@Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
CSVWriter w = new CSVWriter(writer, req, rsp);
diff --git a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
index 568a58455bf..254ea8dabfc 100644
--- a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
@@ -27,17 +27,12 @@ import java.util.ArrayList;
import org.apache.solr.client.solrj.io.graph.Traversal;
import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.client.solrj.io.Tuple;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.handler.GraphHandler;
import org.apache.solr.request.SolrQueryRequest;
public class GraphMLResponseWriter implements QueryResponseWriter {
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- /* NOOP */
- }
-
public String getContentType(SolrQueryRequest req, SolrQueryResponse res) {
return "application/xml";
}
diff --git a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
index 7cff5cd19a8..c30dddba9cd 100644
--- a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
@@ -40,7 +40,7 @@ public class JSONResponseWriter implements QueryResponseWriter {
private String contentType = CONTENT_TYPE_JSON_UTF8;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList namedList) {
+ public void init(NamedList<?> namedList) {
String contentType = (String) namedList.get("content-type");
if (contentType != null) {
this.contentType = contentType;
diff --git a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
index 98ac8f4161e..d09f4f8d124 100644
--- a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
@@ -29,7 +29,7 @@ public class PHPResponseWriter implements QueryResponseWriter {
private String contentType = CONTENT_TYPE_PHP_UTF8;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList namedList) {
+ public void init(NamedList<?> namedList) {
String contentType = (String) namedList.get("content-type");
if (contentType != null) {
this.contentType = contentType;
diff --git a/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
index 9ff20a0af0c..72f6b79165b 100644
--- a/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
@@ -44,7 +44,7 @@ public class PHPSerializedResponseWriter implements QueryResponseWriter {
private String contentType = CONTENT_TYPE_PHP_UTF8;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList namedList) {
+ public void init(NamedList<?> namedList) {
String contentType = (String) namedList.get("content-type");
if (contentType != null) {
this.contentType = contentType;
diff --git a/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java
index 5c7582a6939..a912ad491f9 100644
--- a/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java
@@ -19,17 +19,11 @@ package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class PythonResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PYTHON_ASCII="text/x-python;charset=US-ASCII";
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
- /* NOOP */
- }
-
@Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
PythonWriter w = new PythonWriter(writer, req, rsp);
diff --git a/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java
index 5960e36e425..0815248830d 100644
--- a/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java
@@ -19,7 +19,6 @@ package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
@@ -73,14 +72,6 @@ public interface QueryResponseWriter extends NamedListInitializedPlugin {
* @return a Content-Type string, which may not be null.
*/
public String getContentType(SolrQueryRequest request, SolrQueryResponse response);
-
- /** <code>init</code> will be called just once, immediately after creation.
- * <p>The args are user-level initialization parameters that
- * may be specified when declaring a response writer in
- * solrconfig.xml
- */
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args);
}
diff --git a/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java b/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java
index 9261a556dae..29fc6ec8589 100644
--- a/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java
@@ -54,7 +54,7 @@ public class RawResponseWriter implements BinaryQueryResponseWriter {
private String _baseWriter = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
+ public void init(NamedList<?> n) {
if( n != null ) {
Object base = n.get( "base" );
if( base != null ) {
diff --git a/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java b/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java
index 6eb61c12dcc..e2f3962be71 100644
--- a/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java
@@ -19,17 +19,11 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.Writer;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class RubyResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_RUBY_UTF8="text/x-ruby;charset=UTF-8";
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
- /* NOOP */
- }
-
@Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
RubyWriter w = new RubyWriter(writer, req, rsp);
diff --git a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java
index a8cdc89cc2e..f6ec6a3adab 100644
--- a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java
@@ -20,18 +20,12 @@ import java.io.Writer;
import java.io.IOException;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
*
*/
public class SchemaXmlResponseWriter implements QueryResponseWriter {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
- /* NOOP */
- }
-
@Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
SchemaXmlWriter w = new SchemaXmlWriter(writer, req, rsp);
diff --git a/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java
index ed5a6dc896d..643b829f7f8 100644
--- a/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java
@@ -23,7 +23,6 @@ import java.math.BigInteger;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class SmileResponseWriter extends BinaryResponseWriter {
@@ -35,10 +34,6 @@ public class SmileResponseWriter extends BinaryResponseWriter {
}
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
-
- }
//smile format is an equivalent of JSON format . So we extend JSONWriter and override the relevant methods
public static class SmileWriter extends JSONWriter {
diff --git a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java
index abab6ef484b..f4295d67f77 100644
--- a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java
@@ -20,18 +20,12 @@ import java.io.Writer;
import java.io.IOException;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
*
*/
public class XMLResponseWriter implements QueryResponseWriter {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {
- /* NOOP */
- }
-
@Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
XMLWriter w = new XMLWriter(writer, req, rsp);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
index 5dfaff2858a..ba80aa8ea63 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
@@ -42,7 +42,7 @@ public class ExplainAugmenterFactory extends TransformerFactory
protected Style defaultStyle = Style.text;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
if( defaultUserArgs != null ) {
defaultStyle = getStyle( defaultUserArgs );
diff --git a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
index baa277bfb25..c20d704cb2b 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
@@ -49,7 +49,7 @@ public class RawValueTransformerFactory extends TransformerFactory
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
if(defaultUserArgs!=null&&defaultUserArgs.startsWith("wt=")) {
applyToWT = defaultUserArgs.substring(3);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java
index ed8a9302b98..97134ea71a5 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java
@@ -34,7 +34,7 @@ public abstract class TransformerFactory implements NamedListInitializedPlugin
protected String defaultUserArgs = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
defaultUserArgs = (String)args.get( "args" );
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
index 0cc247684bd..9f2384fd219 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
@@ -33,7 +33,7 @@ public class ValueAugmenterFactory extends TransformerFactory {
protected Object defaultValue = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
value = args.get("value");
if (value == null) {
defaultValue = args.get("defaultValue");
diff --git a/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java
index 8e31fa536ee..bf088d29490 100644
--- a/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java
+++ b/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java
@@ -27,7 +27,7 @@ public class ClassicIndexSchemaFactory extends IndexSchemaFactory {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
// no arguments expected
if (args.size() > 0) {
String msg = "Unexpected arg(s): " + args;
diff --git a/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java b/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java
index 8c23135052f..99512c1a9b0 100644
--- a/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java
+++ b/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java
@@ -61,7 +61,7 @@ public class ExternalFileFieldReloader extends AbstractSolrEventListener {
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
cacheFieldSources(getCore().getLatestSchema());
}
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
index 884751bd91c..75bdd3a7fa5 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
@@ -68,7 +68,7 @@ public class ManagedIndexSchemaFactory extends IndexSchemaFactory implements Sol
private boolean shouldUpgrade = false;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
SolrParams params = args.toSolrParams();
isMutable = params.getBool("mutable", true);
args.remove("mutable");
diff --git a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
index 6313e5bb2a2..773e265deff 100644
--- a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
@@ -39,7 +39,7 @@ public class ComplexPhraseQParserPlugin extends QParserPlugin {
private boolean inOrder = true;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
if (args != null) {
Object val = args.get("inOrder");
diff --git a/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
index 952a1eb246c..8a0a193bcbd 100644
--- a/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
@@ -16,9 +16,9 @@
*/
package org.apache.solr.search;
+import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import org.apache.lucene.search.Query;
@@ -173,13 +173,14 @@ public class JoinQParserPlugin extends QParserPlugin {
}
@Override
- @SuppressWarnings({"unchecked"})
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
routerField = (String) args.get("routerField");
if (args.get("allowSolrUrls") != null) {
- allowSolrUrls = new HashSet<>();
- allowSolrUrls.addAll((List<String>) args.get("allowSolrUrls"));
+ @SuppressWarnings("unchecked")
+ Collection<String> configUrls = (Collection<String>) args.get("allowSolrUrls");
+
+ allowSolrUrls = new HashSet<>(configUrls);
} else {
allowSolrUrls = null;
}
diff --git a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
index 32d2c321e2c..4bf592ec344 100644
--- a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.request.SolrQueryRequest;
@@ -95,10 +94,6 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI
/** return a {@link QParser} */
public abstract QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req);
- @Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args ) {
- }
-
@Override
public String getName() {
// TODO: ideally use the NAME property that each qparser plugin has
diff --git a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
index a435f43bb73..d7303972f21 100755
--- a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
@@ -17,6 +17,7 @@
package org.apache.solr.search;
import java.lang.invoke.MethodHandles;
+import java.util.Iterator;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
@@ -54,15 +55,15 @@ public class SolrCoreParser extends CoreParser implements NamedListInitializedPl
}
@Override
- public void init(@SuppressWarnings({"rawtypes"}) NamedList initArgs) {
+ public void init(@SuppressWarnings({"rawtypes"}) NamedList<?> initArgs) {
if (initArgs == null || initArgs.size() == 0) {
return;
}
final SolrResourceLoader loader = req.getCore().getResourceLoader();
- @SuppressWarnings("unchecked")
- final Iterable<Map.Entry<String,Object>> args = initArgs;
- for (final Map.Entry<String,Object> entry : args) {
+ Iterator<? extends Map.Entry<String, ?>> it = initArgs.iterator();
+ while(it.hasNext()) {
+ Map.Entry<String, ?> entry = it.next();
final String queryName = entry.getKey();
final String queryBuilderClassName = (String)entry.getValue();
diff --git a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
index 0fd0f6ab044..2bc3404ade2 100644
--- a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
@@ -52,10 +52,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class TextLogisticRegressionQParserPlugin extends QParserPlugin {
public static final String NAME = "tlogit";
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
@Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new TextLogisticRegressionQParser(qstr, localParams, params, req);
diff --git a/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
index 5cf632a8d3a..b51c6fc60ac 100644
--- a/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
+++ b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
@@ -46,7 +46,6 @@ import org.apache.lucene.search.spell.NGramDistance;
import org.apache.lucene.search.spell.StringDistance;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.schema.CurrencyFieldType;
import org.apache.solr.schema.FieldType;
@@ -94,12 +93,6 @@ import org.locationtech.spatial4j.distance.DistanceUtils;
* Intended usage is to create pluggable, named functions for use in function queries.
*/
public abstract class ValueSourceParser implements NamedListInitializedPlugin {
- /**
- * Initialize the plugin.
- */
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
/**
* Parse the user input into a ValueSource.
*/
@@ -1185,10 +1178,6 @@ public abstract class ValueSourceParser implements NamedListInitializedPlugin {
}
static class DateValueSourceParser extends ValueSourceParser {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
public Date getDate(FunctionQParser fp, String arg) {
if (arg == null) return null;
// check character index 1 to be a digit. Index 0 might be a +/-.
diff --git a/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
index a09f621ca4f..4580dc07296 100755
--- a/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
@@ -66,11 +66,10 @@ import org.apache.solr.schema.IndexSchema;
public class XmlQParserPlugin extends QParserPlugin {
public static final String NAME = "xmlparser";
- @SuppressWarnings({"rawtypes"})
- private NamedList args;
+ private NamedList<?> args;
@Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args ) {
+ public void init(NamedList<?> args ) {
super.init(args);
this.args = args;
}
diff --git a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
index 2368aa90b76..85befe29008 100644
--- a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
@@ -80,19 +80,18 @@ public abstract class AbstractLuceneSpellChecker extends SolrSpellChecker {
protected StringDistance sd;
@Override
- @SuppressWarnings({"unchecked"})
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
super.init(config, core);
- indexDir = (String) config.get(INDEX_DIR);
- String accuracy = (String) config.get(ACCURACY);
+ indexDir = (String)config.get(INDEX_DIR);
+ String accuracy = (String)config.get(ACCURACY);
//If indexDir is relative then create index inside core.getDataDir()
if (indexDir != null) {
if (!new File(indexDir).isAbsolute()) {
indexDir = core.getDataDir() + File.separator + indexDir;
}
}
- sourceLocation = (String) config.get(LOCATION);
- String compClass = (String) config.get(COMPARATOR_CLASS);
+ sourceLocation = (String)config.get(LOCATION);
+ String compClass = (String)config.get(COMPARATOR_CLASS);
Comparator<SuggestWord> comp = null;
if (compClass != null){
if (compClass.equalsIgnoreCase(SCORE_COMP)){
@@ -100,7 +99,9 @@ public abstract class AbstractLuceneSpellChecker extends SolrSpellChecker {
} else if (compClass.equalsIgnoreCase(FREQ_COMP)){
comp = new SuggestWordFrequencyComparator();
} else{//must be a FQCN
- comp = (Comparator<SuggestWord>) core.getResourceLoader().newInstance(compClass, Comparator.class);
+ @SuppressWarnings("unchecked")
+ Comparator<SuggestWord> temp = (Comparator<SuggestWord>) core.getResourceLoader().newInstance(compClass, Comparator.class);
+ comp = temp;
}
} else {
comp = SuggestWordQueue.DEFAULT_COMPARATOR;
diff --git a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
index f92919d4453..4919901bf77 100644
--- a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
@@ -82,7 +82,7 @@ public class ConjunctionSolrSpellChecker extends SolrSpellChecker {
}
@Override
- public String init(@SuppressWarnings("rawtypes") NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
for (int i = 0; i < checkers.size(); i++) {
SolrSpellChecker c = checkers.get(i);
String dn = c.init(config, core);
diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
index 95cf0ea7b50..dfcbe9f7cd8 100644
--- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
@@ -96,8 +96,7 @@ public class DirectSolrSpellChecker extends SolrSpellChecker {
private DirectSpellChecker checker = new DirectSpellChecker();
@Override
- @SuppressWarnings({"unchecked"})
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
SolrParams params = config.toSolrParams();
@@ -105,18 +104,21 @@ public class DirectSolrSpellChecker extends SolrSpellChecker {
String name = super.init(config, core);
Comparator<SuggestWord> comp = SuggestWordQueue.DEFAULT_COMPARATOR;
- String compClass = (String) config.get(COMPARATOR_CLASS);
+ String compClass = (String)config.get(COMPARATOR_CLASS);
if (compClass != null) {
if (compClass.equalsIgnoreCase(SCORE_COMP))
comp = SuggestWordQueue.DEFAULT_COMPARATOR;
else if (compClass.equalsIgnoreCase(FREQ_COMP))
comp = new SuggestWordFrequencyComparator();
- else //must be a FQCN
- comp = (Comparator<SuggestWord>) core.getResourceLoader().newInstance(compClass, Comparator.class);
+ else { //must be a FQCN
+ @SuppressWarnings({"unchecked"})
+ Comparator<SuggestWord> temp = (Comparator<SuggestWord>) core.getResourceLoader().newInstance(compClass, Comparator.class);
+ comp = temp;
+ }
}
StringDistance sd = DirectSpellChecker.INTERNAL_LEVENSHTEIN;
- String distClass = (String) config.get(STRING_DISTANCE);
+ String distClass = (String)config.get(STRING_DISTANCE);
if (distClass != null && !distClass.equalsIgnoreCase(INTERNAL_DISTANCE))
sd = core.getResourceLoader().newInstance(distClass, StringDistance.class);
diff --git a/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
index c22e7dccc76..1f5d0457535 100644
--- a/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
@@ -60,9 +60,9 @@ public class FileBasedSpellChecker extends AbstractLuceneSpellChecker {
public static final String WORD_FIELD_NAME = "word";
@Override
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
super.init(config, core);
- characterEncoding = (String) config.get(SOURCE_FILE_CHAR_ENCODING);
+ characterEncoding = (String)config.get(SOURCE_FILE_CHAR_ENCODING);
return name;
}
diff --git a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
index d833dd069e9..154e68b1c72 100644
--- a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
@@ -48,7 +48,7 @@ public class IndexBasedSpellChecker extends AbstractLuceneSpellChecker {
protected IndexReader reader;
@Override
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
super.init(config, core);
threshold = config.get(THRESHOLD_TOKEN_FREQUENCY) == null ? 0.0f
: (Float) config.get(THRESHOLD_TOKEN_FREQUENCY);
diff --git a/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java
index 72fad4b95b3..193c15d9a01 100644
--- a/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java
+++ b/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java
@@ -18,7 +18,6 @@ package org.apache.solr.spelling;
import java.util.Collection;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**
@@ -45,9 +44,6 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
* @since solr 1.3
*/
public abstract class QueryConverter implements NamedListInitializedPlugin {
- @SuppressWarnings({"rawtypes"})
- private NamedList args;
-
protected Analyzer analyzer;
/**
@@ -75,10 +71,6 @@ public abstract class QueryConverter implements NamedListInitializedPlugin {
* </p>
*/
public static final int TERM_IN_BOOLEAN_QUERY_FLAG = 131072;
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- this.args = args;
- }
/**
* Returns the Collection of {@link Token}s for
diff --git a/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java
index e513ad15a71..c67a10da0e3 100644
--- a/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java
@@ -56,8 +56,8 @@ public abstract class SolrSpellChecker {
protected String field;
protected String fieldTypeName;
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
- name = (String) config.get(DICTIONARY_NAME);
+ public String init(NamedList<?> config, SolrCore core) {
+ name = (String)config.get(DICTIONARY_NAME);
if (name == null) {
name = DEFAULT_DICTIONARY_NAME;
}
diff --git a/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java
index 0a759ad12d3..1a0a2fda259 100644
--- a/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java
@@ -117,8 +117,7 @@ public class WordBreakSolrSpellChecker extends SolrSpellChecker {
private static final Pattern spacePattern = Pattern.compile("\\s+");
@Override
- public String init(@SuppressWarnings("rawtypes") NamedList config,
- SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
String name = super.init(config, core);
combineWords = boolParam(config, PARAM_COMBINE_WORDS);
breakWords = boolParam(config, PARAM_BREAK_WORDS);
@@ -160,14 +159,13 @@ public class WordBreakSolrSpellChecker extends SolrSpellChecker {
return name;
}
- private String strParam(@SuppressWarnings("rawtypes") NamedList config,
+ private String strParam(NamedList<?> config,
String paramName) {
Object o = config.get(paramName);
return o == null ? null : o.toString();
}
- private boolean boolParam(@SuppressWarnings("rawtypes") NamedList config,
- String paramName) {
+ private boolean boolParam(NamedList<?> config, String paramName) {
String s = strParam(config, paramName);
if ("true".equalsIgnoreCase(s) || "on".equalsIgnoreCase(s)) {
return true;
@@ -175,7 +173,7 @@ public class WordBreakSolrSpellChecker extends SolrSpellChecker {
return false;
}
- private int intParam(@SuppressWarnings("rawtypes") NamedList config,
+ private int intParam(NamedList<?> config,
String paramName) {
Object o = config.get(paramName);
if (o == null) {
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
index c5cd82fbc64..8d1eb73a909 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
@@ -85,7 +85,7 @@ public class Suggester extends SolrSpellChecker {
private LookupFactory factory;
@Override
- public String init(@SuppressWarnings({"rawtypes"})NamedList config, SolrCore core) {
+ public String init(NamedList<?> config, SolrCore core) {
log.info("init: {}", config);
String name = super.init(config, core);
threshold = config.get(THRESHOLD_TOKEN_FREQUENCY) == null ? 0.0f
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index 13109033bef..111737d58e1 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -285,7 +285,6 @@ public class SolrIndexConfig implements MapSerializable {
* Builds a MergePolicy using the configured MergePolicyFactory
* or if no factory is configured uses the configured mergePolicy PluginInfo.
*/
- @SuppressWarnings({"unchecked", "rawtypes"})
private MergePolicy buildMergePolicy(SolrResourceLoader resourceLoader, IndexSchema schema) {
final String mpfClassName;
@@ -308,7 +307,6 @@ public class SolrIndexConfig implements MapSerializable {
return mpf.getMergePolicy();
}
- @SuppressWarnings({"unchecked"})
private MergeScheduler buildMergeScheduler(SolrResourceLoader resourceLoader) {
String msClassName = mergeSchedulerInfo == null ? SolrIndexConfig.DEFAULT_MERGE_SCHEDULER_CLASSNAME : mergeSchedulerInfo.className;
MergeScheduler scheduler = resourceLoader.newInstance(msClassName, MergeScheduler.class);
@@ -317,8 +315,7 @@ public class SolrIndexConfig implements MapSerializable {
// LUCENE-5080: these two setters are removed, so we have to invoke setMaxMergesAndThreads
// if someone has them configured.
if (scheduler instanceof ConcurrentMergeScheduler) {
- @SuppressWarnings({"rawtypes"})
- NamedList args = mergeSchedulerInfo.initArgs.clone();
+ NamedList<?> args = mergeSchedulerInfo.initArgs.clone();
Integer maxMergeCount = (Integer) args.remove("maxMergeCount");
if (maxMergeCount == null) {
maxMergeCount = ((ConcurrentMergeScheduler) scheduler).getMaxMergeCount();
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java
index 3268e145c95..f18a39f4c00 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java
@@ -45,7 +45,7 @@ public abstract class AbstractDefaultValueUpdateProcessorFactory
protected String fieldName = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object obj = args.remove("fieldName");
if (null == obj && null == fieldName) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
index 2ded9c7ac94..d30285e0048 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
@@ -158,7 +158,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
inclusions = FieldMutatingUpdateProcessorFactory.parseSelectorParams(args);
validateSelectorParams(inclusions);
inclusions.fieldNameMatchesSchemaField = false; // Explicitly (non-configurably) require unknown field names
@@ -192,10 +192,9 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
}
}
- private static List<TypeMapping> parseTypeMappings(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private static List<TypeMapping> parseTypeMappings(NamedList<?> args) {
List<TypeMapping> typeMappings = new ArrayList<>();
- @SuppressWarnings({"unchecked"})
- List<Object> typeMappingsParams = args.getAll(TYPE_MAPPING_PARAM);
+ List<?> typeMappingsParams = args.getAll(TYPE_MAPPING_PARAM);
for (Object typeMappingObj : typeMappingsParams) {
if (null == typeMappingObj) {
throw new SolrException(SERVER_ERROR, "'" + TYPE_MAPPING_PARAM + "' init param cannot be null");
@@ -203,8 +202,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
if ( ! (typeMappingObj instanceof NamedList) ) {
throw new SolrException(SERVER_ERROR, "'" + TYPE_MAPPING_PARAM + "' init param must be a <lst>");
}
- @SuppressWarnings({"rawtypes"})
- NamedList typeMappingNamedList = (NamedList)typeMappingObj;
+ NamedList<?> typeMappingNamedList = (NamedList<?>)typeMappingObj;
Object fieldTypeObj = typeMappingNamedList.remove(FIELD_TYPE_PARAM);
if (null == fieldTypeObj) {
@@ -220,7 +218,6 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
}
String fieldType = fieldTypeObj.toString();
- @SuppressWarnings({"unchecked"})
Collection<String> valueClasses
= typeMappingNamedList.removeConfigArgs(VALUE_CLASS_PARAM);
if (valueClasses.isEmpty()) {
@@ -248,8 +245,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
if ( ! (copyFieldObj instanceof NamedList)) {
throw new SolrException(SERVER_ERROR, "'" + COPY_FIELD_PARAM + "' init param must be a <lst>");
}
- @SuppressWarnings({"rawtypes"})
- NamedList copyFieldNamedList = (NamedList)copyFieldObj;
+ NamedList<?> copyFieldNamedList = (NamedList<?>)copyFieldObj;
// dest
Object destObj = copyFieldNamedList.remove(DEST_PARAM);
if (null == destObj) {
@@ -405,7 +401,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
typeMapping.copyFieldDefs.stream().collect(Collectors.groupingBy(CopyFieldDef::getMaxChars)));
}
}
- newFields.add(oldSchema.newField(fieldName, fieldTypeName, Collections.<String,Object>emptyMap()));
+ newFields.add(oldSchema.newField(fieldName, fieldTypeName, Collections.emptyMap()));
}
if (newFields.isEmpty() && newCopyFields.isEmpty()) {
// nothing to do - no fields will be added - exit from the retry loop
@@ -560,8 +556,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
}
private boolean isImmutableConfigSet(SolrCore core) {
- @SuppressWarnings({"rawtypes"})
- NamedList args = core.getConfigSetProperties();
+ NamedList<?> args = core.getConfigSetProperties();
Object immutable = args != null ? args.get(IMMUTABLE_CONFIGSET_ARG) : null;
return immutable != null ? Boolean.parseBoolean(immutable.toString()) : false;
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateProcessorFactory.java
index ac5505dd2c1..a292f838831 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateProcessorFactory.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -72,12 +71,6 @@ public class AtomicUpdateProcessorFactory extends UpdateRequestProcessorFactory
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- @SuppressWarnings({"rawtypes", "null"})
- @Override
- public void init(final NamedList args) {
-
- }
-
@Override
public void inform(SolrCore core) {
this.vinfo = core.getUpdateHandler().getUpdateLog() == null ? null : core.getUpdateHandler().getUpdateLog().getVersionInfo();
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
index c4a9ce3d3a8..9e370491801 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
@@ -63,7 +63,7 @@ public class ClassificationUpdateProcessorFactory extends UpdateRequestProcessor
private ClassificationUpdateProcessorParams classificationParams;
@Override
- public void init(@SuppressWarnings({"rawtypes"})final NamedList args) {
+ public void init(final NamedList<?> args) {
if (args != null) {
params = args.toSolrParams();
classificationParams = new ClassificationUpdateProcessorParams();
diff --git a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
index d8e4741828e..1f36aa8d353 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
@@ -197,7 +197,7 @@ public class CloneFieldUpdateProcessorFactory
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
// high level (loose) check for which type of config we have.
//
@@ -225,7 +225,7 @@ public class CloneFieldUpdateProcessorFactory
* init helper method that should only be called when we know for certain that both the
* "source" and "dest" init params do <em>not</em> exist.
*/
- private void initSimpleRegexReplacement(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private void initSimpleRegexReplacement(NamedList<?> args) {
// The syntactic sugar for the case where there is only one regex pattern for source and the same pattern
// is used for the destination pattern...
//
@@ -280,8 +280,7 @@ public class CloneFieldUpdateProcessorFactory
* init helper method that should only be called when we know for certain that both the
* "source" and "dest" init params <em>do</em> exist.
*/
- @SuppressWarnings("unchecked")
- private void initSourceSelectorSyntax(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private void initSourceSelectorSyntax(NamedList<?> args) {
// Full and complete syntax where source and dest are mandatory.
//
// source may be a single string or a selector.
@@ -299,18 +298,17 @@ public class CloneFieldUpdateProcessorFactory
Object d = args.remove(DEST_PARAM);
assert null != d;
- List<Object> sources = args.getAll(SOURCE_PARAM);
+ List<?> sources = args.getAll(SOURCE_PARAM);
assert null != sources;
if (1 == sources.size()) {
if (sources.get(0) instanceof NamedList) {
// nested set of selector options
- @SuppressWarnings({"rawtypes"})
- NamedList selectorConfig = (NamedList) args.remove(SOURCE_PARAM);
+ NamedList<?> selectorConfig = (NamedList<?>) args.remove(SOURCE_PARAM);
srcInclusions = parseSelectorParams(selectorConfig);
- List<Object> excList = selectorConfig.getAll("exclude");
+ List<?> excList = selectorConfig.getAll("exclude");
for (Object excObj : excList) {
if (null == excObj) {
@@ -321,8 +319,7 @@ public class CloneFieldUpdateProcessorFactory
throw new SolrException(SERVER_ERROR, "Init param '" + SOURCE_PARAM +
"' child 'exclude' must be <lst/>");
}
- @SuppressWarnings({"rawtypes"})
- NamedList exc = (NamedList) excObj;
+ NamedList<?> exc = (NamedList<?>) excObj;
srcExclusions.add(parseSelectorParams(exc));
if (0 < exc.size()) {
throw new SolrException(SERVER_ERROR, "Init param '" + SOURCE_PARAM +
@@ -353,8 +350,7 @@ public class CloneFieldUpdateProcessorFactory
}
if (d instanceof NamedList) {
- @SuppressWarnings({"rawtypes"})
- NamedList destList = (NamedList) d;
+ NamedList<?> destList = (NamedList<?>) d;
Object patt = destList.remove(PATTERN_PARAM);
Object replacement = destList.remove(REPLACEMENT_PARAM);
@@ -470,7 +466,7 @@ public class CloneFieldUpdateProcessorFactory
}
/** macro */
- private static SelectorParams parseSelectorParams(@SuppressWarnings({"rawtypes"})NamedList args) {
+ private static SelectorParams parseSelectorParams(NamedList<?> args) {
return FieldMutatingUpdateProcessorFactory.parseSelectorParams(args);
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
index 4c40edd3e4c..e333098bf53 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
@@ -66,7 +66,7 @@ public final class ConcatFieldUpdateProcessorFactory extends FieldMutatingUpdate
String delimiter = ", ";
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object d = args.remove("delimiter");
if (null != d) delimiter = d.toString();
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java
index 776356d026b..6fda861223e 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java
@@ -53,8 +53,7 @@ public class DefaultValueUpdateProcessorFactory
protected Object defaultValue = null;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
-
+ public void init(NamedList<?> args) {
Object obj = args.remove("value");
if (null == obj) {
throw new SolrException
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
index d5878fdad29..5359f5199e8 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
@@ -105,7 +105,7 @@ public class DocBasedVersionConstraintsProcessorFactory extends UpdateRequestPro
@SuppressWarnings("unchecked")
@Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args ) {
+ public void init(NamedList<?> args ) {
Object tmp = args.remove("versionField");
if (null == tmp) {
@@ -150,7 +150,7 @@ public class DocBasedVersionConstraintsProcessorFactory extends UpdateRequestPro
throw new SolrException(SERVER_ERROR,
"'supportMissingVersionOnOldDocs' must be configured as a <bool>");
}
- supportMissingVersionOnOldDocs = ((Boolean)tmp).booleanValue();
+ supportMissingVersionOnOldDocs = (Boolean) tmp;
}
tmp = args.remove("tombstoneConfig");
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
index c0a40250241..f51f298cab8 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
@@ -195,7 +195,7 @@ public final class DocExpirationUpdateProcessorFactory
private SolrException confErr(final String msg, SolrException root) {
return new SolrException(SERVER_ERROR, this.getClass().getSimpleName()+": "+msg, root);
}
- private String removeArgStr(@SuppressWarnings({"rawtypes"})final NamedList args,
+ private String removeArgStr(final NamedList<?> args,
final String arg, final String def,
final String errMsg) {
@@ -210,7 +210,7 @@ public final class DocExpirationUpdateProcessorFactory
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
deleteChainName = removeArgStr(args, DEL_CHAIN_NAME_CONF, null,
"must be a <str> or <null/> for default chain");
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java
index f432c738334..3881c4d3738 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java
@@ -52,7 +52,7 @@ import static org.apache.solr.update.processor.FieldValueMutatingUpdateProcessor
public final class FieldLengthUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
// no length specific init args
super.init(args);
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
index a86f792184c..df860bd2962 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
@@ -139,10 +139,9 @@ public abstract class FieldMutatingUpdateProcessorFactory
}
- @SuppressWarnings({"unchecked"})
- public static SelectorParams parseSelectorParams(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public static SelectorParams parseSelectorParams(NamedList<?> args) {
SelectorParams params = new SelectorParams();
-
+
params.fieldName = new HashSet<>(args.removeConfigArgs("fieldName"));
params.typeName = new HashSet<>(args.removeConfigArgs("typeName"));
@@ -170,11 +169,9 @@ public abstract class FieldMutatingUpdateProcessorFactory
return params;
}
- public static Collection<SelectorParams> parseSelectorExclusionParams(
- @SuppressWarnings({"rawtypes"})NamedList args) {
+ public static Collection<SelectorParams> parseSelectorExclusionParams(NamedList<?> args) {
Collection<SelectorParams> exclusions = new ArrayList<>();
- @SuppressWarnings({"unchecked"})
- List<Object> excList = args.getAll("exclude");
+ List<?> excList = args.getAll("exclude");
for (Object excObj : excList) {
if (null == excObj) {
throw new SolrException (SolrException.ErrorCode.SERVER_ERROR,
@@ -184,8 +181,7 @@ public abstract class FieldMutatingUpdateProcessorFactory
throw new SolrException (SolrException.ErrorCode.SERVER_ERROR,
"'exclude' init param must be <lst/>");
}
- @SuppressWarnings({"rawtypes"})
- NamedList exc = (NamedList) excObj;
+ NamedList<?> exc = (NamedList<?>) excObj;
exclusions.add(parseSelectorParams(exc));
if (0 < exc.size()) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
@@ -207,7 +203,7 @@ public abstract class FieldMutatingUpdateProcessorFactory
* remove any subclass-specific init args before calling this method.
*/
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
inclusions = parseSelectorParams(args);
exclusions = parseSelectorExclusionParams(args);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
index 16d3671ef4c..43f66e96601 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
@@ -83,7 +83,7 @@ public class FieldNameMutatingUpdateProcessorFactory extends UpdateRequestProce
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
sourcePattern = (String) args.get("pattern");
replacement = (String) args.get("replacement");
if(sourcePattern ==null || replacement == null) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
index 66d45e75d47..85e11b9dd7d 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java
@@ -49,7 +49,7 @@ public class IgnoreCommitOptimizeUpdateProcessorFactory extends UpdateRequestPro
protected boolean ignoreOptimizeOnly = false; // default behavior is to ignore commits and optimize
@Override
- public void init(@SuppressWarnings({"rawtypes"})final NamedList args) {
+ public void init(final NamedList<?> args) {
SolrParams params = (args != null) ? args.toSolrParams() : null;
if (params == null) {
errorCode = ErrorCode.FORBIDDEN; // default is 403 error
@@ -137,7 +137,7 @@ public class IgnoreCommitOptimizeUpdateProcessorFactory extends UpdateRequestPro
if (responseHeader != null) {
responseHeader.add("msg", responseMsg);
} else {
- responseHeader = new SimpleOrderedMap<Object>();
+ responseHeader = new SimpleOrderedMap<>();
responseHeader.add("msg", responseMsg);
rsp.addResponseHeader(responseHeader);
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
index 9ef92821765..e2a67133052 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
@@ -48,7 +48,7 @@ public class IgnoreLargeDocumentProcessorFactory extends UpdateRequestProcessorF
private long maxDocumentSize = 1024 * 1024;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
maxDocumentSize = args.toSolrParams().required().getLong(LIMIT_SIZE_PARAM);
args.remove(LIMIT_SIZE_PARAM);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
index 2be93c344eb..a3eb26079c9 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
@@ -52,7 +52,7 @@ public class LogUpdateProcessorFactory extends UpdateRequestProcessorFactory imp
int maxNumToLog = 10;
int slowUpdateThresholdMillis = -1;
@Override
- public void init( @SuppressWarnings({"rawtypes"})final NamedList args ) {
+ public void init(final NamedList<?> args ) {
if( args != null ) {
SolrParams params = args.toSolrParams();
maxNumToLog = params.getInt( "maxNumToLog", maxNumToLog );
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java
index cc25612f484..12933772ce5 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java
@@ -16,8 +16,8 @@
*/
package org.apache.solr.update.processor;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
@@ -73,8 +73,8 @@ public class ParseBooleanFieldUpdateProcessorFactory extends FieldMutatingUpdate
private static final String FALSE_VALUES_PARAM = "falseValue";
private static final String CASE_SENSITIVE_PARAM = "caseSensitive";
- private final Set<String> trueValues = new HashSet<>(Arrays.asList("true"));
- private final Set<String> falseValues = new HashSet<>(Arrays.asList("false"));
+ private Set<String> trueValues = new HashSet<>(Collections.singleton("true"));
+ private Set<String> falseValues = new HashSet<>(Collections.singleton("false"));
private boolean caseSensitive = false;
@Override
@@ -91,7 +91,7 @@ public class ParseBooleanFieldUpdateProcessorFactory extends FieldMutatingUpdate
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object caseSensitiveParam = args.remove(CASE_SENSITIVE_PARAM);
if (null != caseSensitiveParam) {
if (caseSensitiveParam instanceof Boolean) {
@@ -101,7 +101,6 @@ public class ParseBooleanFieldUpdateProcessorFactory extends FieldMutatingUpdate
}
}
- @SuppressWarnings({"unchecked"})
Collection<String> trueValuesParam = args.removeConfigArgs(TRUE_VALUES_PARAM);
if ( ! trueValuesParam.isEmpty()) {
trueValues.clear();
@@ -110,7 +109,6 @@ public class ParseBooleanFieldUpdateProcessorFactory extends FieldMutatingUpdate
}
}
- @SuppressWarnings({"unchecked"})
Collection<String> falseValuesParam = args.removeConfigArgs(FALSE_VALUES_PARAM);
if ( ! falseValuesParam.isEmpty()) {
falseValues.clear();
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
index b31d429c63b..ebbb458abef 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
@@ -138,7 +138,7 @@ public class ParseDateFieldUpdateProcessorFactory extends FieldMutatingUpdatePro
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Locale locale;
String localeParam = (String)args.remove(LOCALE_PARAM);
@@ -154,7 +154,6 @@ public class ParseDateFieldUpdateProcessorFactory extends FieldMutatingUpdatePro
defaultTimeZone = ZoneId.of(defaultTimeZoneParam.toString());
}
- @SuppressWarnings({"unchecked"})
Collection<String> formatsParam = args.removeConfigArgs(FORMATS_PARAM);
if (null != formatsParam) {
for (String value : formatsParam) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java
index 489970c7ae2..d06dba81cbd 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java
@@ -50,7 +50,7 @@ public abstract class ParseNumericFieldUpdateProcessorFactory extends FieldMutat
protected Locale locale = Locale.ROOT;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
String localeParam = (String)args.remove(LOCALE_PARAM);
if (null != localeParam) {
locale = LocaleUtils.toLocale(localeParam);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
index f4073244762..9ede02d58f6 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
@@ -107,7 +107,7 @@ public class PreAnalyzedUpdateProcessorFactory extends FieldMutatingUpdateProces
private String parserImpl;
@Override
- public void init(@SuppressWarnings({"rawtypes"})final NamedList args) {
+ public void init(final NamedList<?> args) {
parserImpl = (String)args.get("parser");
args.remove("parser");
// initialize inclusion / exclusion patterns
diff --git a/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
index 10220258c1e..c18d4e6b96a 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
@@ -78,7 +78,7 @@ public final class RegexReplaceProcessorFactory extends FieldMutatingUpdateProce
private boolean literalReplacementEnabled = true;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object patternParam = args.remove(PATTERN_PARAM);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java
index 263111d6b78..e9c0ba3042a 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java
@@ -37,7 +37,7 @@ public class RegexpBoostProcessorFactory extends UpdateRequestProcessorFactory {
private final Map<Object, Object> sharedObjectCache = new HashMap<>();
@Override
- public void init(@SuppressWarnings("rawtypes") final NamedList args) {
+ public void init(final NamedList<?> args) {
if (args != null) {
this.params = args.toSolrParams();
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java
index 91585c912b4..edd158bc8d8 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.update.processor;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -47,12 +46,6 @@ import static org.apache.solr.update.processor.FieldValueMutatingUpdateProcessor
*/
public final class RemoveBlankFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- // no trim specific init args
- super.init(args);
- }
-
@Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req,
SolrQueryResponse rsp,
diff --git a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
index 43ed1b949f1..8223e1eaa4b 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
@@ -57,7 +57,7 @@ public class SignatureUpdateProcessorFactory
private SolrParams params;
@Override
- public void init(@SuppressWarnings({"rawtypes"})final NamedList args) {
+ public void init(final NamedList<?> args) {
if (args != null) {
SolrParams params = args.toSolrParams();
boolean enabled = params.getBool("enabled", true);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java
index faf61c21937..6b09dc71e5d 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java
@@ -31,8 +31,7 @@ import org.apache.solr.update.AddUpdateCommand;
*/
public abstract class SimpleUpdateProcessorFactory extends UpdateRequestProcessorFactory {
private String myName; // if classname==XyzUpdateProcessorFactory myName=Xyz
- @SuppressWarnings({"rawtypes"})
- protected NamedList initArgs = new NamedList();
+ protected NamedList<?> initArgs = new NamedList<>();
private static ThreadLocal<SolrQueryRequest> REQ = new ThreadLocal<>();
protected SimpleUpdateProcessorFactory() {
@@ -40,10 +39,9 @@ public abstract class SimpleUpdateProcessorFactory extends UpdateRequestProcesso
}
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
this.initArgs = args;
-
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java
index a9a23f368ff..9d2ecc44093 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java
@@ -97,7 +97,7 @@ public class SkipExistingDocumentsProcessorFactory extends UpdateRequestProcesso
private boolean skipUpdateIfMissing = true;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object tmp = args.remove(PARAM_SKIP_INSERT_IF_EXISTS);
if (null != tmp) {
if (! (tmp instanceof Boolean) ) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessorFactory.java
index fc46ecc55f1..f983c18af93 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessorFactory.java
@@ -93,11 +93,9 @@ public class TolerantUpdateProcessorFactory extends UpdateRequestProcessorFactor
private boolean informed = false;
- @SuppressWarnings("rawtypes")
@Override
- public void init( NamedList args ) {
-
- Object maxErrorsObj = args.get(MAX_ERRORS_PARAM);
+ public void init(NamedList<?> args ) {
+ Object maxErrorsObj = args.get(MAX_ERRORS_PARAM);
if (maxErrorsObj != null) {
try {
defaultMaxErrors = Integer.parseInt(maxErrorsObj.toString());
diff --git a/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java
index 810ef673754..874e55d87c5 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.update.processor;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -44,13 +43,6 @@ import static org.apache.solr.update.processor.FieldValueMutatingUpdateProcessor
* @since 4.0.0
*/
public final class TrimFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
-
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- // no trim specific init args
- super.init(args);
- }
-
@Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req,
SolrQueryResponse rsp,
diff --git a/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java
index 1579eb88313..76fb7af9885 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java
@@ -53,7 +53,7 @@ public final class TruncateFieldUpdateProcessorFactory
private int maxLength = 0;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object lengthParam = args.remove(MAX_LENGTH_PARAM);
if (null == lengthParam) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessorFactory.java
index 418eba31a73..8fa1c193da0 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessorFactory.java
@@ -30,7 +30,7 @@ public class URLClassifyProcessorFactory extends UpdateRequestProcessorFactory {
private SolrParams params;
@Override
- public void init(@SuppressWarnings("rawtypes") final NamedList args) {
+ public void init(final NamedList<?> args) {
if (args != null) {
this.params = args.toSolrParams();
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
index fc3ad147477..f65a0937f39 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
@@ -76,7 +76,7 @@ public class UUIDUpdateProcessorFactory extends UpdateRequestProcessorFactory {
protected String fieldName = null;
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
Object obj = args.remove(FIELD_PARAM);
if (null != obj) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
index 76b9d55359a..0be79b521fe 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
@@ -119,7 +119,6 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitialized
* @see DistributedUpdateProcessorFactory
*/
@Override
- @SuppressWarnings({"rawtypes"})
public void init(PluginInfo info) {
final String infomsg = "updateRequestProcessorChain \"" +
(null != info.name ? info.name : "") + "\"" +
@@ -158,7 +157,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitialized
// by default, add distrib processor immediately before run
DistributedUpdateProcessorFactory distrib
= new DistributedUpdateProcessorFactory();
- distrib.init(new NamedList());
+ distrib.init(new NamedList<>());
list.add(runIndex, distrib);
log.debug("inserting DistributedUpdateProcessorFactory into {}", infomsg);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java
index 7c8fdcc75d8..eecc423599b 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.update.processor;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -40,11 +39,5 @@ public abstract class UpdateRequestProcessorFactory implements NamedListInitiali
*/
public interface RunAlways {}
- @Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args )
- {
- // could process the Node
- }
-
abstract public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next );
}
diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
index da80c859c54..458321deb65 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -323,8 +323,7 @@ public class SolrPluginUtils {
* @return The debug info
* @throws java.io.IOException if there was an IO error
*/
- @SuppressWarnings({"rawtypes"})
- public static NamedList doStandardDebug(
+ public static NamedList<Object> doStandardDebug(
SolrQueryRequest req,
String userQuery,
Query query,
@@ -333,20 +332,19 @@ public class SolrPluginUtils {
boolean dbgResults)
throws IOException
{
- NamedList dbg = new SimpleOrderedMap();
+ NamedList<Object> dbg = new SimpleOrderedMap<>();
doStandardQueryDebug(req, userQuery, query, dbgQuery, dbg);
doStandardResultsDebug(req, query, results, dbgResults, dbg);
return dbg;
}
- @SuppressWarnings({"unchecked"})
public static void doStandardQueryDebug(
SolrQueryRequest req,
String userQuery,
Query query,
boolean dbgQuery,
- @SuppressWarnings({"rawtypes"})NamedList dbg)
+ NamedList<Object> dbg)
{
if (dbgQuery) {
/* userQuery may have been pre-processed .. expose that */
@@ -362,13 +360,12 @@ public class SolrPluginUtils {
}
}
- @SuppressWarnings({"unchecked"})
public static void doStandardResultsDebug(
SolrQueryRequest req,
Query query,
DocList results,
boolean dbgResults,
- @SuppressWarnings({"rawtypes"})NamedList dbg) throws IOException
+ NamedList<Object> dbg) throws IOException
{
if (dbgResults) {
SolrIndexSearcher searcher = req.getSearcher();
@@ -847,7 +844,7 @@ public class SolrPluginUtils {
* {@code resultIds} is. {@code resultIds} comes from {@link ResponseBuilder#resultIds}. If the doc key
* isn't in {@code resultIds} then it is ignored.
* Note: most likely you will call {@link #removeNulls(Map.Entry[], NamedList)} sometime after calling this. */
- public static void copyNamedListIntoArrayByDocPosInResponse(@SuppressWarnings({"rawtypes"})NamedList namedList, Map<Object, ShardDoc> resultIds,
+ public static void copyNamedListIntoArrayByDocPosInResponse(NamedList<Object> namedList, Map<Object, ShardDoc> resultIds,
Map.Entry<String, Object>[] destArr) {
assert resultIds.size() == destArr.length;
for (int i = 0; i < namedList.size(); i++) {
@@ -995,14 +992,14 @@ public class SolrPluginUtils {
return out;
}
- public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs) {
+ public static void invokeSetters(Object bean, Iterable<? extends Map.Entry<String,?>> initArgs) {
invokeSetters(bean, initArgs, false);
}
- public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs, boolean lenient) {
+ public static void invokeSetters(Object bean, Iterable<? extends Map.Entry<String,?>> initArgs, boolean lenient) {
if (initArgs == null) return;
final Class<?> clazz = bean.getClass();
- for (Map.Entry<String,Object> entry : initArgs) {
+ for (Map.Entry<String,?> entry : initArgs) {
String key = entry.getKey();
String setterName = "set" + String.valueOf(Character.toUpperCase(key.charAt(0))) + key.substring(1);
try {
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
index c2b9159174d..4aa19f69c57 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
@@ -145,7 +145,6 @@ public class CircuitBreakerManager implements PluginInfoInitialized {
}
@VisibleForTesting
- @SuppressWarnings({"rawtypes"})
public static CircuitBreaker.CircuitBreakerConfig buildCBConfig(PluginInfo pluginInfo) {
boolean enabled = false;
boolean cpuCBEnabled = false;
@@ -155,7 +154,7 @@ public class CircuitBreakerManager implements PluginInfoInitialized {
if (pluginInfo != null) {
- NamedList args = pluginInfo.initArgs;
+ NamedList<?> args = pluginInfo.initArgs;
enabled = Boolean.parseBoolean(pluginInfo.attributes.getOrDefault("enabled", "false"));
diff --git a/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
index e611b8b33ee..1b3c5917422 100644
--- a/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
+++ b/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
@@ -25,5 +25,13 @@ import org.apache.solr.common.util.NamedList;
* @since solr 1.3
*/
public interface NamedListInitializedPlugin {
- void init( @SuppressWarnings({"rawtypes"})NamedList args );
+ /**
+ * <code>init</code> will be called just once, immediately after creation.
+ *
+ * <p>Source of the initialization arguments will typically be solrconfig.xml,
+ * but will ultimately depends on the plugin itself
+ *
+ * @param args non-null list of initialization parameters (may be empty)
+ */
+ default void init(NamedList<?> args) {}
}
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 60e160789b4..0207e13cef2 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -452,7 +452,6 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testRequestHandlerBaseException() {
final String tmp = "BOO! ignore_exception";
SolrRequestHandler handler = new RequestHandlerBase() {
@@ -464,7 +463,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
throw new RuntimeException(tmp);
}
};
- handler.init(new NamedList());
+ handler.init(new NamedList<>());
SolrQueryResponse rsp = new SolrQueryResponse();
SolrQueryRequest req = req();
h.getCore().execute(handler,
diff --git a/solr/core/src/test/org/apache/solr/OutputWriterTest.java b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
index 888480b7cd1..ff88fe03017 100644
--- a/solr/core/src/test/org/apache/solr/OutputWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.Writer;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.PluginBag;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter;
@@ -88,9 +87,6 @@ public class OutputWriterTest extends SolrTestCaseJ4 {
public UselessOutputWriter() {}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList n) {}
-
@Override
public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response)
throws IOException {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
index 247313e5bb4..439ca2a5236 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
@@ -32,7 +32,6 @@ import org.apache.solr.common.cloud.CollectionStatePredicate;
import org.apache.solr.common.cloud.CollectionStateWatcher;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.search.SolrIndexSearcher;
@@ -310,10 +309,6 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
}
public static class SleepingSolrEventListener implements SolrEventListener {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- // No-Op
- }
@Override
public void postCommit() {
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
index a3adcf3f0db..d9834e416ab 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java
@@ -115,28 +115,24 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
assertNull(clusterState.getCollectionOrNull(collectionName));
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private void testModifyCollection() throws Exception {
try (CloudSolrClient client = createCloudClient(null)) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.MODIFYCOLLECTION.toString());
params.set("collection", COLLECTION_NAME);
params.set("replicationFactor", 25);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
client.request(request);
NamedList<Object> rsp = CollectionAdminRequest.getClusterStatus().setCollectionName(COLLECTION_NAME)
.process(client).getResponse();
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertEquals(1, collections.size());
- Map<String, Object> collection = (Map<String, Object>) collections.get(COLLECTION_NAME);
- int replicationFactor = Integer.parseInt(collection.get("replicationFactor").toString());
- assertEquals(25, replicationFactor);
+ assertEquals("25", collections._getStr(List.of(COLLECTION_NAME, "replicationFactor"), null));
params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.MODIFYCOLLECTION.toString());
@@ -150,13 +146,12 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
rsp = CollectionAdminRequest.getClusterStatus().setCollectionName(COLLECTION_NAME)
.process(client).getResponse();
System.out.println(rsp);
- cluster = (NamedList<Object>) rsp.get("cluster");
+ cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- collections = (NamedList<Object>) cluster.get("collections");
+ collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertEquals(1, collections.size());
- collection = (Map<String, Object>) collections.get(COLLECTION_NAME);
- assertNull(collection.get("replicationFactor"));
+ assertNull(collections._getStr(List.of(COLLECTION_NAME, "replicationFactor"), null));
params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.MODIFYCOLLECTION.toString());
@@ -184,8 +179,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("numShards", "1");
params.set("replicationFactor", "1");
params.set("nrtReplicas", "2");
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
try {
@@ -232,8 +226,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("numShards", "1");
params.set("replicationFactor", "1");
params.set("collection.configName", configSet);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
client.request(request);
@@ -247,12 +240,10 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
client.getZkStateReader().forciblyRefreshAllClusterStateSlow();
final CollectionAdminRequest.ClusterStatus req = CollectionAdminRequest.getClusterStatus();
- NamedList<Object> rsp = client.request(req);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> rsp = client.request(req);
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertNotNull("Testing to insure collections are returned", collections.get(COLLECTION_NAME1));
}
@@ -274,11 +265,9 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertEquals(1, collections.size());
@SuppressWarnings({"unchecked"})
@@ -294,16 +283,13 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
params.set("collection", COLLECTION_NAME);
params.set("shard", SHARD1);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertNotNull(collections.get(COLLECTION_NAME));
assertEquals(1, collections.size());
@@ -326,11 +312,9 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
request.setShardName(SHARD1 + "," + SHARD2);
NamedList<Object> rsp = request.process(client).getResponse();
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertNotNull(collections.get(COLLECTION_NAME));
assertEquals(1, collections.size());
@@ -354,7 +338,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
final CollectionAdminRequest.ClusterStatus request = new CollectionAdminRequest.ClusterStatus();
request.setCollectionName(COLLECTION_NAME);
NamedList<Object> rsp = request.process(client).getResponse();
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
Map<String, Object> collection = (Map<String, Object>) Utils.getObjectByPath(cluster, false, "collections/" + COLLECTION_NAME);
assertEquals("collection health", "GREEN", collection.get("health"));
@@ -411,13 +395,11 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
try (CloudSolrClient client = createCloudClient(null)) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.LIST.toString());
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- List<String> collections = (List<String>) rsp.get("collections");
+ List<?> collections = (List<?>) rsp.get("collections");
assertTrue("control_collection was not found in list", collections.contains("control_collection"));
assertTrue(DEFAULT_COLLECTION + " was not found in list", collections.contains(DEFAULT_COLLECTION));
assertTrue(COLLECTION_NAME + " was not found in list", collections.contains(COLLECTION_NAME));
@@ -431,22 +413,18 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
try (CloudSolrClient client = createCloudClient(null)) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertNotNull(collections.get(COLLECTION_NAME1));
assertEquals(4, collections.size());
- @SuppressWarnings({"unchecked"})
- List<String> liveNodes = (List<String>) cluster.get("live_nodes");
+ List<?> liveNodes = (List<?>) cluster.get("live_nodes");
assertNotNull("Live nodes should not be null", liveNodes);
assertFalse(liveNodes.isEmpty());
}
@@ -458,16 +436,13 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
params.set("collection", COLLECTION_NAME);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
+ NamedList<?> collections = (NamedList<?>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
assertEquals(1, collections.size());
@SuppressWarnings({"unchecked"})
@@ -488,8 +463,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
params.set("collection", cname);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
@@ -547,8 +521,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
params.set("collection", DEFAULT_COLLECTION);
params.set(ShardParams._ROUTE_, "a!");
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
@@ -580,8 +553,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("action", CollectionParams.CollectionAction.CREATEALIAS.toString());
params.set("name", "myalias");
params.set("collections", DEFAULT_COLLECTION + "," + COLLECTION_NAME);
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
client.request(request);
@@ -653,8 +625,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
params.set("action", CollectionParams.CollectionAction.ADDROLE.toString());
params.set("node", replica.getNodeName());
params.set("role", "overseer");
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
client.request(request);
@@ -665,14 +636,12 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
request.setPath("/admin/collections");
NamedList<Object> rsp = client.request(request);
- @SuppressWarnings({"unchecked"})
- NamedList<Object> cluster = (NamedList<Object>) rsp.get("cluster");
+ NamedList<?> cluster = (NamedList<?>) rsp.get("cluster");
assertNotNull("Cluster state should not be null", cluster);
@SuppressWarnings({"unchecked"})
Map<String, Object> roles = (Map<String, Object>) cluster.get("roles");
assertNotNull("Role information should not be null", roles);
- @SuppressWarnings({"unchecked"})
- List<String> overseer = (List<String>) roles.get("overseer");
+ List<?> overseer = (List<?>) roles.get("overseer");
assertNotNull(overseer);
assertEquals(1, overseer.size());
assertTrue(overseer.contains(replica.getNodeName()));
@@ -684,8 +653,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());
params.set("collection", "bad_collection_name");
- @SuppressWarnings({"rawtypes"})
- SolrRequest request = new QueryRequest(params);
+ QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
try {
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
index c033e736b4a..7d60a0dbf75 100644
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
@@ -57,14 +57,13 @@ public class DirectoryFactoriesTest extends SolrTestCaseJ4 {
}
}
- @SuppressWarnings({"rawtypes"})
private void testExistsBehavior(Class<? extends DirectoryFactory> clazz) throws Exception {
final String path = createTempDir().toString() + "/" + clazz + "_somedir";
DirectoryFactory dirFac = null;
try {
dirFac = clazz.getConstructor().newInstance();
dirFac.initCoreContainer(null); // greybox testing directly against path
- dirFac.init(new NamedList());
+ dirFac.init(new NamedList<>());
assertFalse(path + " should not exist yet", dirFac.exists(path));
Directory dir = dirFac.get(path, DirectoryFactory.DirContext.DEFAULT,
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 14f1a1ee85d..3e4fb304c08 100644
--- a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
+++ b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
@@ -29,11 +29,10 @@ import org.apache.solr.search.ValueSourceParser;
*
**/
public class DummyValueSourceParser extends ValueSourceParser {
- @SuppressWarnings({"rawtypes"})
- private NamedList args;
+ private NamedList<?> args;
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
this.args = args;
}
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 8e5638f3e25..577beeff7fb 100644
--- a/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java
+++ b/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java
@@ -32,9 +32,8 @@ public class FakeDeletionPolicy extends IndexDeletionPolicy implements NamedList
private String var1;
private String var2;
- //@Override
@Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
var1 = (String) args.get("var1");
var2 = (String) args.get("var2");
}
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 5b0422e6f20..62b849487f1 100644
--- a/solr/core/src/test/org/apache/solr/core/MockEventListener.java
+++ b/solr/core/src/test/org/apache/solr/core/MockEventListener.java
@@ -17,7 +17,6 @@
package org.apache.solr.core;
import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.common.util.NamedList;
import java.util.concurrent.atomic.AtomicInteger;
@@ -33,11 +32,6 @@ public class MockEventListener implements SolrEventListener {
createCounter.incrementAndGet();
}
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- /* NOOP */
- }
-
@Override
public void postCommit() {
/* 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 3dcf68f0bbd..1dcad73c260 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(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
initCounter.incrementAndGet();
super.init(args);
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
index cd86d4fdc98..b3bd625c791 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
@@ -173,9 +173,7 @@ public class TestCodecSupport extends SolrTestCaseJ4 {
final SchemaCodecFactory factory1 = new SchemaCodecFactory();
final NamedList<String> nl = new NamedList<>();
nl.add(SchemaCodecFactory.COMPRESSION_MODE, "something_that_doesnt_exist");
- thrown = expectThrows(SolrException.class, () -> {
- factory1.init(nl);
- });
+ thrown = expectThrows(SolrException.class, () -> factory1.init(nl));
assertEquals(SolrException.ErrorCode.SERVER_ERROR.code, thrown.code());
assertTrue("Unexpected Exception message: " + thrown.getMessage(),
thrown.getMessage().contains("Invalid compressionMode: 'something_that_doesnt_exist'"));
@@ -183,9 +181,7 @@ public class TestCodecSupport extends SolrTestCaseJ4 {
final SchemaCodecFactory factory2 = new SchemaCodecFactory();
final NamedList<String> nl2 = new NamedList<>();
nl2.add(SchemaCodecFactory.COMPRESSION_MODE, "");
- thrown = expectThrows(SolrException.class, () -> {
- factory2.init(nl2);
- });
+ thrown = expectThrows(SolrException.class, () -> factory2.init(nl2));
assertEquals(SolrException.ErrorCode.SERVER_ERROR.code, thrown.code());
assertTrue("Unexpected Exception message: " + thrown.getMessage(),
thrown.getMessage().contains("Invalid compressionMode: ''"));
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 093bed6065f..8fe953e3649 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java
@@ -69,17 +69,14 @@ public class TestConfigSetProperties extends SolrTestCaseJ4 {
@Test
public void testMultipleProps() throws Exception {
- @SuppressWarnings({"rawtypes"})
- Map map = ImmutableMap.of("immutable", "true", "someOtherProp", "true");
- @SuppressWarnings({"rawtypes"})
- NamedList list = createConfigSetProps(Utils.toJSONString(map));
+ Map<String, String> map = Map.of("immutable", "true", "someOtherProp", "true");
+ 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 {
+ private NamedList<Object> createConfigSetProps(String props) throws Exception {
Path testDirectory = createTempDir();
String filename = "configsetprops.json";
if (props != null) {
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 b8ef93f6392..44aa8078093 100644
--- a/solr/core/src/test/org/apache/solr/core/TestInitParams.java
+++ b/solr/core/src/test/org/apache/solr/core/TestInitParams.java
@@ -40,23 +40,20 @@ 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);
+ NamedList<?> nl = (NamedList<?>) rsp.getValues().get("initArgs");
+ NamedList<?> def = (NamedList<?>) nl.get(PluginInfo.DEFAULTS);
assertEquals("A", def.get("a"));
- def = (NamedList) nl.get(PluginInfo.INVARIANTS);
+ def = (NamedList<?>) nl.get(PluginInfo.INVARIANTS);
assertEquals("B", def.get("b"));
- def = (NamedList) nl.get(PluginInfo.APPENDS);
+ def = (NamedList<?>) nl.get(PluginInfo.APPENDS);
assertEquals("C", def.get("c"));
}
InitParams initParams = h.getCore().getSolrConfig().getInitParams().get("a");
- @SuppressWarnings({"unchecked", "rawtypes"})
PluginInfo pluginInfo = new PluginInfo("requestHandler",
new HashMap<>(),
- new NamedList<>(singletonMap("defaults", new NamedList(singletonMap("a", "A1")))), null);
+ new NamedList<>(singletonMap("defaults", new NamedList<>(singletonMap("a", "A1")))), null);
initParams.apply(pluginInfo);
assertEquals( "A",initParams.defaults.get("a"));
}
@@ -66,15 +63,13 @@ 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);
+ NamedList<?> nl = (NamedList<?>) rsp.getValues().get("initArgs");
+ NamedList<?> def = (NamedList<?>) nl.get(PluginInfo.DEFAULTS);
assertEquals("A", def.get("a"));
assertEquals("P", def.get("p"));
- def = (NamedList) nl.get(PluginInfo.INVARIANTS);
+ def = (NamedList<?>) nl.get(PluginInfo.INVARIANTS);
assertEquals("B", def.get("b"));
- def = (NamedList) nl.get(PluginInfo.APPENDS);
+ def = (NamedList<?>) nl.get(PluginInfo.APPENDS);
assertEquals("C", def.get("c"));
}
@@ -85,14 +80,12 @@ 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);
+ NamedList<?> nl = (NamedList<?>) rsp.getValues().get("initArgs");
+ NamedList<?> def = (NamedList<?>) nl.get(PluginInfo.DEFAULTS);
assertEquals("A1" ,def.get("a"));
- def = (NamedList) nl.get(PluginInfo.INVARIANTS);
+ def = (NamedList<?>) nl.get(PluginInfo.INVARIANTS);
assertEquals("B1" ,def.get("b"));
- def = (NamedList) nl.get(PluginInfo.APPENDS);
+ def = (NamedList<?>) nl.get(PluginInfo.APPENDS);
assertEquals(Arrays.asList("C1","C") ,def.getAll("c"));
}
@@ -107,10 +100,8 @@ 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);
+ NamedList<?> nl = (NamedList<?>) rsp.getValues().get("initArgs");
+ NamedList<?> def = (NamedList<?>) nl.get(PluginInfo.DEFAULTS);
assertEquals("text" ,def.get("df"));
}
@@ -119,8 +110,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");
+ NamedList<?> nl = (NamedList<?>) rsp.getValues().get("initArgs");
assertEquals("server-enabled.txt", nl.get("healthcheckFile"));
}
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 f1910542d0e..95c8d417d67 100644
--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
@@ -42,7 +42,6 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testRequestParams() throws Exception {
SolrInputDocument doc = new SolrInputDocument();
doc.addField("id", "1");
@@ -55,7 +54,7 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {
BufferingRequestProcessor p = new BufferingRequestProcessor(null);
SolrQueryResponse rsp = new SolrQueryResponse();
try (SolrQueryRequest req = req(); UpdateRequestHandler handler = new UpdateRequestHandler()) {
- handler.init(new NamedList());
+ handler.init(new NamedList<>());
ContentStreamLoader csl = handler.newLoader(req, p);
RequestWriter.ContentWriter cw = brw.getContentWriter(ureq);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
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 6d98bb4cdc7..036f277ad27 100644
--- a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
@@ -55,11 +55,10 @@ public class DocumentAnalysisRequestHandlerTest extends AnalysisRequestHandlerTe
@Override
@Before
- @SuppressWarnings({"rawtypes"})
public void setUp() throws Exception {
super.setUp();
handler = new DocumentAnalysisRequestHandler();
- handler.init(new NamedList());
+ handler.init(new NamedList<>());
}
/**
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 9d196cf50ad..eb9db262ce8 100644
--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
@@ -51,7 +51,6 @@ 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);
@@ -65,20 +64,18 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
if (healthcheckFile.exists()) FileUtils.forceDelete(healthcheckFile);
handler = new PingRequestHandler();
- @SuppressWarnings({"rawtypes"})
- NamedList initParams = new NamedList();
+ NamedList<String> initParams = new NamedList<>();
initParams.add(PingRequestHandler.HEALTHCHECK_FILE_PARAM,
fileNameParam);
handler.init(initParams);
handler.inform(h.getCore());
}
- @SuppressWarnings({"rawtypes"})
public void testPingWithNoHealthCheck() throws Exception {
// for this test, we don't want any healthcheck file configured at all
handler = new PingRequestHandler();
- handler.init(new NamedList());
+ handler.init(new NamedList<>());
handler.inform(h.getCore());
SolrQueryResponse rsp = null;
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 859fc3a1839..ffca65f1975 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -212,8 +212,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
return s.add(doc).getStatus();
}
- @SuppressWarnings({"rawtypes"})
- NamedList query(String query, SolrClient s) throws SolrServerException, IOException {
+ NamedList<Object> query(String query, SolrClient s) throws SolrServerException, IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.add("q", query);
@@ -224,10 +223,9 @@ 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 {
+ private NamedList<Object> rQuery(int expectedDocCount, String query, SolrClient client) throws Exception {
int timeSlept = 0;
- NamedList res = query(query, client);
+ NamedList<Object> res = query(query, client);
while (expectedDocCount != numFound(res)
&& timeSlept < 30000) {
log.info("Waiting for {} docs", expectedDocCount);
@@ -241,7 +239,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
return res;
}
- private long numFound(@SuppressWarnings({"rawtypes"})NamedList res) {
+ private long numFound(NamedList<Object> res) {
return ((SolrDocumentList) res.get("response")).getNumFound();
}
@@ -573,20 +571,18 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, numFound(leaderQueryRsp));
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, numFound(followerQueryRsp));
//compare results
String cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
assertVersions(leaderClient, followerClient);
@@ -652,20 +648,18 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, numFound(leaderQueryRsp));
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, numFound(followerQueryRsp));
//compare results
String cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
// start stop polling test
invokeReplicationCommand(followerJetty.getLocalPort(), "disablepoll");
@@ -716,20 +710,18 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, numFound(leaderQueryRsp));
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, numFound(followerQueryRsp));
//compare results
String cmp = BaseDistributedSearchTestCase.compare(leaderQueryResult, followerQueryResult, 0, null);
- assertEquals(null, cmp);
+ assertNull(cmp);
String timesReplicatedString = getFollowerDetails("timesIndexReplicated");
String timesFailed;
@@ -850,8 +842,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, leaderQueryResult.getNumFound());
@@ -868,8 +859,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
stream.close();
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, followerQueryResult.getNumFound());
//compare results
@@ -1015,8 +1005,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
totalDocs += docs;
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(totalDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(totalDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp
.get("response");
assertEquals(totalDocs, leaderQueryResult.getNumFound());
@@ -1029,8 +1018,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
}
// get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(totalDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(totalDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp
.get("response");
assertEquals(totalDocs, followerQueryResult.getNumFound());
@@ -1284,8 +1272,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, leaderQueryResult.getNumFound());
@@ -1299,8 +1286,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
followerClient = createNewSolrClient(followerJetty.getLocalPort());
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, followerQueryResult.getNumFound());
@@ -1346,8 +1332,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// leaderClient = createNewSolrClient(leaderJetty.getLocalPort());
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp
.get("response");
assertEquals(nDocs, leaderQueryResult.getNumFound());
@@ -1361,8 +1346,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
followerClient = createNewSolrClient(followerJetty.getLocalPort());
// get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp
.get("response");
assertEquals(nDocs, followerQueryResult.getNumFound());
@@ -1401,8 +1385,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(docs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(docs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(docs, leaderQueryResult.getNumFound());
@@ -1415,8 +1398,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
followerClient = createNewSolrClient(followerJetty.getLocalPort());
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(docs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(docs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(docs, followerQueryResult.getNumFound());
@@ -1435,8 +1417,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList resp = rQuery(docs + 2, "*:*", leaderClient);
+ NamedList<Object> resp = rQuery(docs + 2, "*:*", leaderClient);
leaderQueryResult = (SolrDocumentList) resp.get("response");
assertEquals(docs + 2, leaderQueryResult.getNumFound());
@@ -1458,14 +1439,12 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
leaderClient.commit();
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
+ NamedList<Object> leaderQueryRsp = rQuery(nDocs, "*:*", leaderClient);
SolrDocumentList leaderQueryResult = (SolrDocumentList) leaderQueryRsp.get("response");
assertEquals(nDocs, leaderQueryResult.getNumFound());
//get docs from follower and check if number is equal to leader
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(nDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(nDocs, followerQueryResult.getNumFound());
@@ -1521,13 +1500,11 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
// wait for follower to reload core by watching updated startTime
watchCoreStartAt(followerClient, 30*1000, followerStartTime);
- @SuppressWarnings({"rawtypes"})
- NamedList leaderQueryRsp2 = rQuery(1, "id:2000", leaderClient);
+ NamedList<Object> leaderQueryRsp2 = rQuery(1, "id:2000", leaderClient);
SolrDocumentList leaderQueryResult2 = (SolrDocumentList) leaderQueryRsp2.get("response");
assertEquals(1, leaderQueryResult2.getNumFound());
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp2 = rQuery(1, "id:2000", followerClient);
+ NamedList<Object> followerQueryRsp2 = rQuery(1, "id:2000", followerClient);
SolrDocumentList followerQueryResult2 = (SolrDocumentList) followerQueryRsp2.get("response");
assertEquals(1, followerQueryResult2.getNumFound());
@@ -1596,8 +1573,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
new Thread(new AddExtraDocs(leaderClient, totalDocs)).start();
//Wait and make sure that it actually replicated correctly.
- @SuppressWarnings({"rawtypes"})
- NamedList followerQueryRsp = rQuery(totalDocs, "*:*", followerClient);
+ NamedList<Object> followerQueryRsp = rQuery(totalDocs, "*:*", followerClient);
SolrDocumentList followerQueryResult = (SolrDocumentList) followerQueryRsp.get("response");
assertEquals(totalDocs, followerQueryResult.getNumFound());
@@ -1821,6 +1797,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
* @param min the startTime value must exceed this value before the method will return, if null this method will return the first startTime value encountered.
* @return the startTime value of collection
*/
+ @SuppressWarnings("unchecked")
private Date watchCoreStartAt(SolrClient client, final long timeout,
final Date min) throws InterruptedException, IOException, SolrServerException {
final long sleepInterval = 200;
@@ -1832,12 +1809,11 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
QueryRequest req = new QueryRequest(p);
req.setPath("/admin/cores");
try {
- @SuppressWarnings({"rawtypes"})
- NamedList data = adminClient.request(req);
+ NamedList<Object> data = adminClient.request(req);
for (String k : new String[]{"status", "collection1"}) {
Object o = data.get(k);
assertNotNull("core status rsp missing key: " + k, o);
- data = (NamedList) o;
+ data = (NamedList<Object>) o;
}
Date startTime = (Date) data.get("startTime");
assertNotNull("core has null startTime", startTime);
@@ -1859,7 +1835,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
}
}
- private void assertReplicationResponseSucceeded(@SuppressWarnings({"rawtypes"})NamedList response) {
+ private void assertReplicationResponseSucceeded(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/ThrowErrorOnInitRequestHandler.java b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java
index 804453ffb53..39c758eeec6 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(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(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/component/CustomHighlightComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
index 3c4f5619650..8bc537b60a1 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
@@ -50,12 +50,10 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
@Override
@SuppressWarnings({"unchecked"})
- protected Object convertHighlights(@SuppressWarnings({"rawtypes"})NamedList hl) {
- @SuppressWarnings({"rawtypes"})
- final ArrayList<SimpleOrderedMap> hlMaps = new ArrayList<>();
+ protected Object convertHighlights(NamedList<Object> hl) {
+ final ArrayList<SimpleOrderedMap<Object>> hlMaps = new ArrayList<>();
for (int i=0; i<hl.size(); ++i) {
- @SuppressWarnings({"rawtypes"})
- SimpleOrderedMap hlMap = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> hlMap = new SimpleOrderedMap<>();
hlMap.add(id_key, hl.getName(i));
hlMap.add(snippets_key, hl.getVal(i));
hlMaps.add(hlMap);
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 492a58bdf1a..2dcdaf2ed46 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
@@ -156,10 +156,9 @@ 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<NamedList<Object>> mTagsList = (List<NamedList<Object>>) rspValues.get("tags");
List<TestTag> aTags = new ArrayList<>();
- for (@SuppressWarnings({"rawtypes"})NamedList map : mTagsList) {
+ for (NamedList<Object> map : mTagsList) {
List<String> foundIds = (List<String>) map.get("ids");
for (String id : foundIds) {
aTags.add(new TestTag(
@@ -206,8 +205,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
fail(message+": didn't expect "+actualsRemaining.first()+" (of "+actualsRemaining.size()+"); "+ error);
}
- @SuppressWarnings({"rawtypes"})
- class TestTag implements Comparable {
+ class TestTag implements Comparable<TestTag> {
final int startOffset, endOffset;
final String substring;
final String docName;
@@ -244,8 +242,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
}
@Override
- public int compareTo(Object o) {
- TestTag that = (TestTag) o;
+ public int compareTo(TestTag that) {
return new CompareToBuilder()
.append(this.startOffset, that.startOffset)
.append(this.endOffset, that.endOffset)
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 91ec61834b7..916afbf3906 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
@@ -239,7 +239,6 @@ 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);
@@ -250,8 +249,7 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 {
if (registry != null) {
attrs.put("registry", registry);
}
- @SuppressWarnings({"rawtypes"})
- NamedList initArgs = new NamedList();
+ NamedList<String> initArgs = new NamedList<>();
initArgs.add("configurable", "true");
return new PluginInfo("SolrMetricReporter", attrs, initArgs, null);
}
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 75986c04201..79c350267ea 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
@@ -189,11 +189,9 @@ 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>();
+ NamedList<String> initArgs = new NamedList<>();
if (null != baseWriter) {
initArgs.add("base", baseWriter);
}
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 e2d87373051..bd21cda3fb0 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java
@@ -171,7 +171,6 @@ public class TestManagedSchemaThreadSafety extends SolrTestCaseJ4 {
return zkController;
}
- @SuppressWarnings({"rawtypes"})
private Runnable indexSchemaLoader(String configsetName, final ZkController zkController) {
return () -> {
try {
@@ -179,7 +178,7 @@ public class TestManagedSchemaThreadSafety extends SolrTestCaseJ4 {
SolrConfig solrConfig = SolrConfig.readFromResourceLoader(loader, "solrconfig.xml", true, null);
ManagedIndexSchemaFactory factory = new ManagedIndexSchemaFactory();
- factory.init(new NamedList());
+ factory.init(new NamedList<>());
factory.create("schema.xml", solrConfig, null);
}
catch (Exception e) {
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 e401f3c7e19..320836ce1cb 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(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(NamedList<?> args) {
super.init(args);
testParam = (String) args.get("testParam");
}
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 a6c3a0e969b..420f861171f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
+++ b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
@@ -37,7 +37,6 @@ import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
@@ -438,9 +437,6 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
static AtomicInteger numberOfTimesCalled;
static AtomicInteger numberOfTimesCalledFirstSearcher;
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
@Override
public void postCommit() {}
@@ -462,9 +458,6 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {
static AtomicInteger numberOfTimesCalled;
static CountDownLatch latch;
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
@Override
public void postCommit() {}
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 87fce2a766f..aefb6cd2686 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
@@ -24,7 +24,6 @@ import java.util.function.IntFunction;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.search.DocSet;
import org.apache.solr.search.FunctionQParser;
@@ -48,10 +47,6 @@ class DebugAgg extends AggValueSource {
}
throw new RuntimeException("No idea what to do with " + what);
}
-
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
}
/**
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 4460642e036..c67c9d3c01c 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
@@ -476,8 +476,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
QueryResponse rsp = null;
// JSON Facets not (currently) available from QueryResponse...
- @SuppressWarnings({"rawtypes"})
- NamedList topNamedList = null;
+ NamedList<Object> topNamedList = null;
try {
rsp = (new QueryRequest(initParams)).process(getRandClient(random()));
assertNotNull(initParams + " is null rsp?", rsp);
@@ -488,8 +487,8 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
e.getMessage(), e);
}
try {
- @SuppressWarnings({"rawtypes"})
- final NamedList facetResponse = (NamedList) topNamedList.get("facets");
+ @SuppressWarnings("unchecked")
+ final NamedList<Object> facetResponse = (NamedList<Object>) topNamedList.get("facets");
assertNotNull("null facet results?", facetResponse);
assertEquals("numFound mismatch with top count?",
rsp.getResults().getNumFound(), ((Number)facetResponse.get("count")).longValue());
@@ -512,16 +511,16 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
private void assertFacetCountsAreCorrect(final AtomicInteger maxBucketsToCheck,
final Map<String,TermFacet> expected,
final SolrParams baseParams,
- @SuppressWarnings({"rawtypes"})final NamedList actualFacetResponse) throws SolrServerException, IOException {
+ final NamedList<Object> 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);
+ @SuppressWarnings("unchecked")
+ final NamedList<Object> results = (NamedList<Object>) actualFacetResponse.get(facetKey);
assertNotNull(facetKey + " key missing from: " + actualFacetResponse, results);
- @SuppressWarnings({"unchecked", "rawtypes"})
- final List<NamedList> buckets = (List<NamedList>) results.get("buckets");
+ @SuppressWarnings({"unchecked"})
+ final List<NamedList<Object>> buckets = (List<NamedList<Object>>) results.get("buckets");
assertNotNull(facetKey + " has null buckets: " + actualFacetResponse, buckets);
if (buckets.isEmpty()) {
@@ -532,7 +531,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
0, docsWithField);
}
- for (@SuppressWarnings({"rawtypes"})NamedList bucket : buckets) {
+ for (NamedList<Object> 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 f0c3d5613bb..6f245192605 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,8 +371,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
QueryResponse rsp = null;
// JSON Facets not (currently) available from QueryResponse...
- @SuppressWarnings({"rawtypes"})
- NamedList topNamedList = null;
+ NamedList<Object> topNamedList = null;
try {
rsp = (new QueryRequest(initParams)).process(getRandClient(random()));
assertNotNull(initParams + " is null rsp?", rsp);
@@ -383,8 +382,8 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
e.getMessage(), e);
}
try {
- @SuppressWarnings({"rawtypes"})
- final NamedList facetResponse = (NamedList) topNamedList.get("facets");
+ @SuppressWarnings("unchecked")
+ final NamedList<Object> facetResponse = (NamedList<Object>) topNamedList.get("facets");
assertNotNull("null facet results?", facetResponse);
assertEquals("numFound mismatch with top count?",
rsp.getResults().getNumFound(), ((Number)facetResponse.get("count")).longValue());
@@ -410,14 +409,13 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
private void assertFacetSKGsAreCorrect(final AtomicInteger maxBucketsToCheck,
final Map<String,TermFacet> expected,
final SolrParams baseParams,
- @SuppressWarnings({"rawtypes"})final NamedList actualFacetResponse) throws SolrServerException, IOException {
+ final NamedList<Object> 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);
+ final NamedList<Object> results = (NamedList<Object>) actualFacetResponse.get(facetKey);
assertNotNull(facetKey + " key missing from: " + actualFacetResponse, results);
if (null != results.get("allBuckets")) {
@@ -426,10 +424,9 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
// 'skg' key must not exist in th allBuckets bucket
assertEquals(facetKey + " has skg in allBuckets: " + results.get("allBuckets"),
Collections.emptyList(),
- ((NamedList)results.get("allBuckets")).getAll("skg"));
+ ((NamedList<Object>)results.get("allBuckets")).getAll("skg"));
}
- @SuppressWarnings({"rawtypes"})
- final List<NamedList> buckets = (List<NamedList>) results.get("buckets");
+ final List<NamedList<Object>> buckets = (List<NamedList<Object>>) results.get("buckets");
assertNotNull(facetKey + " has null buckets: " + actualFacetResponse, buckets);
if (buckets.isEmpty()) {
@@ -446,7 +443,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 (@SuppressWarnings({"rawtypes"})NamedList bucket : buckets) {
+ for (NamedList<Object> bucket : buckets) {
final String fieldVal = bucket.get("val").toString(); // int or stringified int
verifySKGResults(facetKey, facet, baseParams, fieldVal, bucket);
@@ -466,8 +463,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());
+ final LinkedHashSet<String> expectedKeys = new LinkedHashSet<>(expected.keySet());
expectedKeys.add("count");
if (0 <= actualFacetResponse.indexOf("val",0)) {
expectedKeys.add("val");
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 e9d94532342..e3bd6a817d1 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(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(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/security/BaseTestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
index d975caa0075..ff36661b79d 100644
--- a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java
@@ -498,8 +498,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {
parsedCommands = CommandOperation.parse(new StringReader(cmds));
Map<String, Object> edited = plugin.edit(conf, parsedCommands);
if(edited!= null) conf = edited;
- @SuppressWarnings({"rawtypes"})
- List<Map> maps = captureErrors(parsedCommands);
+ List<Map<String,Object>> maps = captureErrors(parsedCommands);
if(failOnError){
assertTrue("unexpected error ,"+maps , maps.isEmpty());
} else {
diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
index 972f00b3751..99d424d55b7 100644
--- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
* Simple tests for {@link DirectSolrSpellChecker}
*/
@SuppressTempFileChecks(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
-@SuppressWarnings({"rawtypes"})
public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 {
private static SpellingQueryConverter queryConverter;
@@ -48,15 +47,13 @@ public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 {
assertNull(h.validateUpdate(adoc("id", "4", "teststop", "another foo")));
assertNull(h.validateUpdate(commit()));
queryConverter = new SimpleQueryConverter();
- queryConverter.init(new NamedList());
+ queryConverter.init(new NamedList<>());
}
@Test
- @SuppressWarnings({"unchecked"})
public void test() throws Exception {
DirectSolrSpellChecker checker = new DirectSolrSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", DirectSolrSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.FIELD, "teststop");
spellchecker.add(DirectSolrSpellChecker.MINQUERYLENGTH, 2); // we will try "fob"
diff --git a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
index 8fd0b4b903e..a79ec84f1d3 100644
--- a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
@@ -39,7 +39,6 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
private static SpellingQueryConverter queryConverter;
@BeforeClass
- @SuppressWarnings({"rawtypes"})
public static void beforeClass() throws Exception {
initCore("solrconfig.xml","schema.xml");
//Index something with a title
@@ -49,7 +48,7 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
assertNull(h.validateUpdate(adoc("id", "3", "teststop", "solr foo")));
assertNull(h.validateUpdate(commit()));
queryConverter = new SimpleQueryConverter();
- queryConverter.init(new NamedList());
+ queryConverter.init(new NamedList<>());
}
@AfterClass
@@ -58,11 +57,9 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void test() throws Exception {
FileBasedSpellChecker checker = new FileBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
@@ -97,11 +94,9 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testFieldType() throws Exception {
FileBasedSpellChecker checker = new FileBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
spellchecker.add(AbstractLuceneSpellChecker.LOCATION, "spellings.txt");
@@ -111,7 +106,6 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(SolrSpellChecker.FIELD_TYPE, "teststop");
- spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
assertTrue(dictName + " is not equal to " + "external", dictName.equals("external") == true);
@@ -143,11 +137,9 @@ public class FileBasedSpellCheckerTest extends SolrTestCaseJ4 {
* No indexDir location set
*/
@Test
- @SuppressWarnings({"unchecked"})
public void testRAMDirectory() throws Exception {
FileBasedSpellChecker checker = new FileBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
diff --git a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
index 1e6a864479d..c3d0042c910 100644
--- a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
@@ -101,12 +101,10 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testSpelling() throws Exception {
IndexBasedSpellChecker checker = new IndexBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
File indexDir = createTempDir().toFile();
@@ -177,11 +175,9 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testExtendedResults() throws Exception {
IndexBasedSpellChecker checker = new IndexBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
File indexDir = createTempDir().toFile();
@@ -233,11 +229,9 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testAlternateDistance() throws Exception {
TestSpellChecker checker = new TestSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
File indexDir = createTempDir().toFile();
@@ -262,7 +256,6 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void testAlternateLocation() throws Exception {
String[] ALT_DOCS = new String[]{
"jumpin jack flash",
@@ -275,8 +268,7 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
};
IndexBasedSpellChecker checker = new IndexBasedSpellChecker();
- @SuppressWarnings({"rawtypes"})
- NamedList spellchecker = new NamedList();
+ NamedList<Object> spellchecker = new NamedList<>();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
File tmpDir = createTempDir().toFile();
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
index d86f7c9156d..2c9ae4cf5e3 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
@@ -35,10 +35,9 @@ import org.junit.Test;
public class SpellingQueryConverterTest extends SolrTestCase {
@Test
- @SuppressWarnings({"rawtypes"})
public void test() throws Exception {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
Collection<Token> tokens = converter.convert("field:foo");
assertTrue("tokens is null and it shouldn't be", tokens != null);
@@ -46,10 +45,9 @@ public class SpellingQueryConverterTest extends SolrTestCase {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testNumeric() throws Exception {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
String[] queries = {"12345", "foo:12345", "12345 67890", "foo:(12345 67890)", "foo:(life 67890)", "12345 life",
"+12345 +life", "-12345 life"};
@@ -61,10 +59,9 @@ public class SpellingQueryConverterTest extends SolrTestCase {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testSpecialChars() {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
String original = "field_with_underscore:value_with_underscore";
Collection<Token> tokens = converter.convert(original);
@@ -118,10 +115,9 @@ public class SpellingQueryConverterTest extends SolrTestCase {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testUnicode() {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
// chinese text value
@@ -139,10 +135,9 @@ public class SpellingQueryConverterTest extends SolrTestCase {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testMultipleClauses() {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
// two field:value pairs should give two tokens
@@ -157,10 +152,9 @@ public class SpellingQueryConverterTest extends SolrTestCase {
}
@Test
- @SuppressWarnings({"rawtypes"})
public void testRequiredOrProhibitedFlags() {
SpellingQueryConverter converter = new SpellingQueryConverter();
- converter.init(new NamedList());
+ converter.init(new NamedList<>());
converter.setAnalyzer(new WhitespaceAnalyzer());
{
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
index dcfbe9e7313..c1d2ccc998c 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
@@ -103,11 +103,9 @@ public class SuggesterTest extends SolrTestCaseJ4 {
}
// SOLR-2726
- @SuppressWarnings({"unchecked"})
public void testAnalyzer() throws Exception {
Suggester suggester = new Suggester();
- @SuppressWarnings({"rawtypes"})
- NamedList params = new NamedList();
+ NamedList<Object> params = new NamedList<>();
params.add("field", "test_field");
params.add("lookupImpl", "org.apache.solr.spelling.suggest.tst.TSTLookupFactory");
suggester.init(params, h.getCore());
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 a839f5dc595..3324d4779df 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
@@ -32,7 +32,6 @@ import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.index.TieredMergePolicyFactory;
@@ -469,10 +468,5 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
newSearcherCount.incrementAndGet();
newSearcherOpenedAt.set(newSearcher.getOpenNanoTime());
}
-
- @Override
- 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 0449224976e..29b9c9ddaf3 100644
--- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
@@ -31,7 +31,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.ContentStream;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.search.SolrIndexSearcher;
@@ -245,10 +244,7 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
// if non enpty, then at least one offer failed (queues full)
private StringBuffer fail = new StringBuffer();
-
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {}
-
+
@Override
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
// No-Op
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 9c0f8474041..42e56a6de99 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.search.SolrIndexSearcher;
@@ -553,9 +552,6 @@ class MockEventListener implements SolrEventListener {
public MockEventListener() { /* NOOP */ }
- @Override
- 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/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
index ce9559273e1..cd8ff226a1a 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
@@ -301,10 +301,6 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {
CoreContainer cores = jetty.getCoreContainer();
try (SolrCore core = cores.getCore("collection1")) {
core.getUpdateHandler().registerCommitCallback(new SolrEventListener() {
- @Override
- public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
- }
-
@Override
public void postSoftCommit() {
}
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 8a05ca58e13..2929784c3ed 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,11 +32,9 @@ import static org.mockito.Mockito.mock;
*/
public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
private ClassificationUpdateProcessorFactory cFactoryToTest = new ClassificationUpdateProcessorFactory();
- @SuppressWarnings({"rawtypes"})
- private NamedList args = new NamedList<String>();
+ private NamedList<String> args = new NamedList<>();
@Before
- @SuppressWarnings({"unchecked"})
public void initArgs() {
args.add("inputFields", "inputField1,inputField2");
args.add("classField", "classField1");
@@ -94,7 +92,6 @@ public class ClassificationUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
}
@Test
- @SuppressWarnings({"unchecked"})
public void init_unsupportedAlgorithm_shouldThrowExceptionWithDetailedMessage() {
args.removeAll("algorithm");
args.add("algorithm", "unsupported");
@@ -106,7 +103,6 @@ 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/CustomUpdateRequestProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java
index dc1640cc6d0..e34c7340258 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,11 +26,10 @@ import org.apache.solr.response.SolrQueryResponse;
*/
public class CustomUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory
{
- @SuppressWarnings({"rawtypes"})
- public NamedList args = null;
+ public NamedList<?> args = null;
@Override
- public void init( @SuppressWarnings({"rawtypes"})NamedList args )
+ public void init(NamedList<?> args )
{
this.args = args;
}
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 acd48775120..54acd5f2b0f 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
@@ -306,7 +306,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
try {
req.setContentStreams(Collections.singletonList(ContentStreamBase.create(new BinaryRequestWriter(), ureq)));
UpdateRequestHandler h = new UpdateRequestHandler();
- h.init(new NamedList());
+ h.init(new NamedList<>());
h.handleRequestBody(req, new SolrQueryResponse());
} finally {
req.close();
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 00996522f86..0ac81a7d83f 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(@SuppressWarnings({"rawtypes"})NamedList args) {
+ public void init(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/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index 4e34328d8cb..249aad63218 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -305,8 +305,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") ));
final int[] count = {0};
- @SuppressWarnings({"unchecked", "rawtypes"})
- NamedList nl = new NamedList(m);
+ NamedList<?> nl = new NamedList<>(m);
nl._forEachEntry("success", (o, o2) -> count[0]++);
assertEquals(count[0], 4);
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
index 83de0d427bb..58205b5819e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
@@ -208,9 +208,8 @@ public class CommandOperation {
public static final String ERR_MSGS = "errorMessages";
public static final String ROOT_OBJ = "";
- @SuppressWarnings({"rawtypes"})
- public static List<Map> captureErrors(List<CommandOperation> ops) {
- List<Map> errors = new ArrayList<>();
+ public static List<Map<String, Object>> captureErrors(List<CommandOperation> ops) {
+ List<Map<String, Object>> errors = new ArrayList<>();
for (CommandOperation op : ops) {
if (op.hasError()) {
errors.add(op.errorDetails());
@@ -361,8 +360,7 @@ public class CommandOperation {
ops.addAll(parse(stream.getReader(), singletonCommands));
}
}
- @SuppressWarnings({"rawtypes"})
- List<Map> errList = CommandOperation.captureErrors(ops);
+ List<Map<String, Object>> errList = CommandOperation.captureErrors(ops);
if (!errList.isEmpty()) {
resp.add(CommandOperation.ERR_MSGS, errList);
return null;
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index b8f457a2905..b10d2585bbd 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -533,8 +533,7 @@ public class Utils {
Map<String, Object> map = (Map<String, Object>) o;
o = getVal(new MapWriterMap(map), null, idx);
} else {
- @SuppressWarnings({"rawtypes"})
- List l = (List) o;
+ List<?> l = (List<?>) o;
o = idx < l.size() ? l.get(idx) : null;
}
}
@@ -547,8 +546,7 @@ public class Utils {
if (val instanceof IteratorWriter) {
val = getValueAt((IteratorWriter) val, idx);
} else {
- @SuppressWarnings({"rawtypes"})
- List l = (List) val;
+ List<?> l = (List<?>) val;
val = idx < l.size() ? l.get(idx) : null;
}
}
@@ -601,7 +599,6 @@ public class Utils {
return o instanceof Map || o instanceof NamedList || o instanceof MapWriter;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private static Object getVal(Object obj, String key, int idx) {
if (obj instanceof MapWriter) {
Object[] result = new Object[1];
@@ -615,7 +612,7 @@ public class Utils {
if (idx < 0) {
if (k.equals(key)) result[0] = v;
} else {
- if (++count == idx) result[0] = new MapWriterEntry(k, v);
+ if (++count == idx) result[0] = new MapWriterEntry<>(k, v);
}
return this;
}
@@ -624,7 +621,7 @@ public class Utils {
throw new RuntimeException(e);
}
return result[0];
- } else if (obj instanceof Map) return ((Map) obj).get(key);
+ } else if (obj instanceof Map) return ((Map<?,?>) obj).get(key);
else throw new RuntimeException("must be a NamedList or Map");
}
@@ -943,8 +940,7 @@ public class Utils {
- @SuppressWarnings("rawtypes")
- private static Map<Class, List<FieldWriter>> storedReflectData = new ConcurrentHashMap<>();
+ private static Map<Class<?>, List<FieldWriter>> storedReflectData = new ConcurrentHashMap<>();
interface FieldWriter {
void write(MapWriter.EntryWriter ew, Object inst) throws Throwable;
diff --git a/solr/test-framework/src/java/org/apache/solr/core/TrackingBackupRepository.java b/solr/test-framework/src/java/org/apache/solr/core/TrackingBackupRepository.java
index 425ae91ae6c..c2916e5393a 100644
--- a/solr/test-framework/src/java/org/apache/solr/core/TrackingBackupRepository.java
+++ b/solr/test-framework/src/java/org/apache/solr/core/TrackingBackupRepository.java
@@ -111,7 +111,7 @@ public class TrackingBackupRepository implements BackupRepository {
}
@Override
- public void init(@SuppressWarnings("rawtypes") NamedList args) {
+ public void init(NamedList<?> args) {
BackupRepositoryFactory factory = (BackupRepositoryFactory) args.get("factory");
SolrResourceLoader loader = (SolrResourceLoader) args.get("loader");
String repoName = (String) args.get("delegateRepoName");