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

Use static create methods instead of ambiguous constructor

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-12-19 09:27:18 +01:00
parent fefd8b6de8
commit 1d3e51ce7b
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java
View File

@@ -23,7 +23,7 @@ class GitFastForwardIfPossible extends GitMergeStrategy {
MergeResult fastForwardResult = mergeWithFastForwardOnlyMode();
if (fastForwardResult.getMergeStatus().isSuccessful()) {
push();
return new MergeCommandResult(Collections.emptyList(), fastForwardResult.getNewHead().toString());
return MergeCommandResult.success(fastForwardResult.getNewHead().toString());
} else {
return fallbackMerge.run();
}

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

@@ -28,7 +28,7 @@ class GitMergeCommit extends GitMergeStrategy {
if (result.getMergeStatus().isSuccessful()) {
Optional<RevCommit> revCommit = doCommit();
push();
return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit));
return MergeCommandResult.success(extractRevisionFromRevCommit(revCommit));
} else {
return analyseFailure(result);
}

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
View File

@@ -69,6 +69,6 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
MergeCommandResult analyseFailure(MergeResult result) {
logger.info("could not merge branch {} into {} due to conflict in paths {}", toMerge, target, result.getConflicts().keySet());
return new MergeCommandResult(result.getConflicts().keySet());
return MergeCommandResult.failure(result.getConflicts().keySet());
}
}

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

@@ -28,7 +28,7 @@ class GitMergeWithSquash extends GitMergeStrategy {
if (result.getMergeStatus().isSuccessful()) {
Optional<RevCommit> revCommit = doCommit();
push();
return new MergeCommandResult(Collections.emptyList(), extractRevisionFromRevCommit(revCommit));
return MergeCommandResult.success(extractRevisionFromRevCommit(revCommit));
} else {
return analyseFailure(result);
}