From 1a0c282cf8e9676c3c3a6bc46d8fe1241ecb1c6f Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Sat, 14 May 2016 01:29:22 -0400
Subject: [PATCH] Bring open source build closer to passing

---
 java/com/google/api/client/util/BUILD         |  9 +++++++++
 java/google/registry/model/SchemaVersion.java |  4 ++--
 java/google/registry/util/Retrier.java        | 11 ++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 java/com/google/api/client/util/BUILD

diff --git a/java/com/google/api/client/util/BUILD b/java/com/google/api/client/util/BUILD
new file mode 100644
index 000000000..b3ba6228b
--- /dev/null
+++ b/java/com/google/api/client/util/BUILD
@@ -0,0 +1,9 @@
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "util",
+    exports = [
+        "@google_api_client//jar",
+        "@google_http_client//jar",
+    ],
+)
diff --git a/java/google/registry/model/SchemaVersion.java b/java/google/registry/model/SchemaVersion.java
index 5f1a48b40..a6d90e33c 100644
--- a/java/google/registry/model/SchemaVersion.java
+++ b/java/google/registry/model/SchemaVersion.java
@@ -14,8 +14,8 @@
 
 package google.registry.model;
 
+import static com.google.common.base.Predicates.assignableFrom;
 import static com.google.common.base.Predicates.or;
-import static com.google.common.base.Predicates.subtypeOf;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -62,7 +62,7 @@ public final class SchemaVersion {
    */
   public static String getSchema() {
     return FluentIterable.from(getAllPersistedTypes())
-        .filter(or(subtypeOf(Enum.class), subtypeOf(ImmutableObject.class)))
+        .filter(or(assignableFrom(Enum.class), assignableFrom(ImmutableObject.class)))
         .transform(new Function<Class<?>, String>() {
             @Override
             public String apply(Class<?> clazz) {
diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java
index 642c8f5b8..dd160dc56 100644
--- a/java/google/registry/util/Retrier.java
+++ b/java/google/registry/util/Retrier.java
@@ -15,7 +15,6 @@
 package google.registry.util;
 
 import static com.google.appengine.api.search.checkers.Preconditions.checkArgument;
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.Iterables.any;
 import static com.google.common.math.IntMath.pow;
 import static google.registry.util.PredicateUtils.supertypeOf;
@@ -108,4 +107,14 @@ public class Retrier implements Serializable {
         return any(retryables, supertypeOf(e.getClass()));
       }});
   }
+
+  // TODO(user): Replace with Throwables.throwIfUnchecked
+  private static void throwIfUnchecked(Throwable throwable) {
+    if (throwable instanceof RuntimeException) {
+      throw (RuntimeException) throwable;
+    }
+    if (throwable instanceof Error) {
+      throw (Error) throwable;
+    }
+  }
 }