Skip to content

Commit 3822541

Browse files
committed
SOLR-15485: discourage Collections.singleton.forEach use (apache#179)
Resolved Conflicts: gradle/validation/validate-source-patterns.gradle solr/core/src/java/org/apache/solr/core/CoreContainer.java
1 parent 62d2753 commit 3822541

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

Diff for: solr/core/src/java/org/apache/solr/core/CoreContainer.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1138,9 +1138,7 @@ public void shutdown() {
11381138
} finally {
11391139
try {
11401140
if (updateShardHandler != null) {
1141-
customThreadPool.submit(() -> Collections.singleton(shardHandlerFactory).parallelStream().forEach(c -> {
1142-
updateShardHandler.close();
1143-
}));
1141+
customThreadPool.submit(() -> updateShardHandler.close());
11441142
}
11451143
} finally {
11461144
try {

Diff for: solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,7 @@ protected String getShardsString() {
414414
protected void destroyServers() throws Exception {
415415
ExecutorService customThreadPool = ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
416416

417-
customThreadPool.submit(() -> Collections.singleton(controlClient).parallelStream().forEach(c -> {
418-
IOUtils.closeQuietly(c);
419-
}));
417+
customThreadPool.submit(() -> IOUtils.closeQuietly(controlClient));
420418

421419
customThreadPool.submit(() -> {
422420
try {

Diff for: solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -1732,25 +1732,17 @@ public void distribTearDown() throws Exception {
17321732
protected void destroyServers() throws Exception {
17331733
ExecutorService customThreadPool = ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
17341734

1735-
customThreadPool.submit(() -> Collections.singleton(commonCloudSolrClient).parallelStream().forEach(c -> {
1736-
IOUtils.closeQuietly(c);
1737-
}));
1735+
customThreadPool.submit(() -> IOUtils.closeQuietly(commonCloudSolrClient));
17381736

1739-
customThreadPool.submit(() -> Collections.singleton(controlClient).parallelStream().forEach(c -> {
1740-
IOUtils.closeQuietly(c);
1741-
}));
1737+
customThreadPool.submit(() -> IOUtils.closeQuietly(controlClient));
17421738

17431739
customThreadPool.submit(() -> coreClients.parallelStream().forEach(c -> {
17441740
IOUtils.closeQuietly(c);
17451741
}));
17461742

1747-
customThreadPool.submit(() -> Collections.singletonList(controlClientCloud).parallelStream().forEach(c -> {
1748-
IOUtils.closeQuietly(c);
1749-
}));
1743+
customThreadPool.submit(() -> IOUtils.closeQuietly(controlClientCloud));
17501744

1751-
customThreadPool.submit(() -> Collections.singletonList(cloudClient).parallelStream().forEach(c -> {
1752-
IOUtils.closeQuietly(c);
1753-
}));
1745+
customThreadPool.submit(() -> IOUtils.closeQuietly(cloudClient));
17541746

17551747
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
17561748

0 commit comments

Comments
 (0)