opendev/gerrit
Code Issues Proposed changes

ChangeTriplet: Use java.util.Optional

Browse Source 
Change-Id: I2883e89bfec5e43a947d01fea9fee6d04062ab03
This commit is contained in:
Dave Borowitz
2016-10-13 16:06:14 -04:00
parent 8069ac9268
commit 85ef799a62
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java
View File

@@ -14,7 +14,6 @@
package com.google.gerrit.server;
import com.google.common.base.Optional;
import com.google.common.primitives.Ints;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.change.ChangeTriplet;
@@ -30,6 +29,7 @@ import com.google.inject.Singleton;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@Singleton
public class ChangeFinder {

5
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeTriplet.java
View File

@@ -15,12 +15,13 @@
package com.google.gerrit.server.change;
import com.google.auto.value.AutoValue;
import com.google.common.base.Optional;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import java.util.Optional;
@AutoValue
public abstract class ChangeTriplet {
public static String format(Change change) {
@@ -44,7 +45,7 @@ public abstract class ChangeTriplet {
int t2 = triplet.lastIndexOf('~');
int t1 = triplet.lastIndexOf('~', t2 - 1);
if (t1 < 0 || t2 < 0) {
return Optional.absent();
return Optional.empty();
}
String project = Url.decode(triplet.substring(0, t1));

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
View File

@@ -19,7 +19,6 @@ import static com.google.gerrit.server.query.change.ChangeData.asChanges;
import static java.util.stream.Collectors.toSet;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -85,6 +84,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;