Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

Use regex for trailer line detection

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-04 10:19:29 +02:00
parent f046ad6db2
commit f03c35b7fd
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailerProvider.java
View File

@@ -37,7 +37,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Scanner; import java.util.Scanner;
import java.util.regex.MatchResult;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -45,7 +44,7 @@ import java.util.regex.Pattern;
public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcessorFactory { public class ChangesetDescriptionTrailerProvider 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 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 TRAILER_PATTERN = Pattern.compile("^([\\w-]*):\\W*(.*)\\W+<(.*)>\\W*$");
@Override @Override
public ChangesetPreProcessor createPreProcessor(Repository repository) { public ChangesetPreProcessor createPreProcessor(Repository repository) {
@@ -64,11 +63,14 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
while (scanner.hasNextLine()) { while (scanner.hasNextLine()) {
String line = scanner.nextLine(); String line = scanner.nextLine();
String[] typeAndUser = line.split(":\\W"); Matcher matcher = TRAILER_PATTERN.matcher(line);
if (typeAndUser.length == 2) { if (matcher.matches()) {
String type = typeAndUser[0]; String type = matcher.group(1);
String person = typeAndUser[1]; String name = matcher.group(2);
if (!SUPPORTED_TRAILER_TYPES.contains(type) || !createTrailer(type, person)) { String mail = matcher.group(3);
if (SUPPORTED_TRAILER_TYPES.contains(type)) {
createTrailer(type, name, mail);
} else {
appendLine(scanner, line); appendLine(scanner, line);
} }
} else { } else {
@@ -87,15 +89,8 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
} }
} }
private boolean createTrailer(String type, String person) { private void createTrailer(String type, String name, String mail) {
Matcher matcher = PERSON_PATTERN.matcher(person.trim()); trailers.add(new Trailer(type, new Person(name, mail)));
if (matcher.matches()) {
MatchResult matchResult = matcher.toMatchResult();
trailers.add(new Trailer(type, new Person(matchResult.group(1), matchResult.group(2))));
return true;
} else {
return false;
}
} }
} }
} }