commit 6ce12bc681dac61bf972344ecf51773f4301e9a3
author Edwin Kempin <ekempin@google.com> Thu Dec 05 10:03:19 2019 +0100
committer Edwin Kempin <ekempin@google.com> Thu Dec 05 10:06:51 2019 +0100
tree 78c162d6c90e720b582b8b1f4df8f276b5a14d15
parent 29bba4dc9448fc1aceb071ce19f3aec74541d695

CreateBranch: Allow revision in input to be empty

If a revision in the input is not specified we default to the HEAD
revision, but when the revision in the input was empty we failed with
400 Bad Request. Be more tolerant and consistent and default to the HEAD
revision too if the specified revision is empty.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ibc1461b744b65dba4857b3ffa00b49bd2c96df99

java/com/google/gerrit/server/restapi/project/CreateBranch.java

diff --git a/java/com/google/gerrit/server/restapi/project/CreateBranch.java b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
index 56948c1..e42b02c 100644
--- a/java/com/google/gerrit/server/restapi/project/CreateBranch.java
+++ b/java/com/google/gerrit/server/restapi/project/CreateBranch.java
@@ -16,6 +16,7 @@
 
 import static com.google.gerrit.entities.RefNames.isConfigRef;
 
+import com.google.common.base.Strings;
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.entities.BranchNameKey;
 import com.google.gerrit.entities.RefNames;
@@ -93,7 +94,7 @@
     if (input.ref != null && !ref.equals(input.ref)) {
       throw new BadRequestException("ref must match URL");
     }
-    if (input.revision == null) {
+    if (Strings.isNullOrEmpty(input.revision)) {
       input.revision = Constants.HEAD;
     }
     while (ref.startsWith("/")) {

javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java

diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
index 267d7ee..b80ce95 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
@@ -166,6 +166,34 @@
   }
 
   @Test
+  public void createWithoutSpecifyingRevision() throws Exception {
+    // If revision is not specified, the branch is created based on HEAD, which points to master.
+    RevCommit expectedRevision = projectOperations.project(project).getHead("master");
+
+    BranchInput input = new BranchInput();
+    input.revision = null;
+    BranchInfo created = branch(testBranch).create(input).get();
+    assertThat(created.ref).isEqualTo(testBranch.branch());
+    assertThat(created.revision).isEqualTo(expectedRevision.name());
+    assertThat(projectOperations.project(project).getHead(testBranch.branch()))
+        .isEqualTo(expectedRevision);
+  }
+
+  @Test
+  public void createWithEmptyRevision() throws Exception {
+    // If revision is not specified, the branch is created based on HEAD, which points to master.
+    RevCommit expectedRevision = projectOperations.project(project).getHead("master");
+
+    BranchInput input = new BranchInput();
+    input.revision = "";
+    BranchInfo created = branch(testBranch).create(input).get();
+    assertThat(created.ref).isEqualTo(testBranch.branch());
+    assertThat(created.revision).isEqualTo(expectedRevision.name());
+    assertThat(projectOperations.project(project).getHead(testBranch.branch()))
+        .isEqualTo(expectedRevision);
+  }
+
+  @Test
   public void createWithBranchNameAsRevision() throws Exception {
     RevCommit expectedRevision = projectOperations.project(project).getHead("master");