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

Naming things

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-02 17:05:23 +02:00
parent 88d4490da9
commit 4fda6daaa0
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-core/src/main/java/sonia/scm/repository/ChangesetTrailers.java → scm-core/src/main/java/sonia/scm/repository/ChangesetTrailerProvider.java
View File

@@ -29,6 +29,6 @@ import sonia.scm.plugin.ExtensionPoint;
import java.util.List; import java.util.List;
@ExtensionPoint @ExtensionPoint
public interface ChangesetTrailers { public interface ChangesetTrailerProvider {
List<Trailer> getTrailers(Repository repository, Changeset changeset); List<Trailer> getTrailers(Repository repository, Changeset changeset);
} }

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

@@ -27,7 +27,7 @@ package sonia.scm.api.v2.resources;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import sonia.scm.plugin.Extension; import sonia.scm.plugin.Extension;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.Trailer; import sonia.scm.repository.Trailer;
@@ -46,13 +46,13 @@ import static java.util.Optional.empty;
import static java.util.Optional.of; import static java.util.Optional.of;
@Extension @Extension
public class ChangesetDescriptionTrailers implements ChangesetTrailers { public class ChangesetDescriptionTrailerProvider implements ChangesetTrailerProvider {
private static final Collection<String> SUPPORTED_TRAILER_TYPES = ImmutableSet.of("Co-authored-by", "Reviewed-by", "Signed-off-by", "Committed-by"); private static final Collection<String> SUPPORTED_TRAILER_TYPES = ImmutableSet.of("Co-authored-by", "Reviewed-by", "Signed-off-by", "Committed-by");
private static final Pattern PERSON_PATTERN = Pattern.compile("^\\W*(.*)\\W+<(.*)>\\W*$"); private static final Pattern PERSON_PATTERN = Pattern.compile("^\\W*(.*)\\W+<(.*)>\\W*$");
@Inject @Inject
public ChangesetDescriptionTrailers() {} public ChangesetDescriptionTrailerProvider() {}
@Override @Override
public List<Trailer> getTrailers(Repository repository, Changeset changeset) { public List<Trailer> getTrailers(Repository repository, Changeset changeset) {

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java
View File

@@ -33,7 +33,7 @@ import org.mapstruct.MappingTarget;
import org.mapstruct.ObjectFactory; import org.mapstruct.ObjectFactory;
import sonia.scm.repository.Branch; import sonia.scm.repository.Branch;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.Tag; import sonia.scm.repository.Tag;
@@ -74,7 +74,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
private TagCollectionToDtoMapper tagCollectionToDtoMapper; private TagCollectionToDtoMapper tagCollectionToDtoMapper;
@Inject @Inject
private Set<ChangesetTrailers> changesetTrailersSet; private Set<ChangesetTrailerProvider> changesetTrailerProviderSet;
abstract TrailerDto map(Trailer trailer); abstract TrailerDto map(Trailer trailer);
@@ -83,7 +83,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
@AfterMapping @AfterMapping
void appendTrailerPersons(Changeset changeset, @MappingTarget ChangesetDto target, @Context Repository repository) { void appendTrailerPersons(Changeset changeset, @MappingTarget ChangesetDto target, @Context Repository repository) {
List<TrailerDto> collectedTrailers = new ArrayList<>(); List<TrailerDto> collectedTrailers = new ArrayList<>();
changesetTrailersSet.stream() changesetTrailerProviderSet.stream()
.flatMap(changesetTrailers -> changesetTrailers.getTrailers(repository, changeset).stream()) .flatMap(changesetTrailers -> changesetTrailers.getTrailers(repository, changeset).stream())
.map(this::map) .map(this::map)
.forEach(collectedTrailers::add); .forEach(collectedTrailers::add);

5
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -30,7 +30,6 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.subject.support.SubjectThreadState;
import org.apache.shiro.util.ThreadContext; import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.util.ThreadState; import org.apache.shiro.util.ThreadState;
import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists; import org.assertj.core.util.Lists;
import org.jboss.resteasy.mock.MockHttpRequest; import org.jboss.resteasy.mock.MockHttpRequest;
import org.jboss.resteasy.mock.MockHttpResponse; import org.jboss.resteasy.mock.MockHttpResponse;
@@ -45,7 +44,7 @@ import sonia.scm.repository.Branch;
import sonia.scm.repository.Branches; import sonia.scm.repository.Branches;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult; import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
@@ -117,7 +116,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
private TagCollectionToDtoMapper tagCollectionToDtoMapper; private TagCollectionToDtoMapper tagCollectionToDtoMapper;
@Mock @Mock
private Set<ChangesetTrailers> changesetTrailers; private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks @InjectMocks

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java
View File

@@ -43,7 +43,7 @@ class ChangesetDescriptionTrailersTest {
private static final Repository REPOSITORY = RepositoryTestData.createHeartOfGold(); private static final Repository REPOSITORY = RepositoryTestData.createHeartOfGold();
private final ChangesetDescriptionTrailers changesetDescriptionTrailers = new ChangesetDescriptionTrailers(); private final ChangesetDescriptionTrailerProvider changesetDescriptionTrailers = new ChangesetDescriptionTrailerProvider();
@Test @Test
void shouldReturnEmptyList() { void shouldReturnEmptyList() {

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
View File

@@ -43,7 +43,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult; import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
@@ -88,7 +88,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
private LogCommandBuilder logCommandBuilder; private LogCommandBuilder logCommandBuilder;
@Mock @Mock
private Set<ChangesetTrailers> changesetTrailers; private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks @InjectMocks
private ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper; private ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
View File

@@ -44,7 +44,7 @@ import sonia.scm.ContextEntry;
import sonia.scm.NotFoundException; import sonia.scm.NotFoundException;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult; import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
@@ -92,7 +92,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
private FileHistoryCollectionToDtoMapper fileHistoryCollectionToDtoMapper; private FileHistoryCollectionToDtoMapper fileHistoryCollectionToDtoMapper;
@Mock @Mock
private Set<ChangesetTrailers> changesetTrailers; private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks @InjectMocks
private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper; private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.java
View File

@@ -45,7 +45,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.NotFoundException; import sonia.scm.NotFoundException;
import sonia.scm.repository.Changeset; import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult; import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers; import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
@@ -110,7 +110,7 @@ public class IncomingRootResourceTest extends RepositoryTestBase {
private IncomingChangesetCollectionToDtoMapper incomingChangesetCollectionToDtoMapper; private IncomingChangesetCollectionToDtoMapper incomingChangesetCollectionToDtoMapper;
@Mock @Mock
private Set<ChangesetTrailers> changesetTrailers; private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks @InjectMocks
private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper; private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper;