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

rename trailer to contributor

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-06-10 11:08:11 +02:00
parent 53fc01b0ba
commit acc3306450
20 changed files with 180 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,17 +26,15 @@ package sonia.scm.api.v2.resources;
import de.otto.edison.hal.Embedded;
import de.otto.edison.hal.Links;
import org.mapstruct.AfterMapping;
import org.mapstruct.Context;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.ObjectFactory;
import sonia.scm.repository.Branch;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
import sonia.scm.repository.Tag;
import sonia.scm.repository.Trailer;
import sonia.scm.repository.Contributor;
import sonia.scm.repository.api.Command;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -44,7 +42,6 @@ import sonia.scm.web.EdisonHalAppender;
import javax.inject.Inject;
import java.util.List;
import java.util.Scanner;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -70,7 +67,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
@Inject
private TagCollectionToDtoMapper tagCollectionToDtoMapper;
abstract TrailerDto map(Trailer trailer);
abstract ContributorDto map(Contributor contributor);
abstract PersonDto map(Person person);

24
scm-webapp/src/main/java/sonia/scm/repository/ChangesetDescriptionTrailerProvider.java → scm-webapp/src/main/java/sonia/scm/repository/ChangesetDescriptionContributorProvider.java
View File

@@ -33,17 +33,17 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Extension
public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcessorFactory {
public class ChangesetDescriptionContributorProvider implements ChangesetPreProcessorFactory {
private static final Collection<String> SUPPORTED_TRAILER_TYPES = ImmutableSet.of("Co-authored-by", "Reviewed-by", "Signed-off-by", "Committed-by");
private static final Pattern TRAILER_PATTERN = Pattern.compile("^([\\w-]*):\\W*(.*)\\W+<(.*)>\\W*$");
private static final Collection<String> SUPPORTED_CONTRIBUTOR_TYPES = ImmutableSet.of("Co-authored-by", "Reviewed-by", "Signed-off-by", "Committed-by");
private static final Pattern CONTRIBUTOR_PATTERN = Pattern.compile("^([\\w-]*):\\W*(.*)\\W+<(.*)>\\W*$");
@Override
public ChangesetPreProcessor createPreProcessor(Repository repository) {
return new TrailerChangesetPreProcessor();
return new ContributorChangesetPreProcessor();
}
private static class TrailerChangesetPreProcessor implements ChangesetPreProcessor {
private static class ContributorChangesetPreProcessor implements ChangesetPreProcessor {
@Override
public void process(Changeset changeset) {
new Worker(changeset).process();
@@ -75,20 +75,20 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
return;
}
if (foundEmptyLine && checkForTrailer(line)) {
if (foundEmptyLine && checkForContributor(line)) {
return;
}
appendLine(scanner, line);
}
private boolean checkForTrailer(String line) {
Matcher matcher = TRAILER_PATTERN.matcher(line);
private boolean checkForContributor(String line) {
Matcher matcher = CONTRIBUTOR_PATTERN.matcher(line);
if (matcher.matches()) {
String type = matcher.group(1);
String name = matcher.group(2);
String mail = matcher.group(3);
if (SUPPORTED_TRAILER_TYPES.contains(type)) {
createTrailer(type, name, mail);
if (SUPPORTED_CONTRIBUTOR_TYPES.contains(type)) {
createContributor(type, name, mail);
return true;
}
}
@@ -107,8 +107,8 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
}
}
private void createTrailer(String type, String name, String mail) {
changeset.addTrailer(new Trailer(type, new Person(name, mail)));
private void createContributor(String type, String name, String mail) {
changeset.addContributor(new Contributor(type, new Person(name, mail)));
}
}
}