From c2e30a582fde9f193db9776bbcdf71a5ea689091 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Fri, 8 Nov 2019 16:44:04 +0100
Subject: [PATCH] Remove unused mapper

---
 .../sonia/scm/api/v2/resources/MergeResultDto.java   | 12 ------------
 .../scm/api/v2/resources/MergeResultToDtoMapper.java |  9 ---------
 .../sonia/scm/api/v2/resources/MapperModule.java     |  2 --
 3 files changed, 23 deletions(-)
 delete mode 100644 scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java

diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
deleted file mode 100644
index fa523153cf..0000000000
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
+++ /dev/null
@@ -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;
-}
diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
deleted file mode 100644
index 1dbbe8aacd..0000000000
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
+++ /dev/null
@@ -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);
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
index 6b6846f039..48de63969d 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
@@ -47,8 +47,6 @@ public class MapperModule extends AbstractModule {
     bind(ScmViolationExceptionToErrorDtoMapper.class).to(Mappers.getMapper(ScmViolationExceptionToErrorDtoMapper.class).getClass());
     bind(ExceptionWithContextToErrorDtoMapper.class).to(Mappers.getMapper(ExceptionWithContextToErrorDtoMapper.class).getClass());
 
-    bind(MergeResultToDtoMapper.class).to(Mappers.getMapper(MergeResultToDtoMapper.class).getClass());
-
     // no mapstruct required
     bind(MeDtoFactory.class);
     bind(UIPluginDtoMapper.class);