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/23 23:44:10 UTC
[lucene-solr] branch branch_8x updated: SOLR-14541: Remove IntelliJ
//noinspection comments
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 85611f7 SOLR-14541: Remove IntelliJ //noinspection comments
85611f7 is described below
commit 85611f7ee5a654b04e4a6216ef9da76e95fd9088
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Tue Jun 23 19:43:56 2020 -0400
SOLR-14541: Remove IntelliJ //noinspection comments
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java | 1 -
.../java/org/apache/solr/handler/component/QueryElevationComponent.java | 1 -
.../org/apache/solr/handler/component/ShardFieldSortedHitQueue.java | 1 -
solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java | 1 -
solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java | 2 --
solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java | 1 -
7 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fcb13da..b6001f4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -295,6 +295,8 @@ Other Changes
Only mentioned in 8.6 because I backported some more warning suppressions but not
the fail-on-warnings.
+* SOLR-14589: Remove IntelliJ //noinspection comments (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/cloud/api/collections/RoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
index 7b4efc6..cb53e23 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
@@ -130,7 +130,6 @@ public abstract class RoutedAlias {
// this next remove is checked for key because when we build from aliases.json's data it we get an
// immutable map which would cause UnsupportedOperationException to be thrown. This remove is here
// to prevent this property from making it into aliases.json
- //noinspection RedundantCollectionOperation
if (props.containsKey("router.routerList")) {
props.remove("router.routerList");
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index a48cc9e..c42932e 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -668,7 +668,6 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
}
if (context != null) {
- //noinspection unchecked
context.put(BOOSTED_DOCIDS, boostDocs);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java
index e5598a3..5d296eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java
@@ -160,7 +160,6 @@ public class ShardFieldSortedHitQueue extends PriorityQueue<ShardDoc> {
@Override
@SuppressWarnings({"unchecked"})
public int compare(final ShardDoc o1, final ShardDoc o2) {
- //noinspection unchecked
return -fieldComparator.compareValues(sortVal(o1), sortVal(o2));
}
};
diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
index e9b905d..0acb7e8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
@@ -118,7 +118,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
assertEquals("collection2meta", aliases.get(1));
//ensure we have the back-compat format in ZK:
final byte[] rawBytes = zkStateReader.getZkClient().getData(ALIASES, null, null, true);
- //noinspection unchecked
assertTrue(((Map<String,Map<String,?>>)Utils.fromJSON(rawBytes)).get("collection").get("meta1") instanceof String);
// set properties
diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
index b257932..c9ff7ea 100644
--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
@@ -74,7 +74,6 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
final Class<?> clazz1 = ResourceLoaderAware.class;
// Check ResourceLoaderAware valid objects
- //noinspection unchecked
assertAwareCompatibility(clazz1, new NGramFilterFactory(map("minGramSize", "1", "maxGramSize", "2")));
assertAwareCompatibility(clazz1, new KeywordTokenizerFactory(new HashMap<>()));
@@ -97,7 +96,6 @@ public class ResourceLoaderTest extends SolrTestCaseJ4 {
assertAwareCompatibility(clazz2, new JSONResponseWriter());
// Make sure it throws an error for invalid objects
- //noinspection unchecked
invalid = new Object[] {
new NGramFilterFactory(map("minGramSize", "1", "maxGramSize", "2")),
"hello", 12.3f ,
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
index 8ca7282..0cdbd76 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
@@ -73,7 +73,6 @@ public class CommandOperation {
@SuppressWarnings({"unchecked"})
public Map<String, Object> getDataMap() {
if (commandData instanceof Map) {
- //noinspection unchecked
return (Map<String, Object>) commandData;
}
addError(StrUtils.formatString("The command ''{0}'' should have the values as a json object '{'key:val'}' format but is ''{1}''", name, commandData));