From fd30b68d3c356036ac8ea51601f5c20da10a9b9b Mon Sep 17 00:00:00 2001
From: kpayson64 <kpayson@google.com>
Date: Tue, 11 Apr 2017 08:47:36 -0700
Subject: [PATCH] okhttp: Add OptionalMethod support for private classes
 (#2895)

---
 .../io/grpc/okhttp/OptionalMethodTest.java    | 102 ++++++++++++++++++
 .../grpc/okhttp/internal/OptionalMethod.java  |   6 ++
 2 files changed, 108 insertions(+)
 create mode 100644 okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java

diff --git a/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java b/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java
new file mode 100644
index 0000000000..424fcb3716
--- /dev/null
+++ b/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2017, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ *    * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package io.grpc.okhttp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import io.grpc.okhttp.internal.OptionalMethod;
+import java.lang.reflect.InvocationTargetException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Tests for OptionalMethod.
+ */
+@RunWith(JUnit4.class)
+public class OptionalMethodTest {
+
+  public static class DefaultClass {
+    public String testMethod(String arg) {
+      return arg;
+    }
+  }
+
+  public abstract static class PublicParent {
+    public abstract String testMethod(String arg);
+  }
+
+  private static class PrivateImpl extends PublicParent {
+    @Override
+    public String testMethod(String arg) {
+      return arg;
+    }
+  }
+
+  private static class PrivateClass {
+    public String testMethod(String arg) {
+      return arg;
+    }
+  }
+
+  @Test
+  public void isSupported() {
+    OptionalMethod<DefaultClass> defaultClassMethod = new OptionalMethod<DefaultClass>(
+        String.class, "testMethod", String.class);
+    assertTrue(defaultClassMethod.isSupported(new DefaultClass()));
+
+    OptionalMethod<PublicParent> privateImpl = new OptionalMethod<PublicParent>(
+        String.class, "testMethod", String.class);
+    assertTrue(privateImpl.isSupported(new PrivateImpl()));
+
+    OptionalMethod<PrivateClass> privateClass = new OptionalMethod<PrivateClass>(
+        String.class, "testMethod", String.class);
+    assertFalse(privateClass.isSupported(new PrivateClass()));
+  }
+
+  @Test
+  public void invokeOptional() throws InvocationTargetException {
+    OptionalMethod<DefaultClass> defaultClassMethod = new OptionalMethod<DefaultClass>(
+        String.class, "testMethod", String.class);
+    assertEquals("testArg", defaultClassMethod.invokeOptional(new DefaultClass(), "testArg"));
+
+    OptionalMethod<PublicParent> privateImpl = new OptionalMethod<PublicParent>(
+        String.class, "testMethod", String.class);
+    assertEquals("testArg", privateImpl.invokeOptional(new PrivateImpl(), "testArg"));
+
+    OptionalMethod<PrivateClass> privateClass = new OptionalMethod<PrivateClass>(
+        String.class, "testMethod", String.class);
+    assertEquals(null, privateClass.invokeOptional(new PrivateClass(), "testArg"));
+  }
+}
diff --git a/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/OptionalMethod.java b/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/OptionalMethod.java
index cb9357fb15..a93c8384f2 100644
--- a/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/OptionalMethod.java
+++ b/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/OptionalMethod.java
@@ -169,6 +169,12 @@ public class OptionalMethod<T> {
   private static Method getPublicMethod(Class<?> clazz, String methodName, Class[] parameterTypes) {
     Method method = null;
     try {
+      if (clazz == null) {
+        return null;
+      }
+      if ((clazz.getModifiers() & Modifier.PUBLIC) == 0) {
+        return getPublicMethod(clazz.getSuperclass(), methodName, parameterTypes);
+      }
       method = clazz.getMethod(methodName, parameterTypes);
       if ((method.getModifiers() & Modifier.PUBLIC) == 0) {
         method = null;