Remove redundant mapper

FileObjectToFileObjectDtoMapper#map and
BrowserResultToFileObjectDtoMapper#fileObjectToDto had the same
mapstruct implementation.

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java

@@ -1,6 +1,5 @@
 package sonia.scm.api.v2.resources;
 
-import com.google.common.annotations.VisibleForTesting;
 import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
 import org.mapstruct.Context;
@@ -20,14 +19,6 @@ import java.lang.annotation.Target;
 @Mapper
 public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
 
-  @Inject
-  private FileObjectToFileObjectDtoMapper childrenMapper;
-
-  @VisibleForTesting
-  void setChildrenMapper(FileObjectToFileObjectDtoMapper childrenMapper) {
-    this.childrenMapper = childrenMapper;
-  }
-
   FileObjectDto map(BrowserResult browserResult, @Context NamespaceAndName namespaceAndName) {
     FileObjectDto fileObjectDto = fileObjectToDto(browserResult.getFile(), namespaceAndName, browserResult);
     fileObjectDto.setRevision(browserResult.getRevision());
@@ -36,12 +27,8 @@ public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectD
 
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   @Mapping(target = "children", qualifiedBy = Children.class)
-  protected abstract FileObjectDto fileObjectToDto(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult);
-
   @Children
-  protected FileObjectDto childrenToDto(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult) {
+  protected abstract FileObjectDto fileObjectToDto(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult);
-    return childrenMapper.map(fileObject, namespaceAndName, browserResult);
-  }
 
   @Override
   void applyEnrichers(Links.Builder links, Embedded.Builder embeddedBuilder, NamespaceAndName namespaceAndName, BrowserResult browserResult, FileObject fileObject) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java

@@ -1,22 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import de.otto.edison.hal.Embedded;
-import de.otto.edison.hal.Links;
-import org.mapstruct.Context;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import sonia.scm.repository.BrowserResult;
-import sonia.scm.repository.FileObject;
-import sonia.scm.repository.NamespaceAndName;
-
-@Mapper
-public abstract class FileObjectToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
-
-  @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
-  protected abstract FileObjectDto map(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult);
-
-  @Override
-  void applyEnrichers(Links.Builder links, Embedded.Builder embeddedBuilder, NamespaceAndName namespaceAndName, BrowserResult browserResult, FileObject fileObject) {
-    applyEnrichers(new EdisonHalAppender(links, embeddedBuilder), fileObject, namespaceAndName, browserResult, browserResult.getRevision());
-  }
-}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java

