Merge pull request #526 from alex268/master

Allow super types for addChannelInitializer

Author: alex268

core/src/main/java/tech/ydb/core/grpc/GrpcTransportBuilder.java

@@ -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;
@@ -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;
     }
 
@@ -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;
     }

core/src/main/java/tech/ydb/core/impl/pool/NettyChannelFactory.java

@@ -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();
@@ -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);
         }
 

core/src/main/java/tech/ydb/core/impl/pool/ShadedNettyChannelFactory.java

@@ -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();
@@ -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);
         }