opendev/gerrit
Code Issues Proposed changes

Use Constants.EMPTY_TREE_ID from JGit

Browse Source 
Change-Id: Id0e806865a60daaeb1ce9852f2ae4e873978054c
This commit is contained in:
Dave Borowitz
2019-05-16 15:32:56 +02:00
committed by David Pursehouse
parent b4b7c82382
commit 1c8de10423
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/gpg/PublicKeyStore.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.gpg;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.lib.Constants.EMPTY_TREE_ID;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
@@ -75,10 +76,6 @@ import org.eclipse.jgit.util.NB;
* after checking with a {@link PublicKeyChecker}. * after checking with a {@link PublicKeyChecker}.
*/ */
public class PublicKeyStore implements AutoCloseable { public class PublicKeyStore implements AutoCloseable {
private static final ObjectId EMPTY_TREE =
ObjectId.fromString("4b825dc642cb6eb9a060e54bf8d69288fbee4904");
/** Ref where GPG public keys are stored. */ /** Ref where GPG public keys are stored. */
public static final String REFS_GPG_KEYS = "refs/meta/gpg-keys"; public static final String REFS_GPG_KEYS = "refs/meta/gpg-keys";
@@ -361,7 +358,7 @@ public class PublicKeyStore implements AutoCloseable {
deleteFromNotes(ins, fp); deleteFromNotes(ins, fp);
} }
cb.setTreeId(notes.writeTree(ins)); cb.setTreeId(notes.writeTree(ins));
if (cb.getTreeId().equals(tip != null ? tip.getTree() : EMPTY_TREE)) { if (cb.getTreeId().equals(tip != null ? tip.getTree() : EMPTY_TREE_ID)) {
return RefUpdate.Result.NO_CHANGE; return RefUpdate.Result.NO_CHANGE;
} }

5
javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -28,6 +28,7 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
import static org.eclipse.jgit.lib.Constants.EMPTY_TREE_ID;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@@ -1089,9 +1090,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
.create(admin.newIdent(), testRepo, "Change 1", ImmutableMap.of()) .create(admin.newIdent(), testRepo, "Change 1", ImmutableMap.of())
.to("refs/for/master"); .to("refs/for/master");
change.assertOkStatus(); change.assertOkStatus();
// TODO(dborowitz): Use EMPTY_TREE_ID after upgrading to https://git.eclipse.org/r/127473 assertThat(change.getCommit().getTree()).isEqualTo(EMPTY_TREE_ID);
assertThat(change.getCommit().getTree())
.isEqualTo(ObjectId.fromString("4b825dc642cb6eb9a060e54bf8d69288fbee4904"));
Map<BranchNameKey, ObjectId> actual = fetchFromSubmitPreview(change.getChangeId()); Map<BranchNameKey, ObjectId> actual = fetchFromSubmitPreview(change.getChangeId());
assertThat(projectOperations.project(project).hasHead("master")).isFalse(); assertThat(projectOperations.project(project).hasHead("master")).isFalse();