Skip to content

Commit eff9e93

Browse files
committed
Drop ChannelPoolPartitionSelector in favor of Predicate, close AsyncHttpClient#1374
1 parent 0049808 commit eff9e93

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

client/src/main/java/org/asynchttpclient/channel/ChannelPool.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.asynchttpclient.channel;
1515

1616
import java.util.Map;
17+
import java.util.function.Predicate;
1718

1819
import io.netty.channel.Channel;
1920

@@ -71,7 +72,7 @@ public interface ChannelPool {
7172
*
7273
* @param selector the selector
7374
*/
74-
void flushPartitions(ChannelPoolPartitionSelector selector);
75+
void flushPartitions(Predicate<Object> selector);
7576

7677
/**
7778
* @return The number of idle channels per host.

client/src/main/java/org/asynchttpclient/channel/ChannelPoolPartitionSelector.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

client/src/main/java/org/asynchttpclient/channel/NoopChannelPool.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
*/
1414
package org.asynchttpclient.channel;
1515

16+
import io.netty.channel.Channel;
17+
1618
import java.util.Collections;
1719
import java.util.Map;
18-
19-
import io.netty.channel.Channel;
20+
import java.util.function.Predicate;
2021

2122
public enum NoopChannelPool implements ChannelPool {
2223

@@ -51,7 +52,7 @@ public void flushPartition(Object partitionKey) {
5152
}
5253

5354
@Override
54-
public void flushPartitions(ChannelPoolPartitionSelector selector) {
55+
public void flushPartitions(Predicate<Object> selector) {
5556
}
5657

5758
@Override

client/src/main/java/org/asynchttpclient/netty/channel/DefaultChannelPool.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import java.util.concurrent.TimeUnit;
2929
import java.util.concurrent.atomic.AtomicBoolean;
3030
import java.util.function.Function;
31+
import java.util.function.Predicate;
3132
import java.util.stream.Collectors;
3233

3334
import org.asynchttpclient.AsyncHttpClientConfig;
3435
import org.asynchttpclient.channel.ChannelPool;
35-
import org.asynchttpclient.channel.ChannelPoolPartitionSelector;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838

@@ -358,11 +358,11 @@ public void flushPartition(Object partitionKey) {
358358
}
359359

360360
@Override
361-
public void flushPartitions(ChannelPoolPartitionSelector selector) {
361+
public void flushPartitions(Predicate<Object> selector) {
362362

363363
for (Map.Entry<Object, ConcurrentLinkedDeque<IdleChannel>> partitionsEntry : partitions.entrySet()) {
364364
Object partitionKey = partitionsEntry.getKey();
365-
if (selector.select(partitionKey))
365+
if (selector.test(partitionKey))
366366
flushPartition(partitionKey, partitionsEntry.getValue());
367367
}
368368
}

0 commit comments

Comments
 (0)