You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/06/30 08:21:41 UTC
[lucene-solr] branch jira/solr-14599_1 updated: SOLR-14599: Fixing
warnings
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-14599_1
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-14599_1 by this push:
new aa65c9f SOLR-14599: Fixing warnings
aa65c9f is described below
commit aa65c9fe8878678135bafcaf53e5baef41a2d4aa
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Jun 30 13:51:28 2020 +0530
SOLR-14599: Fixing warnings
---
.../apache/solr/packagemanager/PackageManager.java | 32 ++++++++++++----------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
index ca576ed..45e803d 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
@@ -155,7 +155,6 @@ public class PackageManager implements Closeable {
packagePlugins.put(packageName, pluginMeta);
}
}
- if (packageVersions == null) return Collections.emptyMap();
Map<String, SolrPackageInstance> ret = new HashMap<>();
for (String packageName: packageVersions.keySet()) {
if (Strings.isNullOrEmpty(packageName) == false && // There can be an empty key, storing the version here
@@ -180,7 +179,6 @@ public class PackageManager implements Closeable {
}
}
- @SuppressWarnings({"unchecked"})
private boolean deployPackage(SolrPackageInstance packageInstance, boolean pegToLatest, boolean isUpdate, boolean noprompt,
List<String> collections, boolean shouldDeployClusterPlugins, String[] overrides) {
@@ -232,7 +230,8 @@ public class PackageManager implements Closeable {
// Get package params
try {
- boolean packageParamsExist = ((Map)PackageUtils.getJson(solrClient.getHttpClient(), solrBaseUrl + PackageUtils.getCollectionParamsPath(collection) + "/packages", Map.class)
+ @SuppressWarnings("unchecked")
+ boolean packageParamsExist = ((Map<Object, Object>)PackageUtils.getJson(solrClient.getHttpClient(), solrBaseUrl + PackageUtils.getCollectionParamsPath(collection) + "/packages", Map.class)
.getOrDefault("response", Collections.emptyMap())).containsKey("params");
SolrCLI.postJsonToSolr(solrClient, PackageUtils.getCollectionParamsPath(collection),
getMapper().writeValueAsString(Collections.singletonMap(packageParamsExist? "update": "set",
@@ -274,11 +273,13 @@ public class PackageManager implements Closeable {
boolean shouldExecute = true;
if (!noprompt) { // show a prompt asking user to execute the setup command for the plugin
PackageUtils.print(PackageUtils.YELLOW, "Execute this command (y/n): ");
- String userInput = new Scanner(System.in, "UTF-8").next();
- if (!"yes".equalsIgnoreCase(userInput) && !"y".equalsIgnoreCase(userInput)) {
- shouldExecute = false;
- PackageUtils.printRed("Skipping setup command for deploying (deployment verification may fail)."
- + " Please run this step manually or refer to package documentation.");
+ try (Scanner scanner = new Scanner(System.in, "UTF-8")) {
+ String userInput = scanner.next();
+ if (!"yes".equalsIgnoreCase(userInput) && !"y".equalsIgnoreCase(userInput)) {
+ shouldExecute = false;
+ PackageUtils.printRed("Skipping setup command for deploying (deployment verification may fail)."
+ + " Please run this step manually or refer to package documentation.");
+ }
}
}
if (shouldExecute) {
@@ -310,9 +311,10 @@ public class PackageManager implements Closeable {
}
List<String> deployedCollections = collections.stream().filter(c -> !previouslyDeployed.contains(c)).collect(Collectors.toList());
- return new Pair(deployedCollections, previouslyDeployed);
+ return new Pair<List<String>, List<String>>(deployedCollections, previouslyDeployed);
}
+ @SuppressWarnings("unchecked")
private boolean deployClusterPackage(SolrPackageInstance packageInstance, boolean isUpdate, boolean noprompt,
boolean shouldDeployClusterPlugins, String[] overrides) {
boolean cluasterPluginFailed = false;
@@ -374,11 +376,13 @@ public class PackageManager implements Closeable {
boolean shouldExecute = true;
if (!noprompt) { // show a prompt asking user to execute the setup command for the plugin
PackageUtils.print(PackageUtils.YELLOW, "Execute this command (y/n): ");
- String userInput = new Scanner(System.in, "UTF-8").next();
- if (!"yes".equalsIgnoreCase(userInput) && !"y".equalsIgnoreCase(userInput)) {
- shouldExecute = false;
- PackageUtils.printRed("Skipping setup command for deploying (deployment verification may fail)."
- + " Please run this step manually or refer to package documentation.");
+ try (Scanner scanner = new Scanner(System.in, "UTF-8")) {
+ String userInput = scanner.next();
+ if (!"yes".equalsIgnoreCase(userInput) && !"y".equalsIgnoreCase(userInput)) {
+ shouldExecute = false;
+ PackageUtils.printRed("Skipping setup command for deploying (deployment verification may fail)."
+ + " Please run this step manually or refer to package documentation.");
+ }
}
}
if (shouldExecute) {