From f7e42db850abf46b3ae82276466ffb1cbe92f904 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Mon, 11 Nov 2019 16:50:39 +0100
Subject: [PATCH] Rename method

---
 .../java/sonia/scm/repository/api/BranchCommandBuilder.java | 2 +-
 .../main/java/sonia/scm/repository/spi/BranchCommand.java   | 2 +-
 .../java/sonia/scm/repository/spi/GitBranchCommand.java     | 2 +-
 .../java/sonia/scm/repository/spi/GitBranchCommandTest.java | 6 +++---
 .../main/java/sonia/scm/repository/spi/HgBranchCommand.java | 2 +-
 .../java/sonia/scm/repository/spi/HgBranchCommandTest.java  | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java
index 58e3c5719c..33f4a482ac 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java
@@ -69,7 +69,7 @@ public final class BranchCommandBuilder {
   }
 
   public void delete(String branchName) {
-    command.delete(branchName);
+    command.deleteOrClose(branchName);
   }
 
   private BranchCommand command;
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/BranchCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/BranchCommand.java
index bd644e6d03..d5ba7f8dca 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/BranchCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/BranchCommand.java
@@ -42,5 +42,5 @@ import sonia.scm.repository.api.BranchRequest;
 public interface BranchCommand {
   Branch branch(BranchRequest name);
 
-  void delete(String branchName);
+  void deleteOrClose(String branchName);
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java
index 7a3b260c6f..3650f3c54e 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java
@@ -84,7 +84,7 @@ public class GitBranchCommand extends AbstractGitCommand implements BranchComman
   }
 
   @Override
-  public void delete(String branchName) {
+  public void deleteOrClose(String branchName) {
     try (Git gitRepo = new Git(context.open())) {
       RepositoryHookEvent hookEvent = createBranchHookEvent(BranchHookContextProvider.deleteHookEvent(branchName));
       eventBus.post(new PreReceiveRepositoryHookEvent(hookEvent));
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java
index 408b2cca0c..d9b23f6c7a 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java
@@ -73,14 +73,14 @@ public class GitBranchCommandTest extends AbstractGitCommandTestBase {
   public void shouldDeleteBranch() throws IOException {
     GitContext context = createContext();
     String branchToBeDeleted = "squash";
-    createCommand().delete(branchToBeDeleted);
+    createCommand().deleteOrClose(branchToBeDeleted);
     assertThat(readBranches(context)).filteredOn(b -> b.getName().equals(branchToBeDeleted)).isEmpty();
   }
 
   @Test
   public void shouldThrowInternalRepositoryException() {
     String branchToBeDeleted = "master";
-    assertThrows(InternalRepositoryException.class, () -> createCommand().delete(branchToBeDeleted));
+    assertThrows(InternalRepositoryException.class, () -> createCommand().deleteOrClose(branchToBeDeleted));
   }
 
   private GitBranchCommand createCommand() {
@@ -118,7 +118,7 @@ public class GitBranchCommandTest extends AbstractGitCommandTestBase {
     doNothing().when(eventBus).post(captor.capture());
     when(hookContextFactory.createContext(any(), any())).thenAnswer(this::createMockedContext);
 
-    createCommand().delete("squash");
+    createCommand().deleteOrClose("squash");
 
     List<Object> events = captor.getAllValues();
     assertThat(events.get(0)).isInstanceOf(PreReceiveRepositoryHookEvent.class);
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
index eca8019329..37e0937aca 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
@@ -76,7 +76,7 @@ public class HgBranchCommand extends AbstractCommand implements BranchCommand {
   }
 
   @Override
-  public void delete(String branchName) {
+  public void deleteOrClose(String branchName) {
     try (WorkingCopy<com.aragost.javahg.Repository, com.aragost.javahg.Repository> workingCopy = workdirFactory.createWorkingCopy(getContext(), branchName)) {
       User currentUser = SecurityUtils.getSubject().getPrincipals().oneByType(User.class);
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java
index 68649d9268..4a41e469ac 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java
@@ -60,7 +60,7 @@ public class HgBranchCommandTest extends AbstractHgCommandTestBase {
   public void shouldCloseBranch() {
     String branchToBeClosed = "test-branch";
 
-    new HgBranchCommand(cmdContext, repository, workdirFactory).delete(branchToBeClosed);
+    new HgBranchCommand(cmdContext, repository, workdirFactory).deleteOrClose(branchToBeClosed);
     assertThat(readBranches()).filteredOn(b -> b.getName().equals(branchToBeClosed)).isEmpty();
   }
 
@@ -68,8 +68,8 @@ public class HgBranchCommandTest extends AbstractHgCommandTestBase {
   public void shouldThrowInternalRepositoryException() {
     String branchToBeClosed = "default";
 
-    new HgBranchCommand(cmdContext, repository, workdirFactory).delete(branchToBeClosed);
-    assertThrows(InternalRepositoryException.class, () -> new HgBranchCommand(cmdContext, repository, workdirFactory).delete(branchToBeClosed));
+    new HgBranchCommand(cmdContext, repository, workdirFactory).deleteOrClose(branchToBeClosed);
+    assertThrows(InternalRepositoryException.class, () -> new HgBranchCommand(cmdContext, repository, workdirFactory).deleteOrClose(branchToBeClosed));
   }
 
   private List<Branch> readBranches() {