You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/06/05 19:23:07 UTC
[lucene-solr] branch master updated: SOLR-14538: Fix or suppress
remaining warnings in apache/solr/handler
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new ae3de57 SOLR-14538: Fix or suppress remaining warnings in apache/solr/handler
ae3de57 is described below
commit ae3de57b33dec2c78ae34e601c2c1c0bc7717825
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Fri Jun 5 15:22:44 2020 -0400
SOLR-14538: Fix or suppress remaining warnings in apache/solr/handler
---
solr/CHANGES.txt | 2 ++
.../solr/handler/AnalysisRequestHandlerBase.java | 3 +++
.../org/apache/solr/handler/AnalyzeEvaluator.java | 2 +-
.../java/org/apache/solr/handler/BlobHandler.java | 2 ++
.../java/org/apache/solr/handler/CatStream.java | 3 +++
.../org/apache/solr/handler/CdcrReplicator.java | 3 +++
.../apache/solr/handler/CdcrReplicatorManager.java | 6 ++++++
.../apache/solr/handler/CdcrRequestHandler.java | 9 ++++++++-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 2 ++
.../solr/handler/ContentStreamHandlerBase.java | 2 +-
.../handler/DocumentAnalysisRequestHandler.java | 4 +++-
.../apache/solr/handler/DumpRequestHandler.java | 10 ++++++++--
.../solr/handler/FieldAnalysisRequestHandler.java | 3 +++
.../java/org/apache/solr/handler/GraphHandler.java | 7 +++++++
.../java/org/apache/solr/handler/IndexFetcher.java | 22 ++++++++++++++++++---
.../apache/solr/handler/MoreLikeThisHandler.java | 3 ++-
.../apache/solr/handler/PingRequestHandler.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 16 ++++++++++-----
.../apache/solr/handler/RequestHandlerBase.java | 7 +++++--
.../java/org/apache/solr/handler/RestoreCore.java | 1 +
.../org/apache/solr/handler/SchemaHandler.java | 6 ++++++
.../java/org/apache/solr/handler/SnapShooter.java | 3 +++
.../org/apache/solr/handler/SolrConfigHandler.java | 23 +++++++++++++++++++++-
.../org/apache/solr/handler/StreamHandler.java | 19 ++++++++++++++++--
.../apache/solr/handler/UpdateRequestHandler.java | 4 ++--
.../solr/handler/tagger/TaggerRequestHandler.java | 8 ++++++--
.../solr/handler/tagger/TermPrefixCursor.java | 1 +
.../org/apache/solr/pkg/PackagePluginHolder.java | 1 +
.../component/TrackingShardHandlerFactory.java | 2 +-
29 files changed, 150 insertions(+), 26 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 92dda5e..6bce15f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -288,6 +288,8 @@ Other Changes
* SOLR-14535: Fix or suppress warnings in apache/solr/handler/component (Erick Erickson)
+* SOLR-14538: Fix or suppress remaining warnings in apache/solr/handler (Erick Erickson)
+
================== 8.5.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
index b7c5994..8dbbdc1 100644
--- a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
@@ -82,6 +82,7 @@ public abstract class AnalysisRequestHandlerBase extends RequestHandlerBase {
*
* @throws Exception When analysis fails.
*/
+ @SuppressWarnings({"rawtypes"})
protected abstract NamedList doAnalysis(SolrQueryRequest req) throws Exception;
/**
@@ -99,6 +100,7 @@ public abstract class AnalysisRequestHandlerBase extends RequestHandlerBase {
if (!TokenizerChain.class.isInstance(analyzer)) {
try (TokenStream tokenStream = analyzer.tokenStream(context.getFieldName(), value)) {
+ @SuppressWarnings({"rawtypes"})
NamedList<List<NamedList>> namedList = new NamedList<>();
namedList.add(tokenStream.getClass().getName(), convertTokensToNamedLists(analyzeTokenStream(tokenStream), context));
return namedList;
@@ -231,6 +233,7 @@ public abstract class AnalysisRequestHandlerBase extends RequestHandlerBase {
*
* @return List of NamedLists containing the relevant information taken from the tokens
*/
+ @SuppressWarnings({"rawtypes"})
private List<NamedList> convertTokensToNamedLists(final List<AttributeSource> tokenList, AnalysisContext context) {
final List<NamedList> tokensNamedLists = new ArrayList<>();
final FieldType fieldType = context.getFieldType();
diff --git a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
index 4112e04..a92e3eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
+++ b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java
@@ -82,7 +82,7 @@ public class AnalyzeEvaluator extends SourceEvaluator {
value = obj.toString();
}
- List<String> tokens = new ArrayList();
+ List<String> tokens = new ArrayList<>();
try(TokenStream tokenStream = analyzer.tokenStream(analyzerField, value)) {
CharTermAttribute termAtt = tokenStream.getAttribute(CharTermAttribute.class);
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 11495b1..829aa28 100644
--- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
@@ -80,6 +80,7 @@ public class BlobHandler extends RequestHandlerBase implements PluginInfoInitial
private long maxSize = DEFAULT_MAX_SIZE;
@Override
+ @SuppressWarnings({"unchecked"})
public void handleRequestBody(final SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
String httpMethod = req.getHttpMethod();
String path = (String) req.getContext().get("path");
@@ -275,6 +276,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);
if (invariants != null) {
Object o = invariants.get("maxSize");
diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.java
index d1ebf5a..696fb89 100644
--- a/solr/core/src/java/org/apache/solr/handler/CatStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java
@@ -197,15 +197,18 @@ public class CatStream extends TupleStream implements Expressible {
return false;
}
+ @SuppressWarnings({"unchecked"})
private Tuple fetchNextLineFromCurrentFile() {
linesReturned++;
+ @SuppressWarnings({"rawtypes"})
HashMap m = new HashMap();
m.put("file", currentFilePath.displayPath);
m.put("line", currentFileLines.next());
return new Tuple(m);
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private Tuple createEofTuple() {
HashMap m = new HashMap();
m.put("EOF", true);
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
index e63dcb8..1f41cc3 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
@@ -150,6 +150,7 @@ public class CdcrReplicator implements Runnable {
* or received via solr client
*/
private boolean isTargetCluster(Object o) {
+ @SuppressWarnings({"rawtypes"})
List entry = (List) o;
int operationAndFlags = (Integer) entry.get(0);
int oper = operationAndFlags & UpdateLog.OPERATION_MASK;
@@ -171,6 +172,7 @@ public class CdcrReplicator implements Runnable {
}
private boolean isDelete(Object o) {
+ @SuppressWarnings({"rawtypes"})
List entry = (List) o;
int operationAndFlags = (Integer) entry.get(0);
int oper = operationAndFlags & UpdateLog.OPERATION_MASK;
@@ -195,6 +197,7 @@ public class CdcrReplicator implements Runnable {
private UpdateRequest processUpdate(Object o, UpdateRequest req) {
// should currently be a List<Oper,Ver,Doc/Id>
+ @SuppressWarnings({"rawtypes"})
List entry = (List) o;
int operationAndFlags = (Integer) entry.get(0);
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
index d80a09a..01a0c4d 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
@@ -146,6 +146,7 @@ class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
ExecutorUtil.shutdownAndAwaitTermination(bootstrapExecutor);
}
this.closeLogReaders();
+ @SuppressWarnings({"rawtypes"})
Callable callable = core.getSolrCoreState().getCdcrBootstrapCallable();
if (callable != null) {
CdcrRequestHandler.BootstrapCallable bootstrapCallable = (CdcrRequestHandler.BootstrapCallable) callable;
@@ -201,9 +202,11 @@ class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.ACTION, CdcrParams.CdcrAction.COLLECTIONCHECKPOINT.toString());
+ @SuppressWarnings({"rawtypes"})
SolrRequest request = new QueryRequest(params);
request.setPath(path);
+ @SuppressWarnings({"rawtypes"})
NamedList response = state.getClient().request(request);
return (Long) response.get(CdcrParams.CHECKPOINT);
}
@@ -364,6 +367,7 @@ class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
try (HttpSolrClient client = new HttpSolrClient.Builder(leaderCoreUrl).withHttpClient(httpClient).build()) {
log.info("Attempting to bootstrap target collection: {} shard: {} leader: {}", targetCollection, shard, leaderCoreUrl);
try {
+ @SuppressWarnings({"rawtypes"})
NamedList response = sendCdcrCommand(client, CdcrParams.CdcrAction.BOOTSTRAP, ReplicationHandler.MASTER_URL, myCoreUrl);
log.debug("CDCR Bootstrap response: {}", response);
String status = response.get(RESPONSE_STATUS).toString();
@@ -384,6 +388,7 @@ class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
String leaderCoreUrl = leader.getCoreUrl();
HttpClient httpClient = state.getClient().getLbClient().getHttpClient();
try (HttpSolrClient client = new HttpSolrClient.Builder(leaderCoreUrl).withHttpClient(httpClient).build()) {
+ @SuppressWarnings({"rawtypes"})
NamedList response = sendCdcrCommand(client, CdcrParams.CdcrAction.BOOTSTRAP_STATUS);
String status = (String) response.get(RESPONSE_STATUS);
BootstrapStatus bootstrapStatus = BootstrapStatus.valueOf(status.toUpperCase(Locale.ROOT));
@@ -410,6 +415,7 @@ class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
}
}
+ @SuppressWarnings({"rawtypes"})
private NamedList sendCdcrCommand(SolrClient client, CdcrParams.CdcrAction action, String... params) throws SolrServerException, IOException {
ModifiableSolrParams solrParams = new ModifiableSolrParams();
solrParams.set(CommonParams.QT, "/cdcr");
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
index e45ab9f..1bf2257 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
@@ -131,7 +131,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
private CdcrBufferManager bufferManager;
@Override
- public void init(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init(args);
if (args != null) {
@@ -155,6 +155,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
// Configuration of the Replicas
replicasConfiguration = new HashMap<>();
+ @SuppressWarnings({"rawtypes"})
List replicas = args.getAll(CdcrParams.REPLICA_PARAM);
for (Object replica : replicas) {
if (replica != null && replica instanceof NamedList) {
@@ -376,6 +377,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
rsp.add(CdcrParams.CdcrAction.STATUS.toLower(), this.getStatus());
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private NamedList getStatus() {
NamedList status = new NamedList();
status.add(CdcrParams.ProcessState.getParam(), processStateManager.getState().toLower());
@@ -548,6 +550,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
rsp.add(CdcrParams.LAST_PROCESSED_VERSION, lastProcessedVersion);
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void handleQueuesAction(SolrQueryRequest req, SolrQueryResponse rsp) {
NamedList hosts = new NamedList();
@@ -580,6 +583,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
updateLogSynchronizer.isStarted() ? CdcrParams.ProcessState.STARTED.toLower() : CdcrParams.ProcessState.STOPPED.toLower());
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void handleOpsAction(SolrQueryRequest req, SolrQueryResponse rsp) {
NamedList hosts = new NamedList();
@@ -598,6 +602,7 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
rsp.add(CdcrParams.OPERATIONS_PER_SECOND, hosts);
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void handleErrorsAction(SolrQueryRequest req, SolrQueryResponse rsp) {
NamedList hosts = new NamedList();
@@ -862,9 +867,11 @@ public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAw
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.ACTION, CdcrParams.CdcrAction.SHARDCHECKPOINT.toString());
+ @SuppressWarnings({"rawtypes"})
SolrRequest request = new QueryRequest(params);
request.setPath(cdcrPath);
+ @SuppressWarnings({"rawtypes"})
NamedList response = server.request(request);
return (Long) response.get(CdcrParams.CHECKPOINT);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
index 5931496..31f779d 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
@@ -139,11 +139,13 @@ class CdcrUpdateLogSynchronizer implements CdcrStateManager.CdcrStateObserver {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.ACTION, CdcrParams.CdcrAction.LASTPROCESSEDVERSION.toString());
+ @SuppressWarnings({"rawtypes"})
SolrRequest request = new QueryRequest(params);
request.setPath(path);
long lastVersion;
try {
+ @SuppressWarnings({"rawtypes"})
NamedList response = server.request(request);
lastVersion = (Long) response.get(CdcrParams.LAST_PROCESSED_VERSION);
if (log.isDebugEnabled()) {
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 1859f04..7f4feac 100644
--- a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
@@ -32,7 +32,7 @@ import org.apache.solr.update.processor.UpdateRequestProcessorChain;
public abstract class ContentStreamHandlerBase extends RequestHandlerBase {
@Override
- public void init(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})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 205c14e..f40a03a 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(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init(args);
inputFactory = XMLInputFactory.newInstance();
@@ -109,6 +109,7 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
}
@Override
+ @SuppressWarnings({"rawtypes"})
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
DocumentAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
return handleAnalysisRequest(analysisRequest, req.getSchema());
@@ -194,6 +195,7 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
for (SolrInputDocument document : request.getDocuments()) {
+ @SuppressWarnings({"rawtypes"})
NamedList<NamedList> theTokens = new SimpleOrderedMap<>();
result.add(document.getFieldValue(uniqueKeyField.getName()).toString(), theTokens);
for (String name : document.getFieldNames()) {
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 d7d5b71..4ce5fa5 100644
--- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
@@ -37,12 +37,14 @@ import static org.apache.solr.common.params.CommonParams.NAME;
public class DumpRequestHandler extends RequestHandlerBase
{
@Override
- public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException
+ @SuppressWarnings({"unchecked"})
+ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException
{
// Show params
rsp.add( "params", req.getParams().toNamedList() );
String[] parts = req.getParams().getParams("urlTemplateValues");
if (parts != null && parts.length > 0) {
+ @SuppressWarnings({"rawtypes"})
Map map = new LinkedHashMap<>();
rsp.getValues().add("urlTemplateValues", map);
for (String part : parts) {
@@ -52,6 +54,7 @@ public class DumpRequestHandler extends RequestHandlerBase
String[] returnParams = req.getParams().getParams("param");
if(returnParams !=null) {
+ @SuppressWarnings({"rawtypes"})
NamedList params = (NamedList) rsp.getValues().get("params");
for (String returnParam : returnParams) {
String[] vals = req.getParams().getParams(returnParam);
@@ -68,6 +71,7 @@ public class DumpRequestHandler extends RequestHandlerBase
}
if(req.getParams().getBool("getdefaults", false)){
+ @SuppressWarnings({"rawtypes"})
NamedList def = (NamedList) initArgs.get(PluginInfo.DEFAULTS);
rsp.add("getdefaults", def);
}
@@ -116,9 +120,11 @@ public class DumpRequestHandler extends RequestHandlerBase
private List<String> subpaths;
@Override
- public void init(NamedList args) {
+ @SuppressWarnings({"unchecked"})
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init(args);
if(args !=null) {
+ @SuppressWarnings({"rawtypes"})
NamedList nl = (NamedList) args.get(PluginInfo.DEFAULTS);
if(nl!=null) subpaths = nl.getAll("subpath");
}
diff --git a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
index 5038b6a..6917bbb 100644
--- a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
@@ -93,6 +93,7 @@ import java.util.Set;
public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {
@Override
+ @SuppressWarnings({"rawtypes"})
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
FieldAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
IndexSchema indexSchema = req.getSchema();
@@ -174,6 +175,7 @@ public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {
*
* @return The analysis breakdown as a named list.
*/
+ @SuppressWarnings({"rawtypes"})
protected NamedList<NamedList> handleAnalysisRequest(FieldAnalysisRequest request, IndexSchema schema) {
NamedList<NamedList> analysisResults = new SimpleOrderedMap<>();
@@ -210,6 +212,7 @@ public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {
* @return NamedList containing the tokens produced by the analyzers of the given field, separated into an index and
* a query group
*/ // package access for testing
+ @SuppressWarnings({"rawtypes"})
NamedList<NamedList> analyzeValues(FieldAnalysisRequest analysisRequest, FieldType fieldType, String fieldName) {
final String queryValue = analysisRequest.getQuery();
diff --git a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
index 76f52ca..0a4bd82 100644
--- a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
@@ -91,6 +91,7 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
return PermissionNameProvider.Name.READ_PERM;
}
+ @SuppressWarnings({"unchecked"})
public void inform(SolrCore core) {
String defaultCollection;
String defaultZkhost;
@@ -132,6 +133,7 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
}
}
+ @SuppressWarnings({"unchecked"})
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
SolrParams params = req.getParams();
params = adjustParams(params);
@@ -145,6 +147,7 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
} catch (Exception e) {
//Catch exceptions that occur while the stream is being created. This will include streaming expression parse rules.
SolrException.log(log, e);
+ @SuppressWarnings({"rawtypes"})
Map requestContext = req.getContext();
requestContext.put("stream", new DummyErrorStream(e));
return;
@@ -156,6 +159,7 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
Traversal traversal = new Traversal();
context.put("traversal", traversal);
tupleStream.setStreamContext(context);
+ @SuppressWarnings({"rawtypes"})
Map requestContext = req.getContext();
requestContext.put("stream", new TimerStream(new ExceptionStream(tupleStream)));
requestContext.put("traversal", traversal);
@@ -202,8 +206,10 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
return null;
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() {
String msg = e.getMessage();
+ @SuppressWarnings({"rawtypes"})
Map m = new HashMap();
m.put("EOF", true);
m.put("EXCEPTION", msg);
@@ -254,6 +260,7 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
return null;
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() throws IOException {
Tuple tuple = this.tupleStream.read();
if(tuple.EOF) {
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 146b0e9..46c009c 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -230,7 +230,7 @@ public class IndexFetcher {
return HttpClientUtil.createClient(httpClientParams, core.getCoreContainer().getUpdateShardHandler().getRecoveryOnlyConnectionManager(), true);
}
- public IndexFetcher(final NamedList initArgs, final ReplicationHandler handler, final SolrCore sc) {
+ public IndexFetcher(@SuppressWarnings({"rawtypes"})final NamedList initArgs, final ReplicationHandler handler, final SolrCore sc) {
solrCore = sc;
Object fetchFromLeader = initArgs.get(FETCH_FROM_LEADER);
if (fetchFromLeader != null && fetchFromLeader instanceof Boolean) {
@@ -272,7 +272,8 @@ public class IndexFetcher {
myHttpClient = createHttpClient(solrCore, httpBasicAuthUser, httpBasicAuthPassword, useExternalCompression);
}
- protected <T> T getParameter(NamedList initArgs, String configKey, T defaultValue, StringBuilder sb) {
+ @SuppressWarnings({"unchecked"})
+ protected <T> T getParameter(@SuppressWarnings({"rawtypes"})NamedList initArgs, String configKey, T defaultValue, StringBuilder sb) {
T toReturn = defaultValue;
if (initArgs != null) {
T temp = (T) initArgs.get(configKey);
@@ -285,7 +286,7 @@ public class IndexFetcher {
/**
* Gets the latest commit version and generation from the master
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
NamedList getLatestVersion() throws IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(COMMAND, CMD_INDEX_VERSION);
@@ -309,6 +310,7 @@ public class IndexFetcher {
/**
* Fetches the list of files in a given index commit point and updates internal list of files to download.
*/
+ @SuppressWarnings({"unchecked"})
private void fetchFileList(long gen) throws IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(COMMAND, CMD_GET_FILE_LIST);
@@ -324,6 +326,7 @@ public class IndexFetcher {
.withConnectionTimeout(connTimeout)
.withSocketTimeout(soTimeout)
.build()) {
+ @SuppressWarnings({"rawtypes"})
NamedList response = client.request(req);
List<Map<String, Object>> files = (List<Map<String,Object>>) response.get(CMD_GET_FILE_LIST);
@@ -410,6 +413,7 @@ public class IndexFetcher {
}
}
//get the current 'replicateable' index version in the master
+ @SuppressWarnings({"rawtypes"})
NamedList response;
try {
response = getLatestVersion();
@@ -917,6 +921,7 @@ public class IndexFetcher {
// todo stop keeping solrCore around
SolrCore core = solrCore.getCoreContainer().getCore(solrCore.getName());
try {
+ @SuppressWarnings({"rawtypes"})
Future[] waitSearcher = new Future[1];
searcher = core.getSearcher(true, true, waitSearcher, true);
if (waitSearcher[0] != null) {
@@ -1481,11 +1486,14 @@ public class IndexFetcher {
*
* @return a list of configuration files which have changed on the master 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.EMPTY_LIST;
//build a map with alias/name as the key
+ @SuppressWarnings({"rawtypes"})
Map<String, Map<String, Object>> nameVsFile = new HashMap<>();
+ @SuppressWarnings({"rawtypes"})
NamedList names = new NamedList();
for (Map<String, Object> map : confFilesToDownload) {
//if alias is present that is the name the file may have in the slave
@@ -1562,6 +1570,7 @@ public class IndexFetcher {
return timeElapsed;
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getTlogFilesToDownload() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = tlogFilesToDownload;
@@ -1569,6 +1578,7 @@ public class IndexFetcher {
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getTlogFilesDownloaded() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = tlogFilesDownloaded;
@@ -1576,6 +1586,7 @@ public class IndexFetcher {
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getConfFilesToDownload() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = confFilesToDownload;
@@ -1583,6 +1594,7 @@ public class IndexFetcher {
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getConfFilesDownloaded() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = confFilesDownloaded;
@@ -1590,12 +1602,14 @@ public class IndexFetcher {
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getFilesToDownload() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = filesToDownload;
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
+ @SuppressWarnings({"unchecked"})
List<Map<String, Object>> getFilesDownloaded() {
List<Map<String, Object>> tmp = filesDownloaded;
return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
@@ -1857,6 +1871,7 @@ public class IndexFetcher {
}
+ @SuppressWarnings({"rawtypes"})
NamedList response;
InputStream is = null;
@@ -1966,6 +1981,7 @@ public class IndexFetcher {
}
}
+ @SuppressWarnings({"rawtypes"})
NamedList getDetails() throws IOException, SolrServerException {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(COMMAND, CMD_DETAILS);
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 d13fa7a..652024c 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -91,7 +91,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase
"MoreLikeThis does not support multiple ContentStreams";
@Override
- public void init(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init(args);
}
@@ -261,6 +261,7 @@ 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) {
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 0cd9e1d..c8cbc09 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 File healthcheck = null;
@Override
- public void init(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})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 94ff9e1..b68598c 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -969,6 +969,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
Properties props = loadReplicationProperties();
if (showSlaveDetails) {
try {
+ @SuppressWarnings({"rawtypes"})
NamedList nl = fetcher.getDetails();
slave.add("masterDetails", nl.get(CMD_DETAILS));
} catch (Exception e) {
@@ -1091,6 +1092,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (slave.size() > 0)
details.add("slave", slave);
+ @SuppressWarnings({"rawtypes"})
NamedList snapshotStats = snapShootDetails;
if (snapshotStats != null)
details.add(CMD_BACKUP, snapshotStats);
@@ -1102,21 +1104,21 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
return details;
}
- private void addVal(NamedList<Object> nl, String key, Properties props, Class clzz) {
+ private void addVal(NamedList<Object> nl, String key, Properties props, @SuppressWarnings({"rawtypes"})Class clzz) {
Object val = formatVal(key, props, clzz);
if (val != null) {
nl.add(key, val);
}
}
- private void addVal(Map<String, Object> map, String key, Properties props, Class clzz) {
+ private void addVal(Map<String, Object> map, String key, Properties props, @SuppressWarnings({"rawtypes"})Class clzz) {
Object val = formatVal(key, props, clzz);
if (val != null) {
map.put(key, val);
}
}
- private Object formatVal(String key, Properties props, Class clzz) {
+ private Object formatVal(String key, Properties props, @SuppressWarnings({"rawtypes"})Class clzz) {
String s = props.getProperty(key);
if (s == null || s.trim().length() == 0) return null;
if (clzz == Date.class) {
@@ -1233,6 +1235,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
} else {
numberBackupsToKeep = 0;
}
+ @SuppressWarnings({"rawtypes"})
NamedList slave = (NamedList) initArgs.get("slave");
boolean enableSlave = isEnabled( slave );
if (enableSlave) {
@@ -1240,6 +1243,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
setupPolling((String) slave.get(POLL_INTERVAL));
isSlave = true;
}
+ @SuppressWarnings({"rawtypes"})
NamedList master = (NamedList) initArgs.get("master");
boolean enableMaster = isEnabled( master );
@@ -1269,9 +1273,11 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
log.info("Replication enabled for following config files: {}", includeConfFiles);
}
+ @SuppressWarnings({"rawtypes"})
List backup = master.getAll("backupAfter");
boolean backupOnCommit = backup.contains("commit");
boolean backupOnOptimize = !backupOnCommit && backup.contains("optimize");
+ @SuppressWarnings({"rawtypes"})
List replicateAfter = master.getAll(REPLICATE_AFTER);
replicateOnCommit = replicateAfter.contains("commit");
replicateOnOptimize = !replicateOnCommit && replicateAfter.contains("optimize");
@@ -1361,7 +1367,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
// check master or slave is enabled
- private boolean isEnabled( NamedList params ){
+ private boolean isEnabled( @SuppressWarnings({"rawtypes"})NamedList params ){
if( params == null ) return false;
Object enable = params.get( "enable" );
if( enable == null ) return true;
@@ -1432,7 +1438,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
private SolrEventListener getEventListener(final boolean snapshoot, final boolean getCommit) {
return new SolrEventListener() {
@Override
- public void init(NamedList args) {/*no op*/ }
+ 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 44e84c1..1fcc183 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -54,6 +54,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 SolrParams defaults;
protected SolrParams appends;
@@ -127,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(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
initArgs = args;
if (args != null) {
@@ -168,7 +169,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
solrMetricsContext.gauge(() -> handlerStart, true, "handlerStart", getCategory().toString(), scope);
}
- public static SolrParams getSolrParamsFromNamedList(NamedList args, String key) {
+ public static SolrParams getSolrParamsFromNamedList(@SuppressWarnings({"rawtypes"})NamedList args, String key) {
Object o = args.get(key);
if (o != null && o instanceof NamedList) {
return ((NamedList) o).toSolrParams();
@@ -176,6 +177,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
return null;
}
+ @SuppressWarnings({"rawtypes"})
public NamedList getInitArgs() {
return initArgs;
}
@@ -209,6 +211,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
rsp.setHttpCaching(httpCaching);
handleRequestBody(req, rsp);
// count timeouts
+ @SuppressWarnings({"rawtypes"})
NamedList header = rsp.getResponseHeader();
if (header != null) {
if (Boolean.TRUE.equals(header.getBooleanArg(
diff --git a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java b/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
index fb75d4a..3e12d4b 100644
--- a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
+++ b/solr/core/src/java/org/apache/solr/handler/RestoreCore.java
@@ -153,6 +153,7 @@ public class RestoreCore implements Callable<Boolean> {
}
private void openNewSearcher() throws Exception {
+ @SuppressWarnings({"rawtypes"})
Future[] waitSearcher = new Future[1];
core.getSearcher(true, false, waitSearcher, true);
if (waitSearcher[0] != null) {
diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 58a6bd0..b6ba60f 100644
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@ -56,6 +56,7 @@ import static org.apache.solr.schema.IndexSchema.SchemaProps.Handler.DYNAMIC_FIE
import static org.apache.solr.schema.IndexSchema.SchemaProps.Handler.FIELDS;
import static org.apache.solr.schema.IndexSchema.SchemaProps.Handler.FIELD_TYPES;
+@SuppressWarnings({"unchecked"})
public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware, PermissionNameProvider {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean isImmutableConfigSet = false;
@@ -63,6 +64,7 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,
private static final Map<String, String> level2;
static {
+ @SuppressWarnings({"rawtypes"})
Map s = Utils.makeMap(
FIELD_TYPES.nameLower, null,
FIELDS.nameLower, "fl",
@@ -87,6 +89,7 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,
}
try {
+ @SuppressWarnings({"rawtypes"})
List errs = new SchemaManager(req).performOperations();
if (!errs.isEmpty())
throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST,"error processing commands", errs);
@@ -168,14 +171,17 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,
if (parts.size() > 2) {
req.setParams(SolrParams.wrapDefaults(new MapSolrParams(singletonMap(pathParam, parts.get(2))), req.getParams()));
}
+ @SuppressWarnings({"rawtypes"})
Map propertyValues = req.getSchema().getNamedPropertyValues(realName, req.getParams());
Object o = propertyValues.get(fieldName);
if(parts.size()> 2) {
String name = parts.get(2);
if (o instanceof List) {
+ @SuppressWarnings({"rawtypes"})
List list = (List) o;
for (Object obj : list) {
if (obj instanceof SimpleOrderedMap) {
+ @SuppressWarnings({"rawtypes"})
SimpleOrderedMap simpleOrderedMap = (SimpleOrderedMap) obj;
if(name.equals(simpleOrderedMap.get("name"))) {
rsp.add(fieldName.substring(0, realName.length() - 1), simpleOrderedMap);
diff --git a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
index 07a4eb9..c238d55 100644
--- a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
+++ b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
@@ -148,6 +148,7 @@ public class SnapShooter {
}
}
+ @SuppressWarnings({"rawtypes"})
public NamedList createSnapshot() throws Exception {
final IndexCommit indexCommit = getAndSaveIndexCommit();
try {
@@ -208,6 +209,7 @@ public class SnapShooter {
return commit;
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void createSnapAsync(final int numberToKeep, Consumer<NamedList> result) throws IOException {
//TODO should use Solr's ExecutorUtil
new Thread(() -> {
@@ -242,6 +244,7 @@ public class SnapShooter {
* @see IndexDeletionPolicyWrapper#saveCommitPoint
* @see IndexDeletionPolicyWrapper#releaseCommitPoint
*/
+ @SuppressWarnings({"rawtypes"})
protected NamedList createSnapshot(final IndexCommit indexCommit) throws Exception {
assert indexCommit != null;
if (log.isInfoEnabled()) {
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 b10b483..2b71018 100644
--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
@@ -151,6 +151,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
public static boolean getImmutable(SolrCore core) {
+ @SuppressWarnings({"rawtypes"})
NamedList configSetProperties = core.getConfigSetProperties();
if (configSetProperties == null) return false;
Object immutable = configSetProperties.get(IMMUTABLE_CONFIGSET_ARG);
@@ -178,6 +179,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
return "/config";
}
+ @SuppressWarnings({"unchecked"})
private void handleGET() {
if (parts.size() == 1) {
//this is the whole config. sent out the whole payload
@@ -189,6 +191,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
if (parts.size() == 3) {
RequestParams params = req.getCore().getSolrConfig().getRequestParams();
RequestParams.ParamSet p = params.getParams(parts.get(2));
+ @SuppressWarnings({"rawtypes"})
Map m = new LinkedHashMap<>();
m.put(ZNODEVER, params.getZnodeVersion());
if (p != null) {
@@ -247,6 +250,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
Map<String, Object> val = makeMap(parts.get(1), m.get(parts.get(1)));
String componentName = req.getParams().get("componentName");
if (componentName != null) {
+ @SuppressWarnings({"rawtypes"})
Map map = (Map) val.get(parts.get(1));
if (map != null) {
Object o = map.get(componentName);
@@ -261,6 +265,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
if(info == null) continue;
if (info.type.equals(parts.get(1)) && info.name.equals(componentName)) {
if (o instanceof Map) {
+ @SuppressWarnings({"rawtypes"})
Map m1 = (Map) o;
m1.put("_packageinfo_", listener.getPackageVersion());
}
@@ -275,11 +280,13 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
}
+ @SuppressWarnings({"unchecked"})
private Map<String, Object> getConfigDetails(String componentType, SolrQueryRequest req) {
String componentName = componentType == null ? null : req.getParams().get("componentName");
boolean showParams = req.getParams().getBool("expandParams", false);
Map<String, Object> map = this.req.getCore().getSolrConfig().toMap(new LinkedHashMap<>());
if (componentType != null && !SolrRequestHandler.TYPE.equals(componentType)) return map;
+ @SuppressWarnings({"rawtypes"})
Map reqHandlers = (Map) map.get(SolrRequestHandler.TYPE);
if (reqHandlers == null) map.put(SolrRequestHandler.TYPE, reqHandlers = new LinkedHashMap<>());
List<PluginInfo> plugins = this.req.getCore().getImplicitHandlers();
@@ -292,6 +299,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
if (!showParams) return map;
for (Object o : reqHandlers.entrySet()) {
+ @SuppressWarnings({"rawtypes"})
Map.Entry e = (Map.Entry) o;
if (componentName == null || e.getKey().equals(componentName)) {
Map<String, Object> m = expandUseParams(req, e.getValue());
@@ -302,6 +310,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
return map;
}
+ @SuppressWarnings({"unchecked"})
private Map<String, Object> expandUseParams(SolrQueryRequest req,
Object plugin) {
@@ -311,9 +320,11 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
} else if (plugin instanceof PluginInfo) {
pluginInfo = ((PluginInfo) plugin).toMap(new LinkedHashMap<>());
}
+ @SuppressWarnings({"rawtypes"})
String useParams = (String) pluginInfo.get(USEPARAM);
String useParamsInReq = req.getOriginalParams().get(USEPARAM);
if (useParams != null || useParamsInReq != null) {
+ @SuppressWarnings({"rawtypes"})
Map m = new LinkedHashMap<>();
pluginInfo.put("_useParamsExpanded_", m);
List<String> params = new ArrayList<>();
@@ -331,6 +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;
SolrPluginUtils.setDefaults(r,
getSolrParamsFromNamedList(nl, DEFAULTS),
@@ -380,6 +392,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
+ @SuppressWarnings({"unchecked"})
private void handleParams(ArrayList<CommandOperation> ops, RequestParams params) {
for (CommandOperation op : ops) {
switch (op.name) {
@@ -390,6 +403,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
for (Map.Entry<String, Object> entry : map.entrySet()) {
+ @SuppressWarnings({"rawtypes"})
Map val;
String key = entry.getKey();
if (isNullOrEmpty(key)) {
@@ -449,6 +463,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
+ @SuppressWarnings({"rawtypes"})
List errs = CommandOperation.captureErrors(ops);
if (!errs.isEmpty()) {
throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST, "error processing params", errs);
@@ -478,6 +493,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
+ @SuppressWarnings({"unchecked"})
private void handleCommands(List<CommandOperation> ops, ConfigOverlay overlay) throws IOException {
for (CommandOperation op : ops) {
switch (op.name) {
@@ -514,6 +530,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
}
}
+ @SuppressWarnings({"rawtypes"})
List errs = CommandOperation.captureErrors(ops);
if (!errs.isEmpty()) {
log.error("ERROR:{}", Utils.toJSONString(errs));
@@ -594,7 +611,8 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
return overlay.getNamedPlugins(info.getCleanTag()).containsKey(name);
}
- private boolean verifyClass(CommandOperation op, String clz, Class expected) {
+ @SuppressWarnings({"unchecked"})
+ private boolean verifyClass(CommandOperation op, String clz, @SuppressWarnings({"rawtypes"})Class expected) {
if (clz == null) return true;
if (!"true".equals(String.valueOf(op.getStr("runtimeLib", null)))) {
PluginInfo info = new PluginInfo(SolrRequestHandler.TYPE, op.getDataMap());
@@ -664,6 +682,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
for (Map.Entry<String, Object> e : m.entrySet()) {
String name = e.getKey();
Object val = e.getValue();
+ @SuppressWarnings({"rawtypes"})
Class typ = ConfigOverlay.checkEditable(name, false, null);
if (typ == null) {
op.addError(formatString(NOT_EDITABLE, name));
@@ -874,6 +893,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
}
}
+ @SuppressWarnings({"rawtypes"})
private static class PerReplicaCallable extends SolrRequest implements Callable<Boolean> {
String coreUrl;
String prop;
@@ -912,6 +932,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
Thread.sleep(100);
NamedList<Object> resp = solr.httpUriRequest(this).future.get();
if (resp != null) {
+ @SuppressWarnings({"rawtypes"})
Map m = (Map) resp.get(ZNODEVER);
if (m != null) {
remoteVersion = (Number) m.get(prop);
diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
index d78a4fe..75940eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -88,11 +88,13 @@ import static org.apache.solr.common.params.CommonParams.ID;
public class StreamHandler extends RequestHandlerBase implements SolrCoreAware, PermissionNameProvider {
private ModelCache modelCache;
+ @SuppressWarnings({"rawtypes"})
private ConcurrentMap objectCache;
private SolrDefaultStreamFactory streamFactory = new SolrDefaultStreamFactory();
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String coreName;
private SolrClientCache solrClientCache;
+ @SuppressWarnings({"unchecked", "rawtypes"})
private Map<String, DaemonStream> daemons = Collections.synchronizedMap(new HashMap());
@Override
@@ -100,6 +102,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
return PermissionNameProvider.Name.READ_PERM;
}
+ @SuppressWarnings({"rawtypes"})
public void inform(SolrCore core) {
String defaultCollection;
String defaultZkhost;
@@ -124,6 +127,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
addExpressiblePlugins(streamFactory, core);
}
+ @SuppressWarnings({"unchecked"})
public static void addExpressiblePlugins(StreamFactory streamFactory, SolrCore core) {
List<PluginInfo> pluginInfos = core.getSolrConfig().getPluginInfos(Expressible.class.getName());
for (PluginInfo pluginInfo : pluginInfos) {
@@ -139,6 +143,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
}
}
+ @SuppressWarnings({"rawtypes"})
public static class ExpressibleHolder extends PackagePluginHolder {
private Class clazz;
@@ -146,6 +151,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
super(info, core, pluginMeta);
}
+ @SuppressWarnings({"rawtypes"})
public Class getClazz() {
return clazz;
}
@@ -338,6 +344,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withExpression("--non-expressible--");
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() {
String msg = e.getMessage();
@@ -347,6 +354,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
t = t.getCause();
}
+ @SuppressWarnings({"rawtypes"})
Map m = new HashMap();
m.put("EOF", true);
m.put("EXCEPTION", msg);
@@ -388,10 +396,12 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withExpression("--non-expressible--");
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() {
if (it.hasNext()) {
return it.next().getInfo();
} else {
+ @SuppressWarnings({"rawtypes"})
Map m = new HashMap();
m.put("EOF", true);
return new Tuple(m);
@@ -434,13 +444,16 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withExpression("--non-expressible--");
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() {
if (sendEOF) {
+ @SuppressWarnings({"rawtypes"})
Map m = new HashMap();
m.put("EOF", true);
return new Tuple(m);
} else {
sendEOF = true;
+ @SuppressWarnings({"rawtypes"})
Map m = new HashMap();
m.put("DaemonOp", message);
return new Tuple(m);
@@ -488,6 +501,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withExpression("--non-expressible--");
}
+ @SuppressWarnings({"unchecked"})
public Tuple read() throws IOException {
Tuple tuple = this.tupleStream.read();
if (tuple.EOF) {
@@ -500,7 +514,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
private Map<String, List<String>> getCollectionShards(SolrParams params) {
- Map<String, List<String>> collectionShards = new HashMap();
+ Map<String, List<String>> collectionShards = new HashMap<>();
Iterator<String> paramsIt = params.getParameterNamesIterator();
while (paramsIt.hasNext()) {
String param = paramsIt.next();
@@ -508,7 +522,8 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
String collection = param.split("\\.")[0];
String shardString = params.get(param);
String[] shards = shardString.split(",");
- List<String> shardList = new ArrayList();
+ @SuppressWarnings({"rawtypes"})
+ List<String> shardList = new ArrayList<>();
for (String shard : shards) {
shardList.add(shard);
}
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 cbe2cba..cd64b55 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(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init(args);
// Since backed by a non-thread safe Map, it should not be modifiable
@@ -133,7 +133,7 @@ public class UpdateRequestHandler extends ContentStreamHandlerBase implements Pe
}
}
private Map<String ,ContentStreamLoader> pathVsLoaders = new HashMap<>();
- protected Map<String,ContentStreamLoader> createDefaultLoaders(NamedList args) {
+ protected Map<String,ContentStreamLoader> createDefaultLoaders(@SuppressWarnings({"rawtypes"})NamedList args) {
SolrParams p = null;
if(args!=null) {
p = args.toSolrParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
index 42d1ad6..e4fa256 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
@@ -160,6 +160,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {
final SolrIndexSearcher searcher = req.getSearcher();
final FixedBitSet matchDocIdsBS = new FixedBitSet(searcher.maxDoc());
+ @SuppressWarnings({"rawtypes"})
final List tags = new ArrayList(2000);
try {
@@ -185,6 +186,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {
endOffset = offsetPair[1];
}
+ @SuppressWarnings({"rawtypes"})
NamedList tag = new NamedList();
tag.add("startOffset", startOffset);
tag.add("endOffset", endOffset);
@@ -195,19 +197,20 @@ public class TaggerRequestHandler extends RequestHandlerBase {
tags.add(tag);
}
+ @SuppressWarnings({"rawtypes"})
Map<Object, List> docIdsListCache = new HashMap<>(2000);
ValueSourceAccessor uniqueKeyCache = new ValueSourceAccessor(searcher,
idSchemaField.getType().getValueSource(idSchemaField, null));
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
private List lookupSchemaDocIds(Object docIdsKey) {
List schemaDocIds = docIdsListCache.get(docIdsKey);
if (schemaDocIds != null)
return schemaDocIds;
IntsRef docIds = lookupDocIds(docIdsKey);
//translate lucene docIds to schema ids
- schemaDocIds = new ArrayList(docIds.length);
+ schemaDocIds = new ArrayList<>(docIds.length);
for (int i = docIds.offset; i < docIds.offset + docIds.length; i++) {
int docId = docIds.ints[i];
assert i == docIds.offset || docIds.ints[i - 1] < docId : "not sorted?";
@@ -349,6 +352,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {
static class ValueSourceAccessor {
private final List<LeafReaderContext> readerContexts;
private final ValueSource valueSource;
+ @SuppressWarnings({"rawtypes"})
private final Map fContext;
private final FunctionValues[] functionValuesPerSeg;
private final int[] functionValuesDocIdPerSeg;
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TermPrefixCursor.java b/solr/core/src/java/org/apache/solr/handler/tagger/TermPrefixCursor.java
index 1e82dbe..4756111 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/TermPrefixCursor.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TermPrefixCursor.java
@@ -107,6 +107,7 @@ class TermPrefixCursor {
/** Seeks to prefixBuf or the next term that is prefixed by prefixBuf plus the separator char.
* Sets docIds. **/
+ @SuppressWarnings({"fallthrough"})
private boolean seekPrefix() throws IOException {
TermsEnum.SeekStatus seekStatus = termsEnum.seekCeil(prefixBuf);
diff --git a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
index 78a1658..322a1d3 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
@@ -112,6 +112,7 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {
}
+ @SuppressWarnings({"unchecked"})
protected void initNewInstance(PackageLoader.Package.Version newest) {
Object instance = SolrCore.createInstance(pluginInfo.className,
pluginMeta.clazz, pluginMeta.getCleanTag(), core, newest.getLoader());
diff --git a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
index 75c8345..8e77b0c 100644
--- a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
+++ b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
@@ -156,7 +156,7 @@ public class TrackingShardHandlerFactory extends HttpShardHandlerFactory {
}
@Override
- protected NamedList<Object> request(String url, SolrRequest req) throws IOException, SolrServerException {
+ protected NamedList<Object> request(String url, @SuppressWarnings({"rawtypes"})SolrRequest req) throws IOException, SolrServerException {
try (SolrClient client = new HttpSolrClient.Builder(url).withHttpClient(httpClient).build()) {
return client.request(req);
}