Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-22 16:29:51 +01:00
Code Issues Packages Projects Releases Activity

rename helper class

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-12-18 14:38:09 +01:00
parent 3ea788c3e3
commit c5f7393116
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java
View File

@@ -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> revCommit = doCommit();
push();
return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit));
} else {
return analyseFailure(result);
}

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java
View File

@@ -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> revCommit = doCommit();
push();
return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit));
} else {
return analyseFailure(result);
}

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java → scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRevisionExtractor.java
View File

@@ -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> revCommit) {
static String extractRevisionFromRevCommit(Optional<RevCommit> revCommit) {
if (revCommit.isPresent()) {
return revCommit.get().toString().split(" ")[1];
}