[solr] branch main updated: SOLR-15485: action post-commit review feedback (#213)

[cp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 14e974e  SOLR-15485: action post-commit review feedback (#213)
14e974e is described below

commit 14e974ea9a0538cbb2024c9f322ffc5958c294a5
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jul 13 11:23:57 2021 +0100

    SOLR-15485: action post-commit review feedback (#213)
---
 gradle/validation/validate-source-patterns.gradle          |  1 -
 solr/core/src/java/org/apache/solr/core/CoreContainer.java |  2 +-
 solr/core/src/test/org/apache/solr/cloud/OverseerTest.java | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradle
index c39b4aa..74a5af3 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.java
index c1a384d..9626799 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.java
index 6df9a70..c2d92e0 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);