You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/10/28 15:21:44 UTC
[solr] 03/12: SOLR-16427: Evaluate and fix errorprone rules - IdentityHashMapUsage
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 54fc2c9658fd541dc336049e86ebd2c8deb514ee
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Tue Oct 25 13:41:51 2022 -0400
SOLR-16427: Evaluate and fix errorprone rules - IdentityHashMapUsage
---
gradle/validation/error-prone.gradle | 1 -
.../core/src/java/org/apache/solr/core/CachingDirectoryFactory.java | 2 +-
solr/core/src/java/org/apache/solr/search/BoolQParserPlugin.java | 2 +-
solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java | 6 ++++--
solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java | 2 +-
.../solr/update/processor/IgnoreLargeDocumentProcessorFactory.java | 3 ++-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index f4192b29f61..0d30d95af0b 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -86,7 +86,6 @@ allprojects { prj ->
'-Xep:Finally:OFF',
'-Xep:FutureReturnValueIgnored:OFF',
'-Xep:IdentityBinaryExpression:OFF',
- '-Xep:IdentityHashMapUsage:OFF',
'-Xep:ImmutableEnumChecker:OFF',
'-Xep:InconsistentCapitalization:OFF',
'-Xep:InlineFormatString:OFF', // this introduces redundancy in format strings
diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
index 934f4392702..14303fe04ea 100644
--- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
@@ -91,7 +91,7 @@ public abstract class CachingDirectoryFactory extends DirectoryFactory {
protected Map<String, CacheValue> byPathCache = new HashMap<>();
- protected Map<Directory, CacheValue> byDirectoryCache = new IdentityHashMap<>();
+ protected IdentityHashMap<Directory, CacheValue> byDirectoryCache = new IdentityHashMap<>();
protected Map<Directory, List<CloseListener>> closeListeners = new HashMap<>();
diff --git a/solr/core/src/java/org/apache/solr/search/BoolQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/BoolQParserPlugin.java
index 272f91e6903..d0f36d762d3 100644
--- a/solr/core/src/java/org/apache/solr/search/BoolQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/BoolQParserPlugin.java
@@ -60,7 +60,7 @@ public class BoolQParserPlugin extends QParserPlugin {
@Override
protected Map<QParser, BooleanClause.Occur> clauses() throws SyntaxError {
- Map<QParser, BooleanClause.Occur> clauses = new IdentityHashMap<>();
+ IdentityHashMap<QParser, BooleanClause.Occur> clauses = new IdentityHashMap<>();
SolrParams solrParams = SolrParams.wrapDefaults(localParams, params);
addQueries(clauses, solrParams.getParams("must"), BooleanClause.Occur.MUST);
addQueries(clauses, solrParams.getParams("must_not"), BooleanClause.Occur.MUST_NOT);
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java
index 9da78b8ea7b..90b6a76d1c4 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java
@@ -96,7 +96,8 @@ public abstract class FacetMerger {
return oldVal;
}
- private Map<FacetRequest, Collection<String>> refineSubMap = new IdentityHashMap<>(4);
+ private final IdentityHashMap<FacetRequest, Collection<String>> refineSubMap =
+ new IdentityHashMap<>(4);
public Collection<String> getSubsWithRefinement(FacetRequest freq) {
if (freq.getSubFacets().isEmpty()) return Collections.emptyList();
@@ -120,7 +121,8 @@ public abstract class FacetMerger {
return subs;
}
- private Map<FacetRequest, Collection<String>> partialSubsMap = new IdentityHashMap<>(4);
+ private final IdentityHashMap<FacetRequest, Collection<String>> partialSubsMap =
+ new IdentityHashMap<>(4);
public Collection<String> getSubsWithPartial(FacetRequest freq) {
if (freq.getSubFacets().isEmpty()) return Collections.emptyList();
diff --git a/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java b/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java
index 13c1fb3333a..c2397cd7061 100644
--- a/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java
@@ -102,7 +102,7 @@ public class FiltersQParser extends QParser {
+ " is not defined for "
+ stringIncludingLocalParams);
}
- Map<QParser, Occur> clauses = new IdentityHashMap<>();
+ IdentityHashMap<QParser, Occur> clauses = new IdentityHashMap<>();
for (String filter : params == null ? new String[0] : params) {
if (filter == null || filter.length() == 0) {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
index 16508dd864b..7f9d1c250d9 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java
@@ -115,7 +115,8 @@ public class IgnoreLargeDocumentProcessorFactory extends UpdateRequestProcessorF
// package private for testing
static class ObjectSizeEstimator {
/** Sizes of primitive classes. */
- private static final Map<Class<?>, Integer> primitiveSizes = new IdentityHashMap<>();
+ private static final IdentityHashMap<Class<?>, Integer> primitiveSizes =
+ new IdentityHashMap<>();
static {
primitiveSizes.put(boolean.class, 1);