opendev/gerrit
Code Issues Proposed changes

GitUtil: Use java.util.Optional

Browse Source 
Change-Id: I7b1f00bfd3ebc9c4c0b23db755cb73ed28165dbe
This commit is contained in:
Dave Borowitz
2016-10-13 16:37:50 -04:00
parent 7ccfba230b
commit d10d5ec800
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -22,7 +22,6 @@ import static com.google.gerrit.reviewdb.client.Patch.MERGE_LIST;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static org.eclipse.jgit.lib.Constants.HEAD;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -144,6 +143,7 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

10
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java
View File

@@ -16,8 +16,8 @@ package com.google.gerrit.acceptance;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.primitives.Ints;
import com.google.gerrit.common.FooterConstants;
import com.google.gerrit.reviewdb.client.Project;
@@ -50,6 +50,7 @@ import org.eclipse.jgit.util.FS;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -239,10 +240,7 @@ public class GitUtil {
throws IOException {
RevCommit c = tr.getRevWalk().parseCommit(id);
tr.getRevWalk().parseBody(c);
List<String> ids = c.getFooterLines(FooterConstants.CHANGE_ID);
if (ids.isEmpty()) {
return Optional.absent();
}
return Optional.of(ids.get(ids.size() - 1));
return Lists.reverse(c.getFooterLines(FooterConstants.CHANGE_ID)).stream()
.findFirst();
}
}