Simplify Jdk8Stub.mustache

Author: rmichela

jprotoc-test/src/test/java/com/salesforce/jprotoc/JavaMethodStubTest.java

@@ -0,0 +1,5 @@
+package com.salesforce.jprotoc;
+
+public class JavaMethodStubTest {
+
+}

jprotoc/src/main/resources/Jdk8Stub.mustache

@@ -48,39 +48,18 @@ public class {{className}} {
         private {{serviceName}}CompletableFutureStub(Channel channel, CallOptions callOptions, Function<ListenableFuture, CompletableFuture> futureAdapter) {
             super(channel, callOptions);
             this.futureAdapter = futureAdapter;
-            innerStub = {{serviceName}}Grpc.newFutureStub(channel);
+            innerStub = {{serviceName}}Grpc.newFutureStub(channel).build(channel, callOptions);
         }
 
         @Override
         protected {{serviceName}}CompletableFutureStub build(Channel channel, CallOptions callOptions) {
             {{serviceName}}CompletableFutureStub stub = new {{serviceName}}CompletableFutureStub(channel, callOptions, futureAdapter);
-            forceCallOptions(stub.innerStub, callOptions);
             return stub;
         }
         {{#methods}}{{#deprecated}}@Deprecated{{/deprecated}}
         public CompletableFuture<{{outputType}}> {{methodName}}({{inputType}} request) {
             return futureAdapter.apply(innerStub.{{methodName}}(request));
         }
         {{/methods}}
-
-        private void forceCallOptions({{serviceName}}Grpc.{{serviceName}}FutureStub stub, CallOptions options) {
-            try {
-                callOptionsField.set(stub, options);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    private static final Field callOptionsField = getWritableCallOptonsField();
-
-    private static Field getWritableCallOptonsField() {
-        try {
-            Field callOptionsField = AbstractStub.class.getDeclaredField("callOptions");
-            callOptionsField.setAccessible(true);
-            return callOptionsField;
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
     }
 }