opendev/gerrit
Code Issues Proposed changes

Schema: Use java.util.Optional

Browse Source 
Change-Id: I8030ac0292f7b884cc77765329598ac2e977d0a5
This commit is contained in:
Dave Borowitz
2016-10-13 16:15:49 -04:00
parent 8fc529157e
commit 81fa297842
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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