diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapper.java similarity index 88% rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultMapper.java rename to scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapper.java index 4658a465dc..7abb1ae69b 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapper.java @@ -9,10 +9,10 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -public class BrowserResultMapper { +public class BrowserResultToBrowserResultDtoMapper { @Inject - private FileObjectMapper fileObjectMapper; + private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper; @Inject private ResourceLinks resourceLinks; @@ -35,7 +35,7 @@ public class BrowserResultMapper { } private FileObjectDto mapFileObject(FileObject fileObject, NamespaceAndName namespaceAndName, String revision) { - return fileObjectMapper.map(fileObject, namespaceAndName, revision); + return fileObjectToFileObjectDtoMapper.map(fileObject, namespaceAndName, revision); } private void addLinks(BrowserResult browserResult, BrowserResultDto dto, NamespaceAndName namespaceAndName) { diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java similarity index 94% rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java rename to scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java index f003c236e1..a3d1cae6b5 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java @@ -15,7 +15,7 @@ import java.net.URI; import static de.otto.edison.hal.Link.link; @Mapper -public abstract class FileObjectMapper extends BaseMapper { +public abstract class FileObjectToFileObjectDtoMapper extends BaseMapper { @Inject private ResourceLinks resourceLinks; 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 5ecdaee23d..4cbe6406f8 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 @@ -26,7 +26,7 @@ public class MapperModule extends AbstractModule { bind(BranchToBranchDtoMapper.class).to(Mappers.getMapper(BranchToBranchDtoMapper.class).getClass()); - bind(FileObjectMapper.class).to(Mappers.getMapper(FileObjectMapper.class).getClass()); + bind(FileObjectToFileObjectDtoMapper.class).to(Mappers.getMapper(FileObjectToFileObjectDtoMapper.class).getClass()); bind(UriInfoStore.class).in(ServletScopes.REQUEST); } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java index 3e0ab31ef7..4d0bfc50aa 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java @@ -20,13 +20,13 @@ import java.io.IOException; public class SourceRootResource { private final RepositoryServiceFactory serviceFactory; - private final BrowserResultMapper browserResultMapper; + private final BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper; @Inject - public SourceRootResource(RepositoryServiceFactory serviceFactory, BrowserResultMapper browserResultMapper) { + public SourceRootResource(RepositoryServiceFactory serviceFactory, BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper) { this.serviceFactory = serviceFactory; - this.browserResultMapper = browserResultMapper; + this.browserResultToBrowserResultDtoMapper = browserResultToBrowserResultDtoMapper; } @GET @@ -61,7 +61,7 @@ public class SourceRootResource { BrowserResult browserResult = browseCommand.getBrowserResult(); if (browserResult != null) { - return Response.ok(browserResultMapper.map(browserResult, namespaceAndName)).build(); + return Response.ok(browserResultToBrowserResultDtoMapper.map(browserResult, namespaceAndName)).build(); } else { return Response.status(Response.Status.NOT_FOUND).build(); } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapperTest.java similarity index 89% rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultMapperTest.java rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapperTest.java index 0f973d9713..cf27e35f85 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapperTest.java @@ -21,17 +21,17 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -public class BrowserResultMapperTest { +public class BrowserResultToBrowserResultDtoMapperTest { private final URI baseUri = URI.create("http://example.com/base/"); @SuppressWarnings("unused") // Is injected private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri); @Mock - private FileObjectMapper fileObjectMapper; + private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper; @InjectMocks - private BrowserResultMapper mapper; + private BrowserResultToBrowserResultDtoMapper mapper; private final Subject subject = mock(Subject.class); private final ThreadState subjectThreadState = new SubjectThreadState(subject); @@ -77,8 +77,8 @@ public class BrowserResultMapperTest { BrowserResultDto dto = mapper.map(browserResult, namespaceAndName); - verify(fileObjectMapper).map(fileObject1, namespaceAndName, "Revision"); - verify(fileObjectMapper).map(fileObject2, namespaceAndName, "Revision"); + verify(fileObjectToFileObjectDtoMapper).map(fileObject1, namespaceAndName, "Revision"); + verify(fileObjectToFileObjectDtoMapper).map(fileObject2, namespaceAndName, "Revision"); } private BrowserResult createBrowserResult() { diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java similarity index 96% rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectMapperTest.java rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java index 8aa77e600d..420e99c704 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java @@ -19,14 +19,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.Silent.class) -public class FileObjectMapperTest { +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 FileObjectMapperImpl mapper; + private FileObjectToFileObjectDtoMapperImpl mapper; private final Subject subject = mock(Subject.class); private final ThreadState subjectThreadState = new SubjectThreadState(subject); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java index 5c1bb8c802..596618ec7e 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java @@ -10,7 +10,11 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import sonia.scm.repository.*; +import sonia.scm.repository.BrowserResult; +import sonia.scm.repository.FileObject; +import sonia.scm.repository.NamespaceAndName; +import sonia.scm.repository.RepositoryException; +import sonia.scm.repository.RepositoryNotFoundException; import sonia.scm.repository.api.BrowseCommandBuilder; import sonia.scm.repository.api.RepositoryService; import sonia.scm.repository.api.RepositoryServiceFactory; @@ -42,10 +46,10 @@ public class SourceRootResourceTest { private BrowseCommandBuilder browseCommandBuilder; @Mock - private FileObjectMapper fileObjectMapper; + private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper; @InjectMocks - private BrowserResultMapper browserResultMapper; + private BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper; @Before @@ -57,8 +61,8 @@ public class SourceRootResourceTest { dto.setName("name"); dto.setLength(1024); - when(fileObjectMapper.map(any(FileObject.class), any(NamespaceAndName.class), anyString())).thenReturn(dto); - SourceRootResource sourceRootResource = new SourceRootResource(serviceFactory, browserResultMapper); + when(fileObjectToFileObjectDtoMapper.map(any(FileObject.class), any(NamespaceAndName.class), anyString())).thenReturn(dto); + SourceRootResource sourceRootResource = new SourceRootResource(serviceFactory, browserResultToBrowserResultDtoMapper); RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(new RepositoryResource(null, null,