Generate compatibility methods to maintain ABI while changing API

Author: ejona86

core/build.gradle

@@ -1,3 +1,9 @@
+buildscript {
+    dependencies {
+        classpath 'com.infradna.tool:bridge-method-injector:1.18'
+    }
+}
+
 plugins {
     id "java-library"
     id "maven-publish"
@@ -7,13 +13,18 @@ plugins {
     id "ru.vyarus.animalsniffer"
 }
 
+import com.infradna.tool.bridge_method_injector.MethodInjector;
+
 description = 'gRPC: Core'
 
 evaluationDependsOn(project(':grpc-context').path)
 evaluationDependsOn(project(':grpc-api').path)
 
 dependencies {
     api project(':grpc-api')
+    compileOnlyApi ('com.infradna.tool:bridge-method-annotation:1.18') {
+        exclude group: 'org.jenkins-ci', module: 'annotation-indexer'
+    }
     implementation libraries.gson,
             libraries.android_annotations,
             libraries.animalsniffer_annotations,
@@ -58,6 +69,15 @@ plugins.withId("java") {
         // This project targets Java 7 (no method references)
         options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF)
     }
+
+    compileJava {
+        doLast {
+            new MethodInjector().handle(destinationDirectory.file(
+                "io/grpc/internal/AbstractManagedChannelImplBuilder.class").get().getAsFile());
+            new MethodInjector().handle(destinationDirectory.file(
+                "io/grpc/internal/AbstractServerImplBuilder.class").get().getAsFile());
+        }
+    }
 }
 
 task versionFile() {

core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java

@@ -17,6 +17,7 @@
 package io.grpc.internal;
 
 import com.google.common.base.MoreObjects;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import io.grpc.BinaryLog;
 import io.grpc.ClientInterceptor;
 import io.grpc.CompressorRegistry;
@@ -38,8 +39,8 @@
  * @param <T> The concrete type of this builder.
  * @see <a href="https://github.com/grpc/grpc-java/issues/7211">grpc/grpc-java#7211</a>
  */
-public abstract class AbstractManagedChannelImplBuilder
-    <T extends AbstractManagedChannelImplBuilder<T>> extends ManagedChannelBuilder<T> {
+public abstract class AbstractManagedChannelImplBuilder<T extends ManagedChannelBuilder<T>>
+    extends ManagedChannelBuilder<T> {
 
   /**
    * The default constructor.
@@ -66,187 +67,218 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
   protected abstract ManagedChannelBuilder<?> delegate();
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T directExecutor() {
     delegate().directExecutor();
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T executor(Executor executor) {
     delegate().executor(executor);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T offloadExecutor(Executor executor) {
     delegate().offloadExecutor(executor);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T intercept(List<ClientInterceptor> interceptors) {
     delegate().intercept(interceptors);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T intercept(ClientInterceptor... interceptors) {
     delegate().intercept(interceptors);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T userAgent(String userAgent) {
     delegate().userAgent(userAgent);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T overrideAuthority(String authority) {
     delegate().overrideAuthority(authority);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T usePlaintext() {
     delegate().usePlaintext();
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T useTransportSecurity() {
     delegate().useTransportSecurity();
     return thisT();
   }
 
   @Deprecated
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T nameResolverFactory(NameResolver.Factory resolverFactory) {
     delegate().nameResolverFactory(resolverFactory);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T defaultLoadBalancingPolicy(String policy) {
     delegate().defaultLoadBalancingPolicy(policy);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T enableFullStreamDecompression() {
     delegate().enableFullStreamDecompression();
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T decompressorRegistry(DecompressorRegistry registry) {
     delegate().decompressorRegistry(registry);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T compressorRegistry(CompressorRegistry registry) {
     delegate().compressorRegistry(registry);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T idleTimeout(long value, TimeUnit unit) {
     delegate().idleTimeout(value, unit);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T maxInboundMessageSize(int max) {
     delegate().maxInboundMessageSize(max);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T maxInboundMetadataSize(int max) {
     delegate().maxInboundMetadataSize(max);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T keepAliveTime(long keepAliveTime, TimeUnit timeUnit) {
     delegate().keepAliveTime(keepAliveTime, timeUnit);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T keepAliveTimeout(long keepAliveTimeout, TimeUnit timeUnit) {
     delegate().keepAliveTimeout(keepAliveTimeout, timeUnit);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T keepAliveWithoutCalls(boolean enable) {
     delegate().keepAliveWithoutCalls(enable);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T maxRetryAttempts(int maxRetryAttempts) {
     delegate().maxRetryAttempts(maxRetryAttempts);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T maxHedgedAttempts(int maxHedgedAttempts) {
     delegate().maxHedgedAttempts(maxHedgedAttempts);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T retryBufferSize(long bytes) {
     delegate().retryBufferSize(bytes);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T perRpcBufferLimit(long bytes) {
     delegate().perRpcBufferLimit(bytes);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T disableRetry() {
     delegate().disableRetry();
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T enableRetry() {
     delegate().enableRetry();
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T setBinaryLog(BinaryLog binaryLog) {
     delegate().setBinaryLog(binaryLog);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T maxTraceEvents(int maxTraceEvents) {
     delegate().maxTraceEvents(maxTraceEvents);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T proxyDetector(ProxyDetector proxyDetector) {
     delegate().proxyDetector(proxyDetector);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T defaultServiceConfig(@Nullable Map<String, ?> serviceConfig) {
     delegate().defaultServiceConfig(serviceConfig);
     return thisT();
   }
 
   @Override
+  @WithBridgeMethods(value=AbstractManagedChannelImplBuilder.class, castRequired=true)
   public T disableServiceConfigLookUp() {
     delegate().disableServiceConfigLookUp();
     return thisT();