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

Harmonize naming of dto mappers

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-24 08:18:08 +02:00
parent 40f963db98
commit f5ba197d10
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapper.java
View File

@@ -9,10 +9,10 @@ import javax.inject.Inject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class BrowserResultMapper { public class BrowserResultToBrowserResultDtoMapper {
@Inject @Inject
private FileObjectMapper fileObjectMapper; private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper;
@Inject @Inject
private ResourceLinks resourceLinks; private ResourceLinks resourceLinks;
@@ -35,7 +35,7 @@ public class BrowserResultMapper {
} }
private FileObjectDto mapFileObject(FileObject fileObject, NamespaceAndName namespaceAndName, String revision) { 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) { private void addLinks(BrowserResult browserResult, BrowserResultDto dto, NamespaceAndName namespaceAndName) {

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java
View File

@@ -15,7 +15,7 @@ import java.net.URI;
import static de.otto.edison.hal.Link.link; import static de.otto.edison.hal.Link.link;
@Mapper @Mapper
public abstract class FileObjectMapper extends BaseMapper<FileObject, FileObjectDto> { public abstract class FileObjectToFileObjectDtoMapper extends BaseMapper<FileObject, FileObjectDto> {
@Inject @Inject
private ResourceLinks resourceLinks; private ResourceLinks resourceLinks;

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

@@ -26,7 +26,7 @@ public class MapperModule extends AbstractModule {
bind(BranchToBranchDtoMapper.class).to(Mappers.getMapper(BranchToBranchDtoMapper.class).getClass()); 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); bind(UriInfoStore.class).in(ServletScopes.REQUEST);
} }

8
scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
View File

@@ -20,13 +20,13 @@ import java.io.IOException;
public class SourceRootResource { public class SourceRootResource {
private final RepositoryServiceFactory serviceFactory; private final RepositoryServiceFactory serviceFactory;
private final BrowserResultMapper browserResultMapper; private final BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper;
@Inject @Inject
public SourceRootResource(RepositoryServiceFactory serviceFactory, BrowserResultMapper browserResultMapper) { public SourceRootResource(RepositoryServiceFactory serviceFactory, BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper) {
this.serviceFactory = serviceFactory; this.serviceFactory = serviceFactory;
this.browserResultMapper = browserResultMapper; this.browserResultToBrowserResultDtoMapper = browserResultToBrowserResultDtoMapper;
} }
@GET @GET
@@ -61,7 +61,7 @@ public class SourceRootResource {
BrowserResult browserResult = browseCommand.getBrowserResult(); BrowserResult browserResult = browseCommand.getBrowserResult();
if (browserResult != null) { if (browserResult != null) {
return Response.ok(browserResultMapper.map(browserResult, namespaceAndName)).build(); return Response.ok(browserResultToBrowserResultDtoMapper.map(browserResult, namespaceAndName)).build();
} else { } else {
return Response.status(Response.Status.NOT_FOUND).build(); return Response.status(Response.Status.NOT_FOUND).build();
} }

10
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultMapperTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToBrowserResultDtoMapperTest.java
View File

@@ -21,17 +21,17 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
public class BrowserResultMapperTest { public class BrowserResultToBrowserResultDtoMapperTest {
private final URI baseUri = URI.create("http://example.com/base/"); private final URI baseUri = URI.create("http://example.com/base/");
@SuppressWarnings("unused") // Is injected @SuppressWarnings("unused") // Is injected
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri); private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@Mock @Mock
private FileObjectMapper fileObjectMapper; private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper;
@InjectMocks @InjectMocks
private BrowserResultMapper mapper; private BrowserResultToBrowserResultDtoMapper mapper;
private final Subject subject = mock(Subject.class); private final Subject subject = mock(Subject.class);
private final ThreadState subjectThreadState = new SubjectThreadState(subject); private final ThreadState subjectThreadState = new SubjectThreadState(subject);
@@ -77,8 +77,8 @@ public class BrowserResultMapperTest {
BrowserResultDto dto = mapper.map(browserResult, namespaceAndName); BrowserResultDto dto = mapper.map(browserResult, namespaceAndName);
verify(fileObjectMapper).map(fileObject1, namespaceAndName, "Revision"); verify(fileObjectToFileObjectDtoMapper).map(fileObject1, namespaceAndName, "Revision");
verify(fileObjectMapper).map(fileObject2, namespaceAndName, "Revision"); verify(fileObjectToFileObjectDtoMapper).map(fileObject2, namespaceAndName, "Revision");
} }
private BrowserResult createBrowserResult() { private BrowserResult createBrowserResult() {

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectMapperTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java
View File

@@ -19,14 +19,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.Silent.class) @RunWith(MockitoJUnitRunner.Silent.class)
public class FileObjectMapperTest { public class FileObjectToFileObjectDtoMapperTest {
private final URI baseUri = URI.create("http://example.com/base/"); private final URI baseUri = URI.create("http://example.com/base/");
@SuppressWarnings("unused") // Is injected @SuppressWarnings("unused") // Is injected
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri); private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@InjectMocks @InjectMocks
private FileObjectMapperImpl mapper; private FileObjectToFileObjectDtoMapperImpl mapper;
private final Subject subject = mock(Subject.class); private final Subject subject = mock(Subject.class);
private final ThreadState subjectThreadState = new SubjectThreadState(subject); private final ThreadState subjectThreadState = new SubjectThreadState(subject);

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

@@ -10,7 +10,11 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; 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.BrowseCommandBuilder;
import sonia.scm.repository.api.RepositoryService; import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -42,10 +46,10 @@ public class SourceRootResourceTest {
private BrowseCommandBuilder browseCommandBuilder; private BrowseCommandBuilder browseCommandBuilder;
@Mock @Mock
private FileObjectMapper fileObjectMapper; private FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper;
@InjectMocks @InjectMocks
private BrowserResultMapper browserResultMapper; private BrowserResultToBrowserResultDtoMapper browserResultToBrowserResultDtoMapper;
@Before @Before
@@ -57,8 +61,8 @@ public class SourceRootResourceTest {
dto.setName("name"); dto.setName("name");
dto.setLength(1024); dto.setLength(1024);
when(fileObjectMapper.map(any(FileObject.class), any(NamespaceAndName.class), anyString())).thenReturn(dto); when(fileObjectToFileObjectDtoMapper.map(any(FileObject.class), any(NamespaceAndName.class), anyString())).thenReturn(dto);
SourceRootResource sourceRootResource = new SourceRootResource(serviceFactory, browserResultMapper); SourceRootResource sourceRootResource = new SourceRootResource(serviceFactory, browserResultToBrowserResultDtoMapper);
RepositoryRootResource repositoryRootResource = RepositoryRootResource repositoryRootResource =
new RepositoryRootResource(MockProvider.of(new RepositoryResource(null, new RepositoryRootResource(MockProvider.of(new RepositoryResource(null,
null, null,