commit 81fa2978424d371442deb275cf659462d6b10fa5
author Dave Borowitz <dborowitz@google.com> Thu Oct 13 16:15:49 2016 -0400
committer Dave Borowitz <dborowitz@google.com> Thu Oct 13 16:51:28 2016 -0400
tree 2bd65243f301a9c5fb95c84155538dc3b063087a
parent 8fc529157e6ab5b172ae7f3060c54c2a2401a46e

Schema: Use java.util.Optional

Change-Id: I8030ac0292f7b884cc77765329598ac2e977d0a5

gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
index 10f5ecb..faa6934 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java
@@ -18,7 +18,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
@@ -33,6 +32,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 /** Specific version of a secondary index schema. */
 public class Schema<T> {
@@ -149,15 +149,15 @@
       FieldDef<T, ?>... rest) {
     FieldDef<T, ?> field = fields.get(first.getName());
     if (field != null) {
-      return Optional.<FieldDef<T, ?>> of(checkSame(field, first));
+      return Optional.of(checkSame(field, first));
     }
     for (FieldDef<T, ?> f : rest) {
       field = fields.get(f.getName());
       if (field != null) {
-        return Optional.<FieldDef<T, ?>> of(checkSame(field, f));
+        return Optional.of(checkSame(field, f));
       }
     }
-    return Optional.absent();
+    return Optional.empty();
   }
 
   /**