Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 00:45:44 +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

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 sonia.scm.plugin.Extension;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
import sonia.scm.repository.Trailer;
@@ -46,13 +46,13 @@ import static java.util.Optional.empty;
import static java.util.Optional.of;
@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 Pattern PERSON_PATTERN = Pattern.compile("^\\W*(.*)\\W+<(.*)>\\W*$");
@Inject
public ChangesetDescriptionTrailers() {}
public ChangesetDescriptionTrailerProvider() {}
@Override
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 sonia.scm.repository.Branch;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
import sonia.scm.repository.Tag;
@@ -74,7 +74,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
private TagCollectionToDtoMapper tagCollectionToDtoMapper;
@Inject
private Set<ChangesetTrailers> changesetTrailersSet;
private Set<ChangesetTrailerProvider> changesetTrailerProviderSet;
abstract TrailerDto map(Trailer trailer);
@@ -83,7 +83,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
@AfterMapping
void appendTrailerPersons(Changeset changeset, @MappingTarget ChangesetDto target, @Context Repository repository) {
List<TrailerDto> collectedTrailers = new ArrayList<>();
changesetTrailersSet.stream()
changesetTrailerProviderSet.stream()
.flatMap(changesetTrailers -> changesetTrailers.getTrailers(repository, changeset).stream())
.map(this::map)
.forEach(collectedTrailers::add);