@@ -37,7 +37,6 @@ public class MapperModule extends AbstractModule {
 
     bind(TagToTagDtoMapper.class).to(Mappers.getMapper(TagToTagDtoMapper.class).getClass());
 
-    bind(FileObjectToFileObjectDtoMapper.class).to(Mappers.getMapper(FileObjectToFileObjectDtoMapper.class).getClass());
     bind(BrowserResultToFileObjectDtoMapper.class).to(Mappers.getMapper(BrowserResultToFileObjectDtoMapper.class).getClass());
     bind(ModificationsToDtoMapper.class).to(Mappers.getMapper(ModificationsToDtoMapper.class).getClass());
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapperTest.java

@@ -8,7 +8,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mapstruct.factory.Mappers;
-import org.mockito.InjectMocks;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.NamespaceAndName;
@@ -24,9 +23,6 @@ public class BrowserResultToFileObjectDtoMapperTest {
   private final URI baseUri = URI.create("http://example.com/base/");
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
 
-  @InjectMocks
-  private FileObjectToFileObjectDtoMapperImpl fileObjectToFileObjectDtoMapper;
-
   private BrowserResultToFileObjectDtoMapper mapper;
 
   private final Subject subject = mock(Subject.class);
@@ -40,7 +36,6 @@ public class BrowserResultToFileObjectDtoMapperTest {
   public void init() {
     initMocks(this);
     mapper = Mappers.getMapper(BrowserResultToFileObjectDtoMapper.class);
-    mapper.setChildrenMapper(fileObjectToFileObjectDtoMapper);
     mapper.setResourceLinks(resourceLinks);
 
     subjectThreadState.bind();

scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java

@@ -1,121 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.util.ThreadState;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.junit.MockitoJUnitRunner;
-import sonia.scm.repository.BrowserResult;
-import sonia.scm.repository.FileObject;
-import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.SubRepository;
-
-import java.net.URI;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-@RunWith(MockitoJUnitRunner.Silent.class)
-public class FileObjectToFileObjectDtoMapperTest {
-
-  private final URI baseUri = URI.create("http://example.com/base/");
-  @SuppressWarnings("unused") // Is injected
-  private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
-
-  @InjectMocks
-  private FileObjectToFileObjectDtoMapperImpl mapper;
-
-  private final Subject subject = mock(Subject.class);
-  private final ThreadState subjectThreadState = new SubjectThreadState(subject);
-
-  private URI expectedBaseUri;
-
-  @Before
-  public void init() {
-    expectedBaseUri = baseUri.resolve(RepositoryRootResource.REPOSITORIES_PATH_V2 + "/");
-    subjectThreadState.bind();
-    ThreadContext.bind(subject);
-  }
-
-  @After
-  public void unbind() {
-    ThreadContext.unbindSubject();
-  }
-
-  @Test
-  public void shouldMapAttributesCorrectly() {
-    FileObject fileObject = createFileObject();
-    FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("namespace", "name"), new BrowserResult("revision", fileObject));
-
-    assertEqualAttributes(fileObject, dto);
-  }
-
-  @Test
-  public void shouldHaveCorrectSelfLinkForDirectory() {
-    FileObject fileObject = createDirectoryObject();
-    FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("namespace", "name"), new BrowserResult("revision", fileObject));
-
-    assertThat(dto.getLinks().getLinkBy("self").get().getHref()).isEqualTo(expectedBaseUri.resolve("namespace/name/sources/revision/foo/bar").toString());
-  }
-
-  @Test
-  public void shouldHaveCorrectContentLink() {
-    FileObject fileObject = createFileObject();
-    fileObject.setDirectory(false);
-    FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("namespace", "name"), new BrowserResult("revision", fileObject));
-
-    assertThat(dto.getLinks().getLinkBy("self").get().getHref()).isEqualTo(expectedBaseUri.resolve("namespace/name/content/revision/foo/bar").toString());
-  }
-
-  @Test
-  public void shouldAppendLinks() {
-    HalEnricherRegistry registry = new HalEnricherRegistry();
-    registry.register(FileObject.class, (ctx, appender) -> {
-      NamespaceAndName repository = ctx.oneRequireByType(NamespaceAndName.class);
-      FileObject fo = ctx.oneRequireByType(FileObject.class);
-      String rev = ctx.oneRequireByType(String.class);
-
-      appender.appendLink("hog", "http://" + repository.logString() + "/" + fo.getName() + "/" + rev);
-    });
-    mapper.setRegistry(registry);
-
-    FileObject fileObject = createFileObject();
-    FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("hitchhiker", "hog"), new BrowserResult("42", fileObject));
-
-    assertThat(dto.getLinks().getLinkBy("hog").get().getHref()).isEqualTo("http://hitchhiker/hog/foo/42");
-  }
-
-  private FileObject createDirectoryObject() {
-    FileObject fileObject = createFileObject();
-    fileObject.setDirectory(true);
-    return fileObject;
-  }
-
-  private FileObject createFileObject() {
-    FileObject fileObject = new FileObject();
-    fileObject.setName("foo");
-    fileObject.setDescription("bar");
-    fileObject.setPath("foo/bar");
-    fileObject.setDirectory(false);
-    fileObject.setLength(100);
-    fileObject.setLastModified(123L);
-
-    fileObject.setSubRepository(new SubRepository("repo.url"));
-    return fileObject;
-  }
-
-  private void assertEqualAttributes(FileObject fileObject, FileObjectDto dto) {
-    assertThat(dto.getName()).isEqualTo(fileObject.getName());
-    assertThat(dto.getDescription()).isEqualTo(fileObject.getDescription());
-    assertThat(dto.getPath()).isEqualTo(fileObject.getPath());
-    assertThat(dto.isDirectory()).isEqualTo(fileObject.isDirectory());
-    assertThat(dto.getLength()).isEqualTo(fileObject.getLength());
-    assertThat(dto.getLastModified().toEpochMilli()).isEqualTo((long) fileObject.getLastModified());
-    assertThat(dto.getSubRepository().getBrowserUrl()).isEqualTo(fileObject.getSubRepository().getBrowserUrl());
-  }
-}

scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java

@@ -7,7 +7,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.factory.Mappers;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
@@ -41,16 +40,12 @@ public class SourceRootResourceTest extends RepositoryTestBase {
   @Mock
   private BrowseCommandBuilder browseCommandBuilder;
 
-  @InjectMocks
-  private FileObjectToFileObjectDtoMapperImpl fileObjectToFileObjectDtoMapper;
-
   private BrowserResultToFileObjectDtoMapper browserResultToFileObjectDtoMapper;
 
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     browserResultToFileObjectDtoMapper = Mappers.getMapper(BrowserResultToFileObjectDtoMapper.class);
-    browserResultToFileObjectDtoMapper.setChildrenMapper(fileObjectToFileObjectDtoMapper);
     browserResultToFileObjectDtoMapper.setResourceLinks(resourceLinks);
     when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service);
     when(service.getBrowseCommand()).thenReturn(browseCommandBuilder);