diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java index f527cff900..3c76ae1631 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java @@ -4,8 +4,6 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.MergeCommand; import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.revwalk.RevCommit; -import sonia.scm.ContextEntry; -import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.Repository; import sonia.scm.repository.api.MergeCommandResult; @@ -13,7 +11,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Optional; -import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit; +import static sonia.scm.repository.spi.GitRevisionExtractor.extractRevisionFromRevCommit; class GitMergeCommit extends GitMergeStrategy { @@ -30,7 +28,7 @@ class GitMergeCommit extends GitMergeStrategy { if (result.getMergeStatus().isSuccessful()) { Optional revCommit = doCommit(); push(); - return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit)); + return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit)); } else { return analyseFailure(result); } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java index d50ff1737d..44a690cbd0 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Optional; -import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit; +import static sonia.scm.repository.spi.GitRevisionExtractor.extractRevisionFromRevCommit; class GitMergeWithSquash extends GitMergeStrategy { @@ -28,7 +28,7 @@ class GitMergeWithSquash extends GitMergeStrategy { if (result.getMergeStatus().isSuccessful()) { Optional revCommit = doCommit(); push(); - return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit)); + return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit)); } else { return analyseFailure(result); } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRevisionExtractor.java similarity index 66% rename from scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java rename to scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRevisionExtractor.java index 5bca7440d2..6db9dea066 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRevisionExtractor.java @@ -4,9 +4,9 @@ import org.eclipse.jgit.revwalk.RevCommit; import java.util.Optional; -public class GitMerger { +public class GitRevisionExtractor { - static String evaluateRevisionFromMergeCommit(Optional revCommit) { + static String extractRevisionFromRevCommit(Optional revCommit) { if (revCommit.isPresent()) { return revCommit.get().toString().split(" ")[1]; }