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/04 11:03:18 UTC
[lucene-solr] branch branch_8x updated: SOLR-14533: Fix or suppress
warnings in solr/handler/admin
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 94916a6 SOLR-14533: Fix or suppress warnings in solr/handler/admin
94916a6 is described below
commit 94916a6a8a1cf38cc03767f3f2f4e2d38a4ad271
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Thu Jun 4 06:59:33 2020 -0400
SOLR-14533: Fix or suppress warnings in solr/handler/admin
---
solr/CHANGES.txt | 2 +
.../java/org/apache/solr/handler/GraphHandler.java | 3 +-
.../apache/solr/handler/RequestHandlerBase.java | 1 +
.../org/apache/solr/handler/SolrConfigHandler.java | 5 +-
.../org/apache/solr/handler/StreamHandler.java | 4 +-
.../solr/handler/admin/AdminHandlersProxy.java | 2 +
.../handler/admin/AutoscalingHistoryHandler.java | 1 +
.../solr/handler/admin/BaseHandlerApiSupport.java | 5 +-
.../apache/solr/handler/admin/ClusterStatus.java | 4 +-
.../org/apache/solr/handler/admin/ColStatus.java | 1 +
.../solr/handler/admin/CollectionsHandler.java | 12 +++-
.../solr/handler/admin/ConfigSetsHandler.java | 3 +
.../solr/handler/admin/CoreAdminOperation.java | 3 +
.../solr/handler/admin/HealthCheckHandler.java | 2 +-
.../solr/handler/admin/IndexSizeEstimator.java | 3 +
.../org/apache/solr/handler/admin/InfoHandler.java | 2 +-
.../apache/solr/handler/admin/LoggingHandler.java | 2 +
.../solr/handler/admin/LukeRequestHandler.java | 1 +
.../handler/admin/MetricsCollectorHandler.java | 2 +-
.../apache/solr/handler/admin/MetricsHandler.java | 7 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 4 ++
.../solr/handler/admin/RebalanceLeaders.java | 8 ++-
.../solr/handler/admin/SecurityConfHandler.java | 7 +-
.../solr/handler/admin/ShowFileRequestHandler.java | 2 +-
.../solr/handler/admin/SolrInfoMBeanHandler.java | 4 ++
.../org/apache/solr/handler/admin/SplitOp.java | 2 +
.../solr/handler/admin/SystemInfoHandler.java | 1 +
.../solr/handler/admin/ZookeeperInfoHandler.java | 1 +
.../solr/handler/admin/ZookeeperStatusHandler.java | 3 +-
.../handler/component/HttpShardHandlerFactory.java | 1 +
.../handler/component/RealTimeGetComponent.java | 22 ++++---
.../apache/solr/handler/loader/JavabinLoader.java | 6 +-
.../handler/BinaryUpdateRequestHandlerTest.java | 29 ++++-----
.../solr/handler/MoreLikeThisHandlerTest.java | 11 ++--
.../org/apache/solr/handler/TestCoreBackup.java | 20 +++---
.../solr/handler/XsltUpdateRequestHandlerTest.java | 7 +-
.../solr/handler/admin/CoreAdminHandlerTest.java | 4 +-
.../handler/admin/CoreAdminRequestStatusTest.java | 1 +
.../admin/CoreMergeIndexesAdminHandlerTest.java | 5 +-
.../solr/handler/admin/MetricsHandlerTest.java | 5 ++
.../handler/admin/SecurityConfHandlerTest.java | 5 +-
.../solr/handler/admin/TestCollectionAPIs.java | 10 +--
.../apache/solr/handler/admin/TestConfigsApi.java | 19 +++---
.../solr/handler/admin/TestCoreAdminApis.java | 10 +--
.../handler/admin/ZookeeperStatusHandlerTest.java | 14 +++-
.../component/QueryElevationComponentTest.java | 8 ++-
.../solr/handler/component/SearchHandlerTest.java | 74 ++++++++++++----------
.../component/TestHttpShardHandlerFactory.java | 2 +
.../component/TestTrackingShardHandlerFactory.java | 2 +
.../component/TrackingShardHandlerFactory.java | 1 +
50 files changed, 232 insertions(+), 121 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 802d7c2..c28c987 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -210,6 +210,8 @@ Other Changes
* SOLR-14526: fix or suppress warnings in apache/solr/core (Erick Erickson)
+* SOLR-14533: Fix or suppress warnings in solr/handler/admin (Andras Salamon, 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/GraphHandler.java b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
index 22c082f..76f52ca 100644
--- a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
@@ -122,7 +122,8 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
Expressible.class);
streamFactory.withFunctionName(key, clazz);
} else {
- StreamHandler.ExpressibleHolder holder = new StreamHandler.ExpressibleHolder(pluginInfo, core, SolrConfig.classVsSolrPluginInfo.get(Expressible.class));
+ @SuppressWarnings("resource")
+ StreamHandler.ExpressibleHolder holder = new StreamHandler.ExpressibleHolder(pluginInfo, core, SolrConfig.classVsSolrPluginInfo.get(Expressible.class.getName()));
streamFactory.withFunctionName(key, () -> holder.getClazz());
}
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 0cb7d58..d5d0206 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -201,6 +201,7 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
}
}
Timer.Context timer = requestTimes.time();
+ @SuppressWarnings("resource")
Timer.Context dTimer = distrib ? distribRequestTimes.time() : localRequestTimes.time();
try {
if (pluginInfo != null && pluginInfo.attributes.containsKey(USEPARAM))
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 3b20420..b10b483 100644
--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
@@ -561,7 +561,9 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
return overlay;
}
try {
- new PluginBag.RuntimeLib(req.getCore()).init(new PluginInfo(info.tag, op.getDataMap()));
+ try (PluginBag.RuntimeLib rtl = new PluginBag.RuntimeLib(req.getCore())) {
+ rtl.init(new PluginInfo(info.tag, op.getDataMap()));
+ }
} catch (Exception e) {
op.addError(e.getMessage());
log.error("can't load this plugin ", e);
@@ -599,6 +601,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
//this is not dynamically loaded so we can verify the class right away
try {
if(expected == Expressible.class) {
+ @SuppressWarnings("resource")
SolrResourceLoader resourceLoader = info.pkgName == null ?
req.getCore().getResourceLoader() :
req.getCore().getResourceLoader(info.pkgName);
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 2ea4b9c..7621a41 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -128,7 +128,8 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
List<PluginInfo> pluginInfos = core.getSolrConfig().getPluginInfos(Expressible.class.getName());
for (PluginInfo pluginInfo : pluginInfos) {
if (pluginInfo.pkgName != null) {
- ExpressibleHolder holder = new ExpressibleHolder(pluginInfo, core, SolrConfig.classVsSolrPluginInfo.get(Expressible.class));
+ @SuppressWarnings("resource")
+ ExpressibleHolder holder = new ExpressibleHolder(pluginInfo, core, SolrConfig.classVsSolrPluginInfo.get(Expressible.class.getName()));
streamFactory.withFunctionName(pluginInfo.name,
() -> holder.getClazz());
} else {
@@ -188,6 +189,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
final SolrCore core = req.getCore(); // explicit check for null core (temporary?, for tests)
+ @SuppressWarnings("resource")
ZkController zkController = core == null ? null : core.getCoreContainer().getZkController();
RequestReplicaListTransformerGenerator requestReplicaListTransformerGenerator;
if (zkController != null) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java
index 71da0e5..f1f944a 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java
@@ -69,6 +69,7 @@ public class AdminHandlersProxy {
Set<String> nodes;
String pathStr = req.getPath();
+ @SuppressWarnings({"unchecked"})
Map<String,String> paramsMap = req.getParams().toMap(new HashMap<>());
paramsMap.remove(PARAM_NODES);
SolrParams params = new MapSolrParams(paramsMap);
@@ -125,6 +126,7 @@ public class AdminHandlersProxy {
log.debug("Proxying {} request to node {}", endpoint, nodeName);
URL baseUrl = new URL(zkController.zkStateReader.getBaseUrlForNodeName(nodeName));
HttpSolrClient solr = new HttpSolrClient.Builder(baseUrl.toString()).build();
+ @SuppressWarnings({"rawtypes"})
SolrRequest proxyReq = new GenericSolrRequest(SolrRequest.METHOD.GET, endpoint, params);
HttpSolrClient.HttpUriRequestResponse proxyResp = solr.httpUriRequest(proxyReq);
return new Pair<>(proxyResp.future, solr);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
index d6464fc..5fb618e 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
@@ -100,6 +100,7 @@ public class AutoscalingHistoryHandler extends RequestHandlerBase implements Per
}
@Override
+ @SuppressWarnings({"unchecked"})
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
ModifiableSolrParams params = new ModifiableSolrParams(req.getParams());
String collection = params.get(SYSTEM_COLLECTION_PARAM, CollectionAdminParams.SYSTEM_COLL);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java b/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java
index 85033f3..d813e44 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java
@@ -132,6 +132,7 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {
/**
* Wrapper for SolrParams that wraps V2 params and exposes them as V1 params.
*/
+ @SuppressWarnings({"unchecked"})
private static void wrapParams(final SolrQueryRequest req, final CommandOperation co, final ApiCommand cmd, final boolean useRequestParams) {
final Map<String, String> pathValues = req.getPathTemplateValues();
final Map<String, Object> map = co == null || !(co.getCommandData() instanceof Map) ?
@@ -158,6 +159,7 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {
if (o == null) o = pathValues.get(param);
if (o == null && useRequestParams) o = origParams.getParams(param);
if (o instanceof List) {
+ @SuppressWarnings({"rawtypes"})
List l = (List) o;
return l.toArray(new String[l.size()]);
}
@@ -179,7 +181,7 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {
}
@Override
- public Map toMap(Map<String, Object> suppliedMap) {
+ public Map<String, Object> toMap(Map<String, Object> suppliedMap) {
for(Iterator<String> it=getParameterNamesIterator(); it.hasNext(); ) {
final String param = it.next();
String key = cmd.meta().getParamSubstitute(param);
@@ -197,6 +199,7 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {
Boolean.class.isAssignableFrom(oClass)) {
suppliedMap.put(param,String.valueOf(o));
} else if (List.class.isAssignableFrom(oClass) && ((List)o).get(0) instanceof String ) {
+ @SuppressWarnings({"unchecked"})
List<String> l = (List<String>) o;
suppliedMap.put( param, l.toArray(new String[0]));
} else {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
index 50fa95a..d502dec 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
@@ -55,7 +55,7 @@ public class ClusterStatus {
}
@SuppressWarnings("unchecked")
- public void getClusterStatus(NamedList results)
+ public void getClusterStatus(@SuppressWarnings({"rawtypes"})NamedList results)
throws KeeperException, InterruptedException {
// read aliases
Aliases aliases = zkStateReader.getAliases();
@@ -72,6 +72,7 @@ public class ClusterStatus {
}
}
+ @SuppressWarnings({"rawtypes"})
Map roles = null;
if (zkStateReader.getZkClient().exists(ZkStateReader.ROLES, true)) {
roles = (Map) Utils.fromJSON(zkStateReader.getZkClient().getData(ZkStateReader.ROLES, null, null, true));
@@ -165,6 +166,7 @@ public class ClusterStatus {
clusterStatus.add("collections", collectionProps);
// read cluster properties
+ @SuppressWarnings({"rawtypes"})
Map clusterProps = zkStateReader.getClusterProperties();
if (clusterProps != null && !clusterProps.isEmpty()) {
clusterStatus.add("properties", clusterProps);
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 aee0097..3f9cba3 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
@@ -71,6 +71,7 @@ public class ColStatus {
this.clusterState = clusterState;
}
+ @SuppressWarnings({"unchecked"})
public void getColStatus(NamedList<Object> results) {
Collection<String> collections;
String col = props.getStr(ZkStateReader.COLLECTION_PROP);
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 12dbaba..3e55fc0 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
@@ -204,7 +204,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
}
@Override
- final public void init(NamedList args) {
+ final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
}
@@ -261,6 +261,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
rsp.setHttpCaching(false);
}
+ @SuppressWarnings({"unchecked"})
void invokeAction(SolrQueryRequest req, SolrQueryResponse rsp, CoreContainer cores, CollectionAction action, CollectionOperation operation) throws Exception {
if (!coreContainer.isZooKeeperAware()) {
throw new SolrException(BAD_REQUEST,
@@ -530,6 +531,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
return copyPropertiesWithPrefix(req.getParams(), props, "router.");
}),
+ @SuppressWarnings({"unchecked"})
COLSTATUS_OP(COLSTATUS, (req, rsp, h) -> {
Map<String, Object> props = copy(req.getParams(), null,
COLLECTION_PROP,
@@ -619,6 +621,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
return null;
}),
+ @SuppressWarnings({"unchecked"})
CREATEALIAS_OP(CREATEALIAS, (req, rsp, h) -> {
String alias = req.getParams().get(NAME);
SolrIdentifierValidator.validateAliasName(alias);
@@ -633,7 +636,6 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
// we'll throw this later if we are in fact creating a routed alias.
ex = e;
}
- @SuppressWarnings("unchecked")
ModifiableSolrParams finalParams = new ModifiableSolrParams();
for (Map.Entry<String, Object> entry : possiblyModifiedParams.entrySet()) {
if (entry.getValue().getClass().isArray() ) {
@@ -721,6 +723,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
/**
* List the aliases and associated properties.
*/
+ @SuppressWarnings({"unchecked"})
LISTALIASES_OP(LISTALIASES, (req, rsp, h) -> {
ZkStateReader zkStateReader = h.coreContainer.getZkController().getZkStateReader();
// if someone calls listAliases, lets ensure we return an up to date response
@@ -868,6 +871,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
cp.setCollectionProperty(collection, name, val);
return null;
}),
+ @SuppressWarnings({"unchecked"})
REQUESTSTATUS_OP(REQUESTSTATUS, (req, rsp, h) -> {
req.getParams().required().check(REQUESTID);
@@ -968,6 +972,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
* Handle list collection request.
* Do list collection request to zk host
*/
+ @SuppressWarnings({"unchecked"})
LIST_OP(LIST, (req, rsp, h) -> {
NamedList<Object> results = new NamedList<>();
Map<String, DocCollection> collections = h.coreContainer.getZkController().getZkStateReader().getClusterState().getCollectionsMap();
@@ -1464,9 +1469,11 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
}
public static void verifyRuleParams(CoreContainer cc, Map<String, Object> m) {
+ @SuppressWarnings({"rawtypes"})
List l = (List) m.get(RULE);
if (l != null) {
for (Object o : l) {
+ @SuppressWarnings({"rawtypes"})
Map map = (Map) o;
try {
new Rule(map);
@@ -1492,6 +1499,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
val.add(v.toString());
}
if (val.size() > 0) {
+ @SuppressWarnings({"rawtypes"})
ArrayList<Map> l = new ArrayList<>();
for (String rule : val) l.add(Rule.parseRule(rule));
props.put(key, l);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
index b90daba..566a5d8 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
@@ -209,6 +209,7 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
}
}
+ @SuppressWarnings({"unchecked"})
private void handleResponse(String operation, ZkNodeProps m,
SolrQueryResponse rsp, long timeout) throws KeeperException, InterruptedException {
long time = System.nanoTime();
@@ -219,6 +220,7 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
if (event.getBytes() != null) {
SolrResponse response = OverseerSolrResponseSerializer.deserialize(event.getBytes());
rsp.getValues().addAll(response.getResponse());
+ @SuppressWarnings({"rawtypes"})
SimpleOrderedMap exp = (SimpleOrderedMap) response.getResponse().get("exception");
if (exp != null) {
Integer code = (Integer) exp.get("rspCode");
@@ -282,6 +284,7 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
return CollectionsHandler.copy(req.getParams().required(), null, NAME);
}
},
+ @SuppressWarnings({"unchecked"})
LIST_OP(LIST) {
@Override
Map<String, Object> call(SolrQueryRequest req, SolrQueryResponse rsp, ConfigSetsHandler h) throws Exception {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
index 6351326..3036ced 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java
@@ -245,6 +245,7 @@ enum CoreAdminOperation implements CoreAdminOp {
RESTORECORE_OP(RESTORECORE, new RestoreCoreOp()),
CREATESNAPSHOT_OP(CREATESNAPSHOT, new CreateSnapshotOp()),
DELETESNAPSHOT_OP(DELETESNAPSHOT, new DeleteSnapshotOp()),
+ @SuppressWarnings({"unchecked"})
LISTSNAPSHOTS_OP(LISTSNAPSHOTS, it -> {
final SolrParams params = it.req.getParams();
String cname = params.required().get(CoreAdminParams.CORE);
@@ -257,6 +258,7 @@ enum CoreAdminOperation implements CoreAdminOp {
}
SolrSnapshotMetaDataManager mgr = core.getSnapshotMetaDataManager();
+ @SuppressWarnings({"rawtypes"})
NamedList result = new NamedList();
for (String name : mgr.listSnapshots()) {
Optional<SnapshotMetaData> metadata = mgr.getSnapshotMetaData(name);
@@ -296,6 +298,7 @@ enum CoreAdminOperation implements CoreAdminOp {
* @return - a named list of key/value pairs from the core.
* @throws IOException - LukeRequestHandler can throw an I/O exception
*/
+ @SuppressWarnings({"unchecked", "rawtypes"})
static NamedList<Object> getCoreStatus(CoreContainer cores, String cname, boolean isIndexInfoNeeded) throws IOException {
NamedList<Object> info = new SimpleOrderedMap<>();
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 8dc0f79..ddf22ef 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
@@ -78,7 +78,7 @@ public class HealthCheckHandler extends RequestHandlerBase {
}
@Override
- final public void init(NamedList args) {
+ final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
}
public CoreContainer getCoreContainer() {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java b/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java
index 184da73..1bb11e7 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java
@@ -193,6 +193,7 @@ public class IndexSizeEstimator {
this.samplingPercent = percent;
}
+ @SuppressWarnings({"unchecked"})
public Estimate estimate() throws Exception {
Map<String, Object> details = new LinkedHashMap<>();
Map<String, Object> summary = new LinkedHashMap<>();
@@ -243,6 +244,7 @@ public class IndexSizeEstimator {
return new Estimate(fieldsBySize, typesBySize, withSummary ? newSummary : null, withDetails ? details : null);
}
+ @SuppressWarnings({"unchecked"})
private void convert(Map<String, Object> result) {
for (Map.Entry<String, Object> entry : result.entrySet()) {
Object value = entry.getValue();
@@ -265,6 +267,7 @@ public class IndexSizeEstimator {
}
}
+ @SuppressWarnings({"unchecked"})
private void estimateSummary(Map<String, Object> details, Map<String, Object> summary) {
log.info("- preparing summary...");
details.forEach((type, perType) -> {
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 b0c6d61..98c320e 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
@@ -56,7 +56,7 @@ public class InfoHandler extends RequestHandlerBase {
@Override
- final public void init(NamedList args) {
+ final public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
index 5cf9de0..ec27b1c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
@@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory;
public class LoggingHandler extends RequestHandlerBase implements SolrCoreAware {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ @SuppressWarnings({"rawtypes"})
private LogWatcher watcher;
public LoggingHandler(CoreContainer cc) {
@@ -139,6 +140,7 @@ public class LoggingHandler extends RequestHandlerBase implements SolrCoreAware
else {
rsp.add("levels", watcher.getAllLevels());
+ @SuppressWarnings({"unchecked"})
List<LoggerInfo> loggers = new ArrayList<>(watcher.getAllLoggers());
Collections.sort(loggers);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
index 49f0b28..5bb122f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
@@ -750,6 +750,7 @@ public class LukeRequestHandler extends RequestHandlerBase
/**
* Private internal class that counts up frequent terms
*/
+ @SuppressWarnings("rawtypes")
private static class TopTermQueue extends PriorityQueue
{
static class TermInfo {
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 b98ec02..c017f15 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(NamedList initArgs) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList initArgs) {
super.init(initArgs);
if (initArgs != null) {
params = initArgs.toSolrParams();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
index f3b20ad..e6d8017 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
@@ -103,6 +103,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
handleRequest(req.getParams(), (k, v) -> rsp.add(k, v));
}
+ @SuppressWarnings({"unchecked"})
public void handleRequest(SolrParams params, BiConsumer<String, Object> consumer) throws Exception {
boolean compact = params.getBool(COMPACT_PARAM, true);
String[] keys = params.getParams(KEY_PARAM);
@@ -116,9 +117,11 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
List<MetricFilter> metricFilters = metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
Set<String> requestedRegistries = parseRegistries(params);
+ @SuppressWarnings({"rawtypes"})
NamedList response = new SimpleOrderedMap();
for (String registryName : requestedRegistries) {
MetricRegistry registry = metricManager.registry(registryName);
+ @SuppressWarnings({"rawtypes"})
SimpleOrderedMap result = new SimpleOrderedMap();
MetricUtils.toMaps(registry, metricFilters, mustMatchFilter, propertyFilter, false,
false, compact, false, (k, v) -> result.add(k, v));
@@ -129,6 +132,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
consumer.accept("metrics", response);
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void handleKeyRequest(String[] keys, BiConsumer<String, Object> consumer) throws Exception {
SimpleOrderedMap result = new SimpleOrderedMap();
SimpleOrderedMap errors = new SimpleOrderedMap();
@@ -345,9 +349,10 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
public static final String SUPPORTED_TYPES_MSG = EnumSet.allOf(MetricType.class).toString();
+ @SuppressWarnings({"rawtypes"})
private final Class klass;
- MetricType(Class klass) {
+ MetricType(@SuppressWarnings({"rawtypes"})Class klass) {
this.klass = klass;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
index ad0a266..5c475a1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
@@ -185,6 +185,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
}
// override from ZK if available
if (cloudManager != null) {
+ @SuppressWarnings({"unchecked"})
Map<String, Object> props = (Map<String, Object>)cloudManager.getClusterStateProvider()
.getClusterProperty("metrics", Collections.emptyMap())
.getOrDefault("history", Collections.emptyMap());
@@ -379,6 +380,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
ExecutorUtil.setServerThreadFlag(false);
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void collectLocalReplicaMetrics() {
List<Group> groups = new ArrayList<>();
if (enableNodes) {
@@ -800,6 +802,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
rsp.getResponseHeader().add("zkConnected", cloudManager != null);
}
+ @SuppressWarnings({"unchecked"})
private NamedList<Object> handleRemoteRequest(String nodeName, SolrQueryRequest req) {
String baseUrl = Utils.getBaseUrlForNodeName(nodeName, overseerUrlScheme);
String url;
@@ -827,6 +830,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
}
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void mergeRemoteRes(SolrQueryResponse rsp, NamedList<Object> remoteRes) {
if (remoteRes == null || remoteRes.get("metrics") == null) {
return;
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
index 10a455f..81900c3 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
@@ -110,6 +110,7 @@ class RebalanceLeaders {
final static String INACTIVE_PREFERREDS = "inactivePreferreds";
final static String ALREADY_LEADERS = "alreadyLeaders";
final static String SUMMARY = "Summary";
+ @SuppressWarnings({"rawtypes"})
final SimpleOrderedMap results = new SimpleOrderedMap();
final Map<String, String> pendingOps = new HashMap<>();
private String collectionName;
@@ -122,6 +123,7 @@ class RebalanceLeaders {
coreContainer = collectionsHandler.getCoreContainer();
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
void execute() throws KeeperException, InterruptedException {
DocCollection dc = checkParams();
@@ -286,6 +288,7 @@ class RebalanceLeaders {
// Provide some feedback to the user about what actually happened, or in this case where no action was
// possible
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void addInactiveToResults(Slice slice, Replica replica) {
SimpleOrderedMap inactives = (SimpleOrderedMap) results.get(INACTIVE_PREFERREDS);
if (inactives == null) {
@@ -300,6 +303,7 @@ class RebalanceLeaders {
// Provide some feedback to the user about what actually happened, or in this case where no action was
// necesary since this preferred replica was already the leader
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void addAlreadyLeaderToResults(Slice slice, Replica replica) {
SimpleOrderedMap alreadyLeaders = (SimpleOrderedMap) results.get(ALREADY_LEADERS);
if (alreadyLeaders == null) {
@@ -458,6 +462,7 @@ class RebalanceLeaders {
}
// If we actually changed the leader, we should send that fact back in the response.
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void addToSuccesses(Slice slice, Replica replica) {
SimpleOrderedMap successes = (SimpleOrderedMap) results.get("successes");
if (successes == null) {
@@ -476,7 +481,8 @@ class RebalanceLeaders {
// If for any reason we were supposed to change leadership, that should be recorded in changingLeaders. Any
// time we verified that the change actually occurred, that entry should have been removed. So report anything
// left over as a failure.
- private void addAnyFailures() {
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ private void addAnyFailures() {
if (pendingOps.size() == 0) {
return;
}
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 aff30a4..f590bf3 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,6 +86,7 @@ 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;
@@ -156,14 +157,16 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
protected abstract void getConf(SolrQueryResponse rsp, String key);
public static Map<String, Object> getMapValue(Map<String, Object> lookupMap, String key) {
+ @SuppressWarnings({"unchecked"})
Map<String, Object> m = (Map<String, Object>) lookupMap.get(key);
if (m == null) lookupMap.put(key, m = new LinkedHashMap<>());
return m;
}
+ @SuppressWarnings({"rawtypes"})
public static List getListValue(Map<String, Object> lookupMap, String key) {
List l = (List) lookupMap.get(key);
- if (l == null) lookupMap.put(key, l= new ArrayList());
+ if (l == null) lookupMap.put(key, l= new ArrayList<>());
return l;
}
@@ -193,6 +196,7 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
* The data object defaults to EMPTY_MAP if not set
*/
public static class SecurityConfig {
+ @SuppressWarnings({"unchecked"})
private Map<String, Object> data = Collections.EMPTY_MAP;
private int version = -1;
@@ -213,6 +217,7 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
* @param data an Object of type Map<String,Object>
* @return SecurityConf object (builder pattern)
*/
+ @SuppressWarnings({"unchecked"})
public SecurityConfig setData(Object data) {
if (data instanceof Map) {
this.data = (Map<String, Object>) data;
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 d3f3f8c..a000290 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(NamedList args) {
+ public void init(@SuppressWarnings({"rawtypes"})NamedList args) {
super.init( args );
hiddenFiles = initHidden(invariants);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
index f9a3c05..26c5ff4 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
@@ -184,6 +184,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {
// System.out.println( "NOW: " + now_txt );
// Calculate the differences
+ @SuppressWarnings({"rawtypes"})
NamedList diff = diffNamedList(ref_bean,now_bean);
diff.add( "_changed_", true ); // flag the changed thing
cat.add(name, diff);
@@ -204,6 +205,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {
return changed;
}
+ @SuppressWarnings({"rawtypes"})
public NamedList diffNamedList(NamedList ref, NamedList now) {
NamedList out = new SimpleOrderedMap();
for(int i=0; i<ref.size(); i++) {
@@ -232,6 +234,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {
return out;
}
+ @SuppressWarnings({"rawtypes"})
public Object diffObject(Object ref, Object now) {
if (now instanceof Map) {
now = new NamedList((Map)now);
@@ -272,6 +275,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {
/**
* The 'avgRequestsPerSecond' field will make everything look like it changed
*/
+ @SuppressWarnings({"rawtypes"})
public NamedList normalize(NamedList input) {
input.remove("avgRequestsPerSecond");
for(int i=0; i<input.size(); i++) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
index ad77fb1..965168f 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java
@@ -129,6 +129,7 @@ class SplitOp implements CoreAdminHandler.CoreAdminOp {
}
Object routerObj = collection.get(DOC_ROUTER); // for back-compat with Solr 4.4
if (routerObj instanceof Map) {
+ @SuppressWarnings({"rawtypes"})
Map routerProps = (Map) routerObj;
routeFieldName = (String) routerProps.get("field");
}
@@ -221,6 +222,7 @@ class SplitOp implements CoreAdminHandler.CoreAdminOp {
Object routerObj = collection.get(DOC_ROUTER); // for back-compat with Solr 4.4
if (routerObj instanceof Map) {
+ @SuppressWarnings({"rawtypes"})
Map routerProps = (Map) routerObj;
routeFieldName = (String) routerProps.get("field");
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
index 3aa31ce..9c4828c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
@@ -339,6 +339,7 @@ public class SystemInfoHandler extends RequestHandlerBase
info.add("username", username);
// Mapped roles for this principal
+ @SuppressWarnings("resource")
AuthorizationPlugin auth = cc==null? null: cc.getAuthorizationPlugin();
if (auth != null) {
RuleBasedAuthorizationPluginBase rbap = (RuleBasedAuthorizationPluginBase) auth;
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
index f25d9e7..5d18b36 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
@@ -353,6 +353,7 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {
private PagedCollectionSupport pagingSupport;
@Override
+ @SuppressWarnings({"unchecked"})
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
final SolrParams params = req.getParams();
Map<String, String> map = new HashMap<>(1);
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
index 254565e..58d827c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
@@ -73,8 +73,8 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {
return Category.ADMIN;
}
- @SuppressWarnings("rawtypes")
@Override
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
NamedList values = rsp.getValues();
if (cores.isZooKeeperAware()) {
@@ -94,6 +94,7 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {
* @param zkDynamicConfig list of zk dynamic config objects
* @return map of zookeeper config and status per zk host
*/
+ @SuppressWarnings({"unchecked"})
protected Map<String, Object> getZkStatus(String zkHost, ZkDynamicConfig zkDynamicConfig) {
final ZkDynamicConfig hostsFromConnectionString = ZkDynamicConfig.fromZkConnectString(zkHost);
final ZkDynamicConfig zookeepers;
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 3dde83f..a4e3c1b 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
@@ -396,6 +396,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req) {
final SolrParams params = req.getParams();
final SolrCore core = req.getCore(); // explicit check for null core (temporary?, for tests)
+ @SuppressWarnings("resource")
ZkController zkController = core == null ? null : core.getCoreContainer().getZkController();
if (zkController != null) {
return requestReplicaListTransformerGenerator.getReplicaListTransformer(
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 3c4d472..e06b02d 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1116,9 +1116,12 @@ public class RealTimeGetComponent extends SearchComponent
}
public void processSyncWithLeader(ResponseBuilder rb, int nVersions, String syncWithLeader, List<Long> versions) {
- PeerSyncWithLeader peerSync = new PeerSyncWithLeader(rb.req.getCore(), syncWithLeader, nVersions);
- boolean success = peerSync.sync(versions).isSuccess();
- rb.rsp.add("syncWithLeader", success);
+ try (PeerSyncWithLeader peerSync = new PeerSyncWithLeader(rb.req.getCore(), syncWithLeader, nVersions)) {
+ boolean success = peerSync.sync(versions).isSuccess();
+ rb.rsp.add("syncWithLeader", success);
+ } catch (IOException e) {
+ log.error("Error while closing", e);
+ }
}
@@ -1137,12 +1140,13 @@ public class RealTimeGetComponent extends SearchComponent
List<String> replicas = StrUtils.splitSmart(sync, ",", true);
boolean cantReachIsSuccess = rb.req.getParams().getBool("cantReachIsSuccess", false);
-
- PeerSync peerSync = new PeerSync(rb.req.getCore(), replicas, nVersions, cantReachIsSuccess);
- boolean success = peerSync.sync().isSuccess();
-
- // TODO: more complex response?
- rb.rsp.add("sync", success);
+ try (PeerSync peerSync = new PeerSync(rb.req.getCore(), replicas, nVersions, cantReachIsSuccess)) {
+ boolean success = peerSync.sync().isSuccess();
+ // TODO: more complex response?
+ rb.rsp.add("sync", success);
+ } catch (IOException e) {
+ log.error("Error while closing", e);
+ }
}
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
index aa4b4f9..5671359 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
@@ -133,7 +133,7 @@ public class JavabinLoader extends ContentStreamLoader {
throws IOException {
FastInputStream in = FastInputStream.wrap(stream);
SolrParams old = req.getParams();
- new JavaBinCodec() {
+ try (JavaBinCodec jbc = new JavaBinCodec() {
SolrParams params;
AddUpdateCommand addCmd = null;
@@ -164,7 +164,9 @@ public class JavabinLoader extends ContentStreamLoader {
return Collections.emptyList();
}
- }.unmarshal(in);
+ }) {
+ jbc.unmarshal(in);
+ }
}
private AddUpdateCommand getAddCommand(SolrQueryRequest req, SolrParams params) {
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 0c02109..5396165 100644
--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java
@@ -53,21 +53,18 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {
BinaryRequestWriter brw = new BinaryRequestWriter();
BufferingRequestProcessor p = new BufferingRequestProcessor(null);
SolrQueryResponse rsp = new SolrQueryResponse();
- UpdateRequestHandler handler = new UpdateRequestHandler();
- handler.init(new NamedList());
- SolrQueryRequest req = req();
- ContentStreamLoader csl = handler.newLoader(req, p);
-
- RequestWriter.ContentWriter cw = brw.getContentWriter(ureq);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- cw.write(baos);
- ContentStreamBase.ByteArrayStream cs = new ContentStreamBase.ByteArrayStream(baos.toByteArray(), null, "application/javabin");
- csl.load(req, rsp, cs, p);
- AddUpdateCommand add = p.addCommands.get(0);
- System.out.println(add.solrDoc);
- assertEquals(false, add.overwrite);
- assertEquals(100, add.commitWithin);
-
- req.close();
+ try (SolrQueryRequest req = req(); UpdateRequestHandler handler = new UpdateRequestHandler()) {
+ handler.init(new NamedList());
+ ContentStreamLoader csl = handler.newLoader(req, p);
+ RequestWriter.ContentWriter cw = brw.getContentWriter(ureq);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ cw.write(baos);
+ ContentStreamBase.ByteArrayStream cs = new ContentStreamBase.ByteArrayStream(baos.toByteArray(), null, "application/javabin");
+ csl.load(req, rsp, cs, p);
+ AddUpdateCommand add = p.addCommands.get(0);
+ System.out.println(add.solrDoc);
+ assertEquals(false, add.overwrite);
+ assertEquals(100, add.commitWithin);
+ }
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
index 6b80014..05f83d8 100644
--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
@@ -43,8 +43,7 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
public void testInterface() throws Exception
{
SolrCore core = h.getCore();
- MoreLikeThisHandler mlt = new MoreLikeThisHandler();
-
+
ModifiableSolrParams params = new ModifiableSolrParams();
assertU(adoc("id","42","name","Tom Cruise","subword","Top Gun","subword","Risky Business","subword","The Color of Money","subword","Minority Report","subword", "Days of Thunder","subword", "Eyes Wide Shut","subword", "Far and Away", "foo_ti","10"));
@@ -63,7 +62,8 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
// requires 'q' or a single content stream
SolrException ex = expectThrows(SolrException.class, () -> {
- try (SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {}) {
+ try (MoreLikeThisHandler mlt = new MoreLikeThisHandler();
+ SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {}) {
mlt.handleRequestBody(req, new SolrQueryResponse());
}
});
@@ -72,7 +72,8 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
// requires a single content stream (more than one is not supported).
ex = expectThrows(SolrException.class, () -> {
- try (SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {}) {
+ try (MoreLikeThisHandler mlt = new MoreLikeThisHandler();
+ SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {}) {
ArrayList<ContentStream> streams = new ArrayList<>(2);
streams.add(new ContentStreamBase.StringStream("hello"));
streams.add(new ContentStreamBase.StringStream("there"));
@@ -153,8 +154,6 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
public void testMultifieldSimilarity() throws Exception
{
SolrCore core = h.getCore();
- MoreLikeThisHandler mlt = new MoreLikeThisHandler();
-
ModifiableSolrParams params = new ModifiableSolrParams();
assertU(adoc("id", "1", "name", "aaa bbb ccc", "subword", " zzz"));
diff --git a/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java b/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
index 407ef46..57f03f7 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestCoreBackup.java
@@ -63,14 +63,15 @@ public class TestCoreBackup extends SolrTestCaseJ4 {
String snapshotName = TestUtil.randomSimpleString(random(), 1, 5);
final CoreContainer cores = h.getCoreContainer();
- final CoreAdminHandler admin = new CoreAdminHandler(cores);
- SolrQueryResponse resp = new SolrQueryResponse();
- admin.handleRequestBody
- (req(CoreAdminParams.ACTION, CoreAdminParams.CoreAdminAction.BACKUPCORE.toString(),
- "core", DEFAULT_TEST_COLLECTION_NAME, "name", snapshotName, "location", location)
- , resp);
- assertNull("Backup should have succeeded", resp.getException());
- simpleBackupCheck(new File(location, "snapshot." + snapshotName), 2);
+ try (final CoreAdminHandler admin = new CoreAdminHandler(cores)) {
+ SolrQueryResponse resp = new SolrQueryResponse();
+ admin.handleRequestBody
+ (req(CoreAdminParams.ACTION, CoreAdminParams.CoreAdminAction.BACKUPCORE.toString(),
+ "core", DEFAULT_TEST_COLLECTION_NAME, "name", snapshotName, "location", location)
+ , resp);
+ assertNull("Backup should have succeeded", resp.getException());
+ simpleBackupCheck(new File(location, "snapshot." + snapshotName), 2);
+ }
}
public void testBackupBeforeFirstCommit() throws Exception {
@@ -169,6 +170,7 @@ public class TestCoreBackup extends SolrTestCaseJ4 {
0, initialEmptyIndexSegmentFileName);
}
+ admin.close();
}
/**
@@ -291,7 +293,7 @@ public class TestCoreBackup extends SolrTestCaseJ4 {
1, oneDocSegmentFile);
}
-
+ admin.close();
}
/**
diff --git a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
index fb7bd19..8e3f419 100644
--- a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
@@ -77,9 +77,10 @@ public class XsltUpdateRequestHandlerTest extends SolrTestCaseJ4 {
streams.add(new ContentStreamBase.StringStream(xml));
req.setContentStreams(streams);
SolrQueryResponse rsp = new SolrQueryResponse();
- UpdateRequestHandler handler = new UpdateRequestHandler();
- handler.init(new NamedList<String>());
- handler.handleRequestBody(req, rsp);
+ try (UpdateRequestHandler handler = new UpdateRequestHandler()) {
+ handler.init(new NamedList<String>());
+ handler.handleRequestBody(req, rsp);
+ }
StringWriter sw = new StringWriter(32000);
QueryResponseWriter responseWriter = core.getQueryResponseWriter(req);
responseWriter.write(sw,req,rsp);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
index eb3d1eb..c20e42d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
@@ -117,6 +117,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
// Should have segments in the directory pointed to by the ${DATA_TEST}.
File test = new File(dataDir, "index");
assertTrue("Should have found index dir at " + test.getAbsolutePath(), test.exists());
+ admin.close();
}
@Test
@@ -243,7 +244,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
assertNotNull("Core should have been renamed!", cd);
// :TODO: because of SOLR-3665 we can't ask for status from all cores
-
+ admin.close();
}
@Test
@@ -417,5 +418,6 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
, resp);
});
assertEquals("Expected error message for non-existent core.", "Missing required parameter: core", e.getMessage());
+ admin.close();
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
index 9c7ce70..4152d37 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
@@ -97,6 +97,7 @@ public class CoreAdminRequestStatusTest extends SolrTestCaseJ4{
"notfound", resp.getValues().get("STATUS"));
admin.shutdown();
+ admin.close();
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
index d593b73..6fdccc7 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
@@ -75,9 +75,8 @@ public class CoreMergeIndexesAdminHandlerTest extends SolrTestCaseJ4 {
final CoreContainer cores = h.getCoreContainer();
- final CoreAdminHandler admin = new CoreAdminHandler(cores);
-
- try (SolrCore core = cores.getCore("collection1")) {
+ try (final CoreAdminHandler admin = new CoreAdminHandler(cores);
+ SolrCore core = cores.getCore("collection1")) {
DirectoryFactory df = core.getDirectoryFactory();
FailingDirectoryFactory dirFactory = (FailingDirectoryFactory) df;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index 3b52568..ea3ebc1 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -198,6 +198,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
assertNotNull(values.get("metrics"));
SimpleOrderedMap map = (SimpleOrderedMap) values.get("metrics");
assertEquals(0, map.size());
+ handler.close();
}
@Test
@@ -214,6 +215,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
Object o = nl.get("SEARCHER.new.errors");
assertNotNull(o); // counter type
assertTrue(o instanceof Number);
+ handler.close();
}
@Test
@@ -253,6 +255,7 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
assertNotNull(map.get("inserts"));
assertNotNull(map.get("size"));
});
+ handler.close();
}
@Test
@@ -338,6 +341,8 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
metrics = (NamedList) values.get("metrics");
assertEquals(0, metrics.size());
assertNotNull(values.findRecursive("errors", "solr.jetty:unknown:baz"));
+
+ handler.close();
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
index f11f9e4..2b92462 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
@@ -176,6 +176,7 @@ public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
handler.handleRequestBody(req, rsp);
List l = (List) ((Map) ((List)rsp.getValues().get("errorMessages")).get(0)).get("errorMessages");
assertEquals(1, l.size());
+ handler.close();
}
@@ -267,7 +268,9 @@ public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
public static void main(String[] args) throws Exception{
- System.out.println(new MockSecurityHandler().getStandardJson());
+ try (MockSecurityHandler msh = new MockSecurityHandler()) {
+ System.out.println(msh.getStandardJson());
+ }
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
index e2e0cad..a646912 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
@@ -79,10 +79,12 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
}
public void testCommands() throws Exception {
- MockCollectionsHandler collectionsHandler = new MockCollectionsHandler();
- ApiBag apiBag = new ApiBag(false);
- Collection<Api> apis = collectionsHandler.getApis();
- for (Api api : apis) apiBag.register(api, Collections.emptyMap());
+ ApiBag apiBag;
+ try (MockCollectionsHandler collectionsHandler = new MockCollectionsHandler()) {
+ apiBag = new ApiBag(false);
+ Collection<Api> apis = collectionsHandler.getApis();
+ for (Api api : apis) apiBag.register(api, Collections.emptyMap());
+ }
//test a simple create collection call
compareOutput(apiBag, "/collections", POST,
"{create:{name:'newcoll', config:'schemaless', numShards:2, replicationFactor:2 }}", null,
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
index c0c193d..8360aef 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
@@ -38,7 +38,7 @@ public class TestConfigsApi extends SolrTestCaseJ4 {
public void testCommands() throws Exception {
- ConfigSetsHandler handler = new ConfigSetsHandler(null) {
+ try (ConfigSetsHandler handler = new ConfigSetsHandler(null) {
@Override
protected void sendToZk(SolrQueryResponse rsp,
ConfigSetOperation operation,
@@ -47,13 +47,14 @@ public class TestConfigsApi extends SolrTestCaseJ4 {
result.put(QUEUE_OPERATION, operation.action.toLower());
rsp.add(ZkNodeProps.class.getName(), new ZkNodeProps(result));
}
- };
- ApiBag apiBag = new ApiBag(false);
- for (Api api : handler.getApis()) apiBag.register(api, EMPTY_MAP);
- compareOutput(apiBag, "/cluster/configs/sample", DELETE, null, null,
- "{name :sample, operation:delete}");
-
- compareOutput(apiBag, "/cluster/configs", POST, "{create:{name : newconf, baseConfigSet: sample }}", null,
- "{operation:create, name :newconf, baseConfigSet: sample, immutable: false }");
+ }) {
+ ApiBag apiBag = new ApiBag(false);
+ for (Api api : handler.getApis()) apiBag.register(api, EMPTY_MAP);
+ compareOutput(apiBag, "/cluster/configs/sample", DELETE, null, null,
+ "{name :sample, operation:delete}");
+
+ compareOutput(apiBag, "/cluster/configs", POST, "{create:{name : newconf, baseConfigSet: sample }}", null,
+ "{operation:create, name :newconf, baseConfigSet: sample, immutable: false }");
+ }
}
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
index 2919b1c..31d8b5c 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
@@ -39,10 +39,12 @@ public class TestCoreAdminApis extends SolrTestCaseJ4 {
Map<String, Object[]> calls = new HashMap<>();
CoreContainer mockCC = getCoreContainerMock(calls, new HashMap<>());
- CoreAdminHandler coreAdminHandler = new CoreAdminHandler(mockCC);
- ApiBag apiBag = new ApiBag(false);
- for (Api api : coreAdminHandler.getApis()) {
- apiBag.register(api, Collections.EMPTY_MAP);
+ ApiBag apiBag;
+ try (CoreAdminHandler coreAdminHandler = new CoreAdminHandler(mockCC)) {
+ apiBag = new ApiBag(false);
+ for (Api api : coreAdminHandler.getApis()) {
+ apiBag.register(api, Collections.EMPTY_MAP);
+ }
}
TestCollectionAPIs.makeCall(apiBag, "/cores", SolrRequest.METHOD.POST,
"{create:{name: hello, instanceDir : someDir, schema: 'schema.xml'}}", mockCC);
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
index 1363048..0ef3532 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
@@ -157,13 +157,21 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
@Test(expected = SolrException.class)
public void validateNotWhitelisted() {
- new ZookeeperStatusHandler(null).validateZkRawResponse(Collections.singletonList("mntr is not executed because it is not in the whitelist."),
- "zoo1:2181", "mntr");
+ try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
+ zsh.validateZkRawResponse(Collections.singletonList("mntr is not executed because it is not in the whitelist."),
+ "zoo1:2181", "mntr");
+ } catch (IOException e) {
+ fail("Error closing ZookeeperStatusHandler");
+ }
}
@Test(expected = SolrException.class)
public void validateEmptyResponse() {
- new ZookeeperStatusHandler(null).validateZkRawResponse(Collections.emptyList(), "zoo1:2181", "mntr");
+ try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
+ zsh.validateZkRawResponse(Collections.emptyList(), "zoo1:2181", "mntr");
+ } catch (IOException e) {
+ fail("Error closing ZookeeperStatusHandler");
+ }
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
index a90527b..3977efc 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
@@ -384,14 +384,16 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
args.add(QueryElevationComponent.FIELD_TYPE, "string");
args.add(QueryElevationComponent.CONFIG_FILE, "elevate.xml");
+ IndexReader reader;
+ try (SolrQueryRequest req = req()) {
+ reader = req.getSearcher().getIndexReader();
+ }
+
QueryElevationComponent comp = new QueryElevationComponent();
comp.init(args);
comp.inform(core);
- SolrQueryRequest req = req();
- IndexReader reader = req.getSearcher().getIndexReader();
QueryElevationComponent.ElevationProvider elevationProvider = comp.getElevationProvider(reader, core);
- req.close();
// Make sure the boosts loaded properly
assertEquals(11, elevationProvider.size());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index c8289bd..f0b2973 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.component;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -45,8 +46,6 @@ public class SearchHandlerTest extends SolrTestCaseJ4
initCore("solrconfig.xml","schema.xml");
}
-
- @SuppressWarnings("unchecked")
@Test
public void testInitialization()
{
@@ -57,15 +56,18 @@ public class SearchHandlerTest extends SolrTestCaseJ4
List<String> names0 = new ArrayList<>();
names0.add( MoreLikeThisComponent.COMPONENT_NAME );
- NamedList args = new NamedList();
+ NamedList<List<String>> args = new NamedList<>();
args.add( SearchHandler.INIT_COMPONENTS, names0 );
- SearchHandler handler = new SearchHandler();
- handler.init( args );
- handler.inform( core );
-
- assertEquals( 1, handler.getComponents().size() );
- assertEquals( core.getSearchComponent( MoreLikeThisComponent.COMPONENT_NAME ),
- handler.getComponents().get( 0 ) );
+ try (SearchHandler handler = new SearchHandler()) {
+ handler.init(args);
+ handler.inform(core);
+
+ assertEquals(1, handler.getComponents().size());
+ assertEquals(core.getSearchComponent(MoreLikeThisComponent.COMPONENT_NAME),
+ handler.getComponents().get(0));
+ } catch (IOException e) {
+ fail("IOExcepiton closing SearchHandler");
+ }
// Build an explicit list that includes the debug comp.
//-----------------------------------------------
@@ -74,19 +76,22 @@ public class SearchHandlerTest extends SolrTestCaseJ4
names0.add( DebugComponent.COMPONENT_NAME );
names0.add( MoreLikeThisComponent.COMPONENT_NAME );
- args = new NamedList();
+ args = new NamedList<>();
args.add( SearchHandler.INIT_COMPONENTS, names0 );
- handler = new SearchHandler();
- handler.init( args );
- handler.inform( core );
-
- assertEquals( 3, handler.getComponents().size() );
- assertEquals( core.getSearchComponent( FacetComponent.COMPONENT_NAME ),
- handler.getComponents().get( 0 ) );
- assertEquals( core.getSearchComponent( DebugComponent.COMPONENT_NAME ),
- handler.getComponents().get( 1 ) );
- assertEquals( core.getSearchComponent( MoreLikeThisComponent.COMPONENT_NAME ),
- handler.getComponents().get( 2 ) );
+ try (SearchHandler handler = new SearchHandler()) {
+ handler.init(args);
+ handler.inform(core);
+
+ assertEquals(3, handler.getComponents().size());
+ assertEquals(core.getSearchComponent(FacetComponent.COMPONENT_NAME),
+ handler.getComponents().get(0));
+ assertEquals(core.getSearchComponent(DebugComponent.COMPONENT_NAME),
+ handler.getComponents().get(1));
+ assertEquals(core.getSearchComponent(MoreLikeThisComponent.COMPONENT_NAME),
+ handler.getComponents().get(2));
+ } catch (IOException e) {
+ fail("Exception when closing SearchHandler");
+ }
// First/Last list
@@ -97,19 +102,22 @@ public class SearchHandlerTest extends SolrTestCaseJ4
List<String> names1 = new ArrayList<>();
names1.add( FacetComponent.COMPONENT_NAME );
- args = new NamedList();
+ args = new NamedList<>();
args.add( SearchHandler.INIT_FIRST_COMPONENTS, names0 );
args.add( SearchHandler.INIT_LAST_COMPONENTS, names1 );
- handler = new SearchHandler();
- handler.init( args );
- handler.inform( core );
-
- List<SearchComponent> comps = handler.getComponents();
- assertEquals( 2+handler.getDefaultComponents().size(), comps.size() );
- assertEquals( core.getSearchComponent( MoreLikeThisComponent.COMPONENT_NAME ), comps.get( 0 ) );
- assertEquals( core.getSearchComponent( FacetComponent.COMPONENT_NAME ), comps.get( comps.size()-2 ) );
- //Debug component is always last in this case
- assertEquals( core.getSearchComponent( DebugComponent.COMPONENT_NAME ), comps.get( comps.size()-1 ) );
+ try (SearchHandler handler = new SearchHandler()) {
+ handler.init(args);
+ handler.inform(core);
+
+ List<SearchComponent> comps = handler.getComponents();
+ assertEquals(2 + handler.getDefaultComponents().size(), comps.size());
+ assertEquals(core.getSearchComponent(MoreLikeThisComponent.COMPONENT_NAME), comps.get(0));
+ assertEquals(core.getSearchComponent(FacetComponent.COMPONENT_NAME), comps.get(comps.size() - 2));
+ //Debug component is always last in this case
+ assertEquals(core.getSearchComponent(DebugComponent.COMPONENT_NAME), comps.get(comps.size() - 1));
+ } catch (IOException e) {
+ fail("Exception when closing SearchHandler");
+ }
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
index f486dbd..5380a32 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java
@@ -79,6 +79,7 @@ public class TestHttpShardHandlerFactory extends SolrTestCaseJ4 {
// test that factory is HttpShardHandlerFactory with expected url reserve fraction
assertTrue(factory instanceof HttpShardHandlerFactory);
+ @SuppressWarnings("resource")
final HttpShardHandlerFactory httpShardHandlerFactory = ((HttpShardHandlerFactory)factory);
assertEquals(expectedLoadBalancerRequestsMinimumAbsolute, httpShardHandlerFactory.permittedLoadBalancerRequestsMinimumAbsolute, 0.0);
assertEquals(expectedLoadBalancerRequestsMaximumFraction, httpShardHandlerFactory.permittedLoadBalancerRequestsMaximumFraction, 0.0);
@@ -122,6 +123,7 @@ public class TestHttpShardHandlerFactory extends SolrTestCaseJ4 {
cc = CoreContainer.createAndLoad(home, home.resolve("solr.xml"));
factory = cc.getShardHandlerFactory();
assertTrue(factory instanceof HttpShardHandlerFactory);
+ @SuppressWarnings("resource")
final HttpShardHandlerFactory httpShardHandlerFactory = ((HttpShardHandlerFactory)factory);
assertThat(httpShardHandlerFactory.getWhitelistHostChecker().getWhitelistHosts().size(), is(2));
assertThat(httpShardHandlerFactory.getWhitelistHostChecker().getWhitelistHosts(), hasItem("abc:8983"));
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
index 6a87bd7..6136969 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java
@@ -61,6 +61,7 @@ public class TestTrackingShardHandlerFactory extends AbstractFullDistribZkTestBa
CoreContainer container = runner.getCoreContainer();
ShardHandlerFactory factory = container.getShardHandlerFactory();
assert factory instanceof TrackingShardHandlerFactory;
+ @SuppressWarnings("resource")
TrackingShardHandlerFactory trackingShardHandlerFactory = (TrackingShardHandlerFactory) factory;
assertSame(trackingQueue, trackingShardHandlerFactory.getTrackingQueue());
}
@@ -116,6 +117,7 @@ public class TestTrackingShardHandlerFactory extends AbstractFullDistribZkTestBa
CoreContainer container = runner.getCoreContainer();
ShardHandlerFactory factory = container.getShardHandlerFactory();
assert factory instanceof TrackingShardHandlerFactory;
+ @SuppressWarnings("resource")
TrackingShardHandlerFactory trackingShardHandlerFactory = (TrackingShardHandlerFactory) factory;
assertFalse(trackingShardHandlerFactory.isTracking());
}
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 4b8c1d4..75c8345 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
@@ -218,6 +218,7 @@ public class TrackingShardHandlerFactory extends HttpShardHandlerFactory {
ShardHandlerFactory factory = container.getShardHandlerFactory();
assert factory instanceof TrackingShardHandlerFactory : "not a TrackingShardHandlerFactory: "
+ factory.getClass();
+ @SuppressWarnings("resource")
TrackingShardHandlerFactory trackingShardHandlerFactory = (TrackingShardHandlerFactory) factory;
trackingShardHandlerFactory.setTrackingQueue(queue);
}