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 16f4d998594e365a0d7950822b27ebe953613b30 Author: Kevin Risden <[email protected]> AuthorDate: Mon Feb 27 15:55:44 2023 -0500 SOLR-16427: Evaluate and fix errorprone rules - part 5 - NonCanonicalType --- gradle/validation/error-prone.gradle | 2 +- solr/core/src/java/org/apache/solr/request/SimpleFacets.java | 7 ++++--- .../src/test/org/apache/solr/handler/CSVRequestHandlerTest.java | 2 +- .../solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java | 3 ++- .../solr/client/solrj/embedded/SolrExampleStreamingTest.java | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle index 6dc46041477..9c80fea0c47 100644 --- a/gradle/validation/error-prone.gradle +++ b/gradle/validation/error-prone.gradle @@ -405,7 +405,7 @@ allprojects { prj -> '-Xep:NestedInstanceOfConditions:WARN', '-Xep:NewFileSystem:WARN', // '-Xep:NonAtomicVolatileUpdate:OFF', // todo check if useful or comment why not - // '-Xep:NonCanonicalType:OFF', // todo check if useful or comment why not + '-Xep:NonCanonicalType:WARN', '-Xep:NonOverridingEquals:WARN', '-Xep:NullOptional:WARN', // '-Xep:NullableConstructor:OFF', // we don't use this annotation diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java index 8d390717b25..b6ddf0cf467 100644 --- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java +++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java @@ -55,6 +55,7 @@ import org.apache.lucene.search.LeafCollector; import org.apache.lucene.search.Query; import org.apache.lucene.search.grouping.AllGroupHeadsCollector; import org.apache.lucene.search.grouping.AllGroupsCollector; +import org.apache.lucene.search.grouping.GroupFacetCollector; import org.apache.lucene.search.grouping.TermGroupFacetCollector; import org.apache.lucene.search.grouping.TermGroupSelector; import org.apache.lucene.util.Bits; @@ -805,16 +806,16 @@ public class SimpleFacets { boolean orderByCount = sort.equals(FacetParams.FACET_SORT_COUNT) || sort.equals(FacetParams.FACET_SORT_COUNT_LEGACY); - TermGroupFacetCollector.GroupedFacetResult result = + GroupFacetCollector.GroupedFacetResult result = collector.mergeSegmentResults( limit < 0 ? Integer.MAX_VALUE : (offset + limit), mincount, orderByCount); CharsRefBuilder charsRef = new CharsRefBuilder(); FieldType facetFieldType = searcher.getSchema().getFieldType(field); NamedList<Integer> facetCounts = new NamedList<>(); - List<TermGroupFacetCollector.FacetEntry> scopedEntries = + List<GroupFacetCollector.FacetEntry> scopedEntries = result.getFacetEntries(offset, limit < 0 ? Integer.MAX_VALUE : limit); - for (TermGroupFacetCollector.FacetEntry facetEntry : scopedEntries) { + for (GroupFacetCollector.FacetEntry facetEntry : scopedEntries) { // :TODO:can we filter earlier than this to make it more efficient? if (termFilter != null && !termFilter.test(facetEntry.getValue())) { continue; diff --git a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java index a2cfa8131a0..4c48bc88912 100644 --- a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java @@ -44,7 +44,7 @@ public class CSVRequestHandlerTest extends SolrTestCaseJ4 { BufferingRequestProcessor p = new BufferingRequestProcessor(null); CSVLoader loader = new CSVLoader(); - loader.load(req, rsp, new ContentStreamBase.StringStream.StringStream(csvString), p); + loader.load(req, rsp, new ContentStreamBase.StringStream(csvString), p); AddUpdateCommand add = p.addCommands.get(0); assertEquals(200, add.commitWithin); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java index 2939832c7d4..f7ea0d83961 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java @@ -26,6 +26,7 @@ import org.apache.solr.client.solrj.SolrExampleTests; import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient; import org.apache.solr.client.solrj.impl.Http2SolrClient; import org.apache.solr.client.solrj.impl.XMLResponseParser; +import org.apache.solr.client.solrj.request.AbstractUpdateRequest; import org.apache.solr.client.solrj.request.RequestWriter; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.common.SolrInputDocument; @@ -70,7 +71,7 @@ public class SolrExampleStreamingHttp2Test extends SolrExampleTests { .withThreadCount(2) .build()) { int docId = 42; - for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) { + for (AbstractUpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) { for (boolean waitSearch : Arrays.asList(true, false)) { for (boolean waitFlush : Arrays.asList(true, false)) { UpdateRequest updateRequest = new UpdateRequest(); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java index 3c82ef40fdc..2e06cdadfed 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java @@ -24,6 +24,7 @@ import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrExampleTests; import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient; import org.apache.solr.client.solrj.impl.XMLResponseParser; +import org.apache.solr.client.solrj.request.AbstractUpdateRequest; import org.apache.solr.client.solrj.request.RequestWriter; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.common.SolrInputDocument; @@ -62,7 +63,7 @@ public class SolrExampleStreamingTest extends SolrExampleTests { .withThreadCount(2) .build()) { int docId = 42; - for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) { + for (AbstractUpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) { for (boolean waitSearch : Arrays.asList(true, false)) { for (boolean waitFlush : Arrays.asList(true, false)) { UpdateRequest updateRequest = new UpdateRequest();
