diff --git a/servicetalk-client-api/src/main/java/io/servicetalk/client/api/LoadBalancerFactory.java b/servicetalk-client-api/src/main/java/io/servicetalk/client/api/LoadBalancerFactory.java index 789117c6b1..c965833f17 100644 --- a/servicetalk-client-api/src/main/java/io/servicetalk/client/api/LoadBalancerFactory.java +++ b/servicetalk-client-api/src/main/java/io/servicetalk/client/api/LoadBalancerFactory.java @@ -33,9 +33,10 @@ public interface LoadBalancerFactory Type of connections created by the passed {@link ConnectionFactory}. * @return a new {@link LoadBalancer}. */ - LoadBalancer newLoadBalancer( + LoadBalancer newLoadBalancer( Publisher> eventPublisher, - ConnectionFactory connectionFactory); + ConnectionFactory connectionFactory); } diff --git a/servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpLoadBalancerFactory.java b/servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpLoadBalancerFactory.java index 3d41170ae8..16bcbadd01 100644 --- a/servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpLoadBalancerFactory.java +++ b/servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpLoadBalancerFactory.java @@ -30,9 +30,9 @@ public interface HttpLoadBalancerFactory extends LoadBalancerFactory { @Override - LoadBalancer newLoadBalancer( + LoadBalancer newLoadBalancer( Publisher> eventPublisher, - ConnectionFactory cf); + ConnectionFactory cf); /** * Converts the passed {@link FilterableStreamingHttpConnection} to a diff --git a/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultHttpLoadBalancerFactory.java b/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultHttpLoadBalancerFactory.java index 9b7a5cea8f..e0610e2e92 100644 --- a/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultHttpLoadBalancerFactory.java +++ b/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultHttpLoadBalancerFactory.java @@ -59,9 +59,9 @@ public final class DefaultHttpLoadBalancerFactory } @Override - public LoadBalancer newLoadBalancer( + public LoadBalancer newLoadBalancer( final Publisher> eventPublisher, - final ConnectionFactory cf) { + final ConnectionFactory cf) { return rawFactory.newLoadBalancer(eventPublisher, cf); } diff --git a/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultSingleAddressHttpClientBuilder.java b/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultSingleAddressHttpClientBuilder.java index 23c7fca7a8..703820a4fc 100644 --- a/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultSingleAddressHttpClientBuilder.java +++ b/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/DefaultSingleAddressHttpClientBuilder.java @@ -298,10 +298,9 @@ private static StreamingHttpClient buildStreaming(final HttpClientBuildCo connectionFactoryFilter, ctx.builder.loadBalancerFactory::toLoadBalancedConnection); } - @SuppressWarnings("unchecked") final LoadBalancer lb = - (LoadBalancer) closeOnException.prepend( - ctx.builder.loadBalancerFactory.newLoadBalancer(sdEvents, connectionFactory)); + closeOnException.prepend(ctx.builder.loadBalancerFactory.newLoadBalancer(sdEvents, + connectionFactory)); StreamingHttpClientFilterFactory currClientFilterFactory = ctx.builder.clientFilterFactory; if (roConfig.hasProxy() && sslContext == null) { diff --git a/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/AutoRetryTest.java b/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/AutoRetryTest.java index 2880ffbbda..7ef780a62e 100644 --- a/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/AutoRetryTest.java +++ b/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/AutoRetryTest.java @@ -119,9 +119,9 @@ private final class InspectingLoadBalancerFactory newLoadBalancer( + public LoadBalancer newLoadBalancer( final Publisher> eventPublisher, - final ConnectionFactory connectionFactory) { + final ConnectionFactory connectionFactory) { return new InspectingLoadBalancer<>(rr.newLoadBalancer(eventPublisher, connectionFactory)); } } diff --git a/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/ClientEffectiveStrategyTest.java b/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/ClientEffectiveStrategyTest.java index 1b1bacc567..26858137c8 100644 --- a/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/ClientEffectiveStrategyTest.java +++ b/servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/ClientEffectiveStrategyTest.java @@ -607,10 +607,9 @@ protected Single request(final StreamingHttpRequester del private static class LoadBalancerFactoryImpl implements LoadBalancerFactory { @Override - public LoadBalancer + public LoadBalancer newLoadBalancer(final Publisher> eventPublisher, - final ConnectionFactory connectionFactory) { + final ConnectionFactory connectionFactory) { return RoundRobinLoadBalancer.newRoundRobinFactory() .newLoadBalancer(eventPublisher, connectionFactory); diff --git a/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java b/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java index 062f0368ef..cc2a3e2caa 100644 --- a/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java +++ b/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java @@ -317,9 +317,9 @@ public static final class RoundRobinLoadBalancerFactory { @Override - public LoadBalancer newLoadBalancer( + public LoadBalancer newLoadBalancer( final Publisher> eventPublisher, - final ConnectionFactory connectionFactory) { + final ConnectionFactory connectionFactory) { return new RoundRobinLoadBalancer<>(eventPublisher, connectionFactory); } }