Apache Solr open-source search software
SOLR-15485: action post-commit review feedback (#213)
Christine Poerschke14e974ea9a05
diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradleindex c39b4aa4eab..74a5af35bd0 100644--- a/gradle/validation/validate-source-patterns.gradle+++ b/gradle/validation/validate-source-patterns.gradle@@ -156,7 +156,6 @@ class ValidateSourcePatternsTask extends DefaultTask {(~$/\$$Header\b/$) : 'svn keyword',(~$/\$$Source\b/$) : 'svn keyword',(~$/^\uFEFF/$) : 'UTF-8 byte order mark',- (~$/Collections\.singleton.*forEach/$) : 'potentially unnecessary forEach() use with Collections.singleton',(~$/import java\.lang\.\w+;/$) : 'java.lang import is unnecessary']diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex c1a384dc050..9626799863e 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -1140,7 +1140,7 @@ public class CoreContainer {} finally {try {if (updateShardHandler != null) {- customThreadPool.submit(() -> updateShardHandler.close());+ customThreadPool.submit(updateShardHandler::close);}} finally {try {diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex 6df9a704715..c2d92e06e27 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -339,15 +339,15 @@ public class OverseerTest extends SolrTestCaseJ4 {ExecutorService customThreadPool = ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));for (ZkController zkController : zkControllers) {- customThreadPool.submit( () -> zkController.close());+ customThreadPool.submit(zkController::close);}for (HttpShardHandlerFactory httpShardHandlerFactory : httpShardHandlerFactorys) {- customThreadPool.submit( () -> httpShardHandlerFactory.close());+ customThreadPool.submit(httpShardHandlerFactory::close);}for (UpdateShardHandler updateShardHandler : updateShardHandlers) {- customThreadPool.submit( () -> updateShardHandler.close());+ customThreadPool.submit(updateShardHandler::close);}for (SolrClient solrClient : solrClients) {@@ -355,7 +355,7 @@ public class OverseerTest extends SolrTestCaseJ4 {}for (ZkStateReader reader : readers) {- customThreadPool.submit( () -> reader.close());+ customThreadPool.submit(reader::close);}for (SolrZkClient solrZkClient : zkClients) {@@ -368,7 +368,7 @@ public class OverseerTest extends SolrTestCaseJ4 {for (Overseer overseer : overseers) {- customThreadPool.submit( () -> overseer.close());+ customThreadPool.submit(overseer::close);}ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);