Skip to content

Allow super types for addChannelInitializer #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
Merged

Allow super types for addChannelInitializer #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/tech/ydb/core/grpc/GrpcTransportBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public enum InitMode {
private byte[] cert = null;
private boolean useTLS = false;
private ManagedChannelFactory.Builder channelFactoryBuilder = null;
private final List<Consumer<ManagedChannelBuilder<?>>> channelInitializers = new ArrayList<>();
private final List<Consumer<? super ManagedChannelBuilder<?>>> channelInitializers = new ArrayList<>();
private Supplier<ScheduledExecutorService> schedulerFactory = YdbSchedulerFactory::createScheduler;
private String localDc;
private BalancingSettings balancingSettings;
Expand Down Expand Up @@ -187,7 +187,7 @@ public ManagedChannelFactory getManagedChannelFactory() {
return channelFactoryBuilder.buildFactory(this);
}

public List<Consumer<ManagedChannelBuilder<?>>> getChannelInitializers() {
public List<Consumer<? super ManagedChannelBuilder<?>>> getChannelInitializers() {
return this.channelInitializers;
}

Expand All @@ -209,7 +209,7 @@ public GrpcTransportBuilder withChannelFactoryBuilder(ManagedChannelFactory.Buil
* @param ci custom ManagedChannelBuilder initializer
* @return this
*/
public GrpcTransportBuilder addChannelInitializer(Consumer<ManagedChannelBuilder<?>> ci) {
public GrpcTransportBuilder addChannelInitializer(Consumer<? super ManagedChannelBuilder<?>> ci) {
channelInitializers.add(ci);
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/tech/ydb/core/impl/pool/NettyChannelFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class NettyChannelFactory implements ManagedChannelFactory {
private final long connectTimeoutMs;
private final boolean useDefaultGrpcResolver;
private final Long grpcKeepAliveTimeMillis;
private final List<Consumer<ManagedChannelBuilder<?>>> initializers;
private final List<Consumer<? super ManagedChannelBuilder<?>>> initializers;

private NettyChannelFactory(GrpcTransportBuilder builder) {
this.database = builder.getDatabase();
Expand Down Expand Up @@ -101,7 +101,7 @@ public ManagedChannel newManagedChannel(String host, int port, String sslHostOve
channelBuilder.disableRetry();
}

for (Consumer<ManagedChannelBuilder<?>> initializer: initializers) {
for (Consumer<? super ManagedChannelBuilder<?>> initializer: initializers) {
initializer.accept(channelBuilder);
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/tech/ydb/core/impl/pool/ShadedNettyChannelFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ShadedNettyChannelFactory implements ManagedChannelFactory {
private final long connectTimeoutMs;
private final boolean useDefaultGrpcResolver;
private final Long grpcKeepAliveTimeMillis;
private final List<Consumer<ManagedChannelBuilder<?>>> initializers;
private final List<Consumer<? super ManagedChannelBuilder<?>>> initializers;

public ShadedNettyChannelFactory(GrpcTransportBuilder builder) {
this.database = builder.getDatabase();
Expand Down Expand Up @@ -101,7 +101,7 @@ public ManagedChannel newManagedChannel(String host, int port, String sslHostOve
channelBuilder.disableRetry();
}

for (Consumer<ManagedChannelBuilder<?>> initializer: initializers) {
for (Consumer<? super ManagedChannelBuilder<?>> initializer: initializers) {
initializer.accept(channelBuilder);
}

Expand Down