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

move mergeResultDto + mapper to scm-core

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-11-05 09:51:58 +01:00
parent 9df12bc35e
commit db46441adf
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
View File

@@ -1,12 +0,0 @@
package sonia.scm.api.v2.resources;
import lombok.Getter;
import lombok.Setter;
import java.util.Collection;
@Getter
@Setter
public class MergeResultDto {
private Collection<String> filesWithConflict;
}

9
scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
View File

@@ -1,9 +0,0 @@
package sonia.scm.api.v2.resources;
import org.mapstruct.Mapper;
import sonia.scm.repository.api.MergeCommandResult;
@Mapper
public interface MergeResultToDtoMapper {
MergeResultDto map(MergeCommandResult result);
}