Skip to content

The Unified and Autonomous Development Platform

Able to customize patterns for issue fix via commit message

Robin Shen33df8011410f
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 9960828a20..c09abcba17 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -1,11 +1,11 @@
package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.*;
@@ -44,18 +44,15 @@ import io.onedev.server.util.ProjectIssueStats;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.validation.validator.ProjectPathValidator;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.unbescape.java.JavaEscape;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -64,30 +61,12 @@ import javax.persistence.criteria.*;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
@Singleton
public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssueManager, Serializable {
private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);
-
- private static final List<String> ISSUE_FIX_WORDS = Lists.newArrayList(
- "fix", "fixed", "fixes", "fixing",
- "resolve", "resolved", "resolves", "resolving",
- "close", "closed", "closes", "closing");
-
- private static final Pattern ISSUE_FIX_PATTERN;
-
- static {
- StringBuilder builder = new StringBuilder("(^|[\\W|/]+)(");
- builder.append(StringUtils.join(ISSUE_FIX_WORDS, "|"));
- builder.append(")\\s+issue\\s+(");
- builder.append(JavaEscape.unescapeJava(ProjectPathValidator.PATTERN.pattern()));
- builder.append(")?#(\\d+)(?=$|[\\W|/]+)");
- ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());
- }
private final IssueFieldManager fieldManager;
@@ -1175,39 +1154,22 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Override
public Collection<Long> parseFixedIssueIds(Project project, String commitMessage) {
Collection<Long> issueIds = new HashSet<>();
-
- // Skip unmatched commit message quickly
- boolean fixWordsFound = false;
- String lowerCaseCommitMessage = commitMessage.toLowerCase();
- for (String word: ISSUE_FIX_WORDS) {
- if (lowerCaseCommitMessage.indexOf(word) != -1) {
- fixWordsFound = true;
- break;
- }
- }
-
- if (fixWordsFound
- && lowerCaseCommitMessage.contains("#")
- && lowerCaseCommitMessage.contains("issue")) {
- Matcher matcher = ISSUE_FIX_PATTERN.matcher(lowerCaseCommitMessage);
- while (matcher.find()) {
- String projectPath = matcher.group(3);
- Project projectOfIssue;
- if (projectPath == null)
- projectOfIssue = project;
- else
- projectOfIssue = projectManager.findByPath(projectPath);
- if (projectOfIssue != null
- && (projectOfIssue.isSelfOrAncestorOf(project) || project.isSelfOrAncestorOf(projectOfIssue))) {
- Long issueNumber = Long.parseLong(matcher.group(matcher.groupCount()));
- Long issueId = getIssueId(projectOfIssue.getId(), issueNumber);
- if (issueId != null)
- issueIds.add(issueId);
- }
+ for (var issue: getIssueSetting().getCommitMessageFixPatterns().parseFixedIssues(commitMessage)) {
+ Project projectOfIssue;
+ var projectPath = issue.getLeft();
+ if (projectPath == null)
+ projectOfIssue = project;
+ else
+ projectOfIssue = projectManager.findByPath(projectPath);
+ if (projectOfIssue != null
+ && (projectOfIssue.isSelfOrAncestorOf(project) || project.isSelfOrAncestorOf(projectOfIssue))) {
+ var issueNumber = issue.getRight();
+ Long issueId = getIssueId(projectOfIssue.getId(), issueNumber);
+ if (issueId != null)
+ issueIds.add(issueId);
}
}
-
return issueIds;
}
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
index 4745b665c6..8d2495c2ac 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
@@ -62,7 +62,7 @@ public class ReferenceParser {
return new ArrayList<>(references);
}
- private boolean fastScan(String text) {
+ public static boolean fastScan(String text) {
var chars = text.toCharArray();
for (var i=0; i<chars.length; i++) {
if (chars[i] == '#' && i<chars.length-1 && Character.isDigit(chars[i+1]))
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
index 6cd18596f4..cc0912126c 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
@@ -228,8 +228,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager
return new Pair<>(commitBytes, lastCommitId);
});
- if (!isCommitCollected(result.getFirst())) {
- processCommitRange(project, commitId, result.getSecond(), (untilCommitId, sinceCommitId) -> env.executeInTransaction(txn -> {
+ if (!isCommitCollected(result.getLeft())) {
+ processCommitRange(project, commitId, result.getRight(), (untilCommitId, sinceCommitId) -> env.executeInTransaction(txn -> {
AtomicInteger totalCommitCount = new AtomicInteger(readInt(defaultStore, txn, COMMIT_COUNT_KEY, 0));
NextIndex nextIndex = new NextIndex();
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 241a450b14..f7496f2118 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -4741,8 +4741,8 @@ public class DataMigrator {
Element mentionElement = mentionsElement.addElement("io.onedev.server.model.IssueMention");
mentionElement.addElement("id").setText(String.valueOf(id++));
mentionElement.addAttribute("revision", "0.0");
- mentionElement.addElement("issue").setText(issueMention.getFirst());
- mentionElement.addElement("user").setText(issueMention.getSecond());
+ mentionElement.addElement("issue").setText(issueMention.getLeft());
+ mentionElement.addElement("user").setText(issueMention.getRight());
}
mentionsDom.writeToFile(mentionsFile, true);
@@ -4755,8 +4755,8 @@ public class DataMigrator {
Element mentionElement = mentionsElement.addElement("io.onedev.server.model.PullRequestMention");
mentionElement.addElement("id").setText(String.valueOf(id++));
mentionElement.addAttribute("revision", "0.0");
- mentionElement.addElement("request").setText(it.getFirst());
- mentionElement.addElement("user").setText(it.getSecond());
+ mentionElement.addElement("request").setText(it.getLeft());
+ mentionElement.addElement("user").setText(it.getRight());
}
mentionsDom.writeToFile(mentionsFile, true);
@@ -4769,8 +4769,8 @@ public class DataMigrator {
Element mentionElement = mentionsElement.addElement("io.onedev.server.model.CodeCommentMention");
mentionElement.addElement("id").setText(String.valueOf(id++));
mentionElement.addAttribute("revision", "0.0");
- mentionElement.addElement("comment").setText(it.getFirst());
- mentionElement.addElement("user").setText(it.getSecond());
+ mentionElement.addElement("comment").setText(it.getLeft());
+ mentionElement.addElement("user").setText(it.getRight());
}
mentionsDom.writeToFile(mentionsFile, true);
}
@@ -5288,5 +5288,29 @@ public class DataMigrator {
FileUtils.deleteFile(file);
}
}
+
+ private void migrate121(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("ISSUE")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ var commitMessageFixPatternsElement = valueElement.addElement("commitMessageFixPatterns");
+ var entriesElement = commitMessageFixPatternsElement.addElement("entries");
+ var entryElement = entriesElement.addElement("io.onedev.server.model.support.issue.CommitMessageFixPatterns_-Entry");
+ entryElement.addElement("prefix").setText("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");
+ entryElement.addElement("suffix").setText("(?=$|\\W)");
+ entryElement = entriesElement.addElement("io.onedev.server.model.support.issue.CommitMessageFixPatterns_-Entry");
+ entryElement.addElement("prefix").setText("\\(\\s*");
+ entryElement.addElement("suffix").setText("\\s*\\)\\s*$");
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 208d5673fb..ddad066fb1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -1,39 +1,23 @@
package io.onedev.server.model.support.administration;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
import com.google.common.collect.Lists;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.Choice;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsOneOf;
-import io.onedev.server.model.support.issue.BoardSpec;
-import io.onedev.server.model.support.issue.IssueTemplate;
-import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.issue.*;
import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;
-import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
-import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
+import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.DefaultValue;
import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.SpecifiedDefaultValue;
+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
@@ -44,15 +28,18 @@ import io.onedev.server.util.match.Matcher;
import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
-import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import io.onedev.server.annotation.Editable;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.web.component.issue.workflowreconcile.*;
+
+import javax.annotation.Nullable;
+import javax.validation.ConstraintValidatorContext;
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
@Editable
-public class GlobalIssueSetting implements Serializable {
+@ClassValidating
+public class GlobalIssueSetting implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
@@ -72,6 +59,8 @@ public class GlobalIssueSetting implements Serializable {
private List<IssueTemplate> issueTemplates = new ArrayList<>();
+ private CommitMessageFixPatterns commitMessageFixPatterns;
+
private boolean reconciled = true;
public GlobalIssueSetting() {
@@ -277,6 +266,16 @@ public class GlobalIssueSetting implements Serializable {
namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));
namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));
namedQueries.add(new NamedIssueQuery("All", null));
+
+ commitMessageFixPatterns = new CommitMessageFixPatterns();
+ var entry = new CommitMessageFixPatterns.Entry();
+ entry.setPrefix("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");
+ entry.setSuffix("(?=$|\\W)");
+ commitMessageFixPatterns.getEntries().add(entry);
+ entry = new CommitMessageFixPatterns.Entry();
+ entry.setPrefix("\\(\\s*");
+ entry.setSuffix("\\s*\\)\\s*$");
+ commitMessageFixPatterns.getEntries().add(entry);
}
public List<String> sortFieldNames(Collection<String> fieldNames) {
@@ -716,6 +715,14 @@ public class GlobalIssueSetting implements Serializable {
this.issueTemplates = issueTemplates;
}
+ public CommitMessageFixPatterns getCommitMessageFixPatterns() {
+ return commitMessageFixPatterns;
+ }
+
+ public void setCommitMessageFixPatterns(CommitMessageFixPatterns commitMessageFixPatterns) {
+ this.commitMessageFixPatterns = commitMessageFixPatterns;
+ }
+
@Nullable
public NamedIssueQuery getNamedQuery(String name) {
for (NamedIssueQuery namedQuery: getNamedQueries()) {
@@ -736,5 +743,12 @@ public class GlobalIssueSetting implements Serializable {
public int getStateOrdinal(String state) {
return getStateSpecs().indexOf(getStateSpec(state));
}
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ context.disableDefaultConstraintViolation();
+ context.buildConstraintViolationWithTemplate("shit").addPropertyNode("commitMessageFixPatterns").addConstraintViolation();
+ return false;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.java b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.java
new file mode 100644
index 0000000000..97302a1b7a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixPatterns.java
@@ -0,0 +1,155 @@
+package io.onedev.server.model.support.issue;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.entityreference.ReferenceParser;
+import io.onedev.server.util.Pair;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.validation.validator.ProjectPathValidator;
+import org.unbescape.java.JavaEscape;
+
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+@Editable
+@ClassValidating
+public class CommitMessageFixPatterns implements Serializable, Validatable {
+ private static final long serialVersionUID = 1L;
+
+ private List<Entry> entries = new ArrayList<>();
+
+ private transient List<Pattern> patterns;
+
+ @Editable
+ @OmitName
+ public List<Entry> getEntries() {
+ return entries;
+ }
+
+ public void setEntries(List<Entry> entries) {
+ this.entries = entries;
+ }
+
+ private List<Pattern> getPatterns() {
+ if (patterns == null) {
+ patterns = new ArrayList<>();
+ for (var entry: entries) {
+ var builder = new StringBuilder();
+ if (entry.getPrefix() != null)
+ builder.append("(").append(entry.getPrefix()).append(")");
+ builder.append("(issue\\s+)?");
+ builder.append("(?<project>").append(JavaEscape.unescapeJava(ProjectPathValidator.PATTERN.pattern())).append(")?");
+ builder.append("#(?<issue>\\d+)");
+ if (entry.getSuffix() != null)
+ builder.append("(").append(entry.getSuffix()).append(")");
+ patterns.add(Pattern.compile(builder.toString(), CASE_INSENSITIVE));
+ }
+ }
+ return patterns;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean isValid = true;
+ int index = 0;
+ for (var entry: entries) {
+ if (entry.getPrefix() != null) {
+ try {
+ Pattern.compile(entry.getPrefix());
+ } catch (Exception e) {
+ isValid = false;
+ var message = e.getMessage();
+ if (message == null)
+ message = "Malformed regular expression";
+ context.buildConstraintViolationWithTemplate(message)
+ .addPropertyNode("entries")
+ .addPropertyNode("prefix")
+ .inIterable()
+ .atIndex(index)
+ .addConstraintViolation();
+ }
+ }
+ if (entry.getSuffix() != null) {
+ try {
+ Pattern.compile(entry.getSuffix());
+ } catch (Exception e) {
+ isValid = false;
+ var message = e.getMessage();
+ if (message == null)
+ message = "Malformed regular expression";
+ context.buildConstraintViolationWithTemplate(message)
+ .addPropertyNode("entries")
+ .addPropertyNode("suffix")
+ .inIterable()
+ .atIndex(index)
+ .addConstraintViolation();
+ }
+ }
+ index++;
+ }
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+ return isValid;
+ }
+
+ public List<Pair<String, Long>> parseFixedIssues(String commitMessage) {
+ List<Pair<String, Long>> issues = new ArrayList<>();
+
+ commitMessage = commitMessage.toLowerCase();
+ for (var line: StringUtils.splitAndTrim(commitMessage, "\n")) {
+ if (ReferenceParser.fastScan(commitMessage)) {
+ for (var pattern: getPatterns()) {
+ Matcher matcher = pattern.matcher(line);
+ while (matcher.find()) {
+ String projectPath = matcher.group("project");
+ Long issueNumber = Long.parseLong(matcher.group("issue"));
+ issues.add(new Pair<>(projectPath, issueNumber));
+ }
+ }
+ }
+ }
+ return issues;
+ }
+
+ @Editable
+ public static class Entry implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String prefix;
+
+ private String suffix;
+
+ @Editable(order = 100, name="Prefix Pattern", description = "Specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression</a> " +
+ "before issue number")
+ @NotEmpty
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ @Editable(order = 200, name="Suffix Pattern", description = "Specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression</a> " +
+ "after issue number")
+ @NotEmpty
+ public String getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java b/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java
index efec01062a..199c713c26 100644
--- a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java
@@ -57,15 +57,15 @@ public class OAuthUtils {
new Date());
accessTokenCache.put(refreshToken, cacheEntry);
} else {
- long lifetime = cacheEntry.getFirst().getLifetime();
- if (lifetime != 0 && new DateTime(cacheEntry.getSecond()).plusSeconds((int)lifetime).isBeforeNow()) {
+ long lifetime = cacheEntry.getLeft().getLifetime();
+ if (lifetime != 0 && new DateTime(cacheEntry.getRight()).plusSeconds((int)lifetime).isBeforeNow()) {
cacheEntry = new Pair<>(
generateAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken),
new Date());
accessTokenCache.put(refreshToken, cacheEntry);
}
}
- return cacheEntry.getFirst().getValue();
+ return cacheEntry.getLeft().getValue();
}
public static AccessToken generateAccessToken(String tokenEndpoint,
diff --git a/server-core/src/main/java/io/onedev/server/util/Pair.java b/server-core/src/main/java/io/onedev/server/util/Pair.java
index d3ea90f6fa..466f952e45 100644
--- a/server-core/src/main/java/io/onedev/server/util/Pair.java
+++ b/server-core/src/main/java/io/onedev/server/util/Pair.java
@@ -8,43 +8,47 @@ import java.util.Map;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-public class Pair<FirstType, SecondType> implements Serializable {
+import javax.annotation.Nullable;
+
+public class Pair<L, R> implements Serializable {
private static final long serialVersionUID = 1L;
- private FirstType first;
+ private L left;
- private SecondType second;
+ private R right;
public Pair() {
}
- public Pair(FirstType first, SecondType second) {
- this.first = first;
- this.second = second;
+ public Pair(@Nullable L left, @Nullable R right) {
+ this.left = left;
+ this.right = right;
}
- public FirstType getFirst() {
- return first;
+ @Nullable
+ public L getLeft() {
+ return left;
}
- public void setFirst(FirstType first) {
- this.first = first;
+ public void setLeft(@Nullable L left) {
+ this.left = left;
}
- public SecondType getSecond() {
- return second;
+ @Nullable
+ public R getRight() {
+ return right;
}
- public void setSecond(SecondType second) {
- this.second = second;
+ public void setRight(@Nullable R right) {
+ this.right = right;
}
- public static <FirstType, SecondType> List<Pair<FirstType, SecondType>> getPairs(Map<FirstType, SecondType> map) {
- List<Pair<FirstType, SecondType>> pairs = new ArrayList<Pair<FirstType, SecondType>>();
- for (Map.Entry<FirstType, SecondType> entry: map.entrySet()) {
- pairs.add(new Pair<FirstType, SecondType>(entry.getKey(), entry.getValue()));
+ public static <L, R> List<Pair<L, R>> getPairs(Map<L, R> map) {
+ List<Pair<L, R>> pairs = new ArrayList<Pair<L, R>>();
+ for (Map.Entry<L, R> entry: map.entrySet()) {
+ pairs.add(new Pair<L, R>(entry.getKey(), entry.getValue()));
}
return pairs;
}
@@ -58,16 +62,16 @@ public class Pair<FirstType, SecondType> implements Serializable {
return true;
Pair otherPair = (Pair) other;
return new EqualsBuilder()
- .append(first, otherPair.getFirst())
- .append(second, otherPair.getSecond())
+ .append(left, otherPair.getLeft())
+ .append(right, otherPair.getRight())
.isEquals();
}
@Override
public int hashCode() {
return new HashCodeBuilder(17, 37)
- .append(first)
- .append(second)
+ .append(left)
+ .append(right)
.toHashCode();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 939d6b1a9f..64d2aa6f35 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -482,7 +482,7 @@ public class BlobTextDiffPanel extends Panel {
markRange = change.getAnnotationSupport().getMarkRange();
Pair<CodeComment, DiffPlanarRange> openCommentPair = change.getAnnotationSupport().getOpenComment();
if (openCommentPair != null)
- openCommentInfo = new DiffCodeCommentInfo(openCommentPair.getFirst(), openCommentPair.getSecond());
+ openCommentInfo = new DiffCodeCommentInfo(openCommentPair.getLeft(), openCommentPair.getRight());
else
openCommentInfo = null;
commentContainerId = "'" + change.getAnnotationSupport().getCommentContainer().getMarkupId() + "'";
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 3d46e11e84..08a3b23ca6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -920,7 +920,7 @@ public abstract class RevisionDiffPanel extends Panel {
} else {
Pair<CodeComment, DiffPlanarRange> openCommentPair = getOpenComment();
if (openCommentPair != null)
- return openCommentPair.getSecond();
+ return openCommentPair.getRight();
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index ad9ed9baed..64c42e86d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -23,6 +23,7 @@ import io.onedev.server.web.page.admin.groupmanagement.membership.GroupMembershi
import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
@@ -280,6 +281,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~administration/settings/issue-boards", DefaultBoardListPage.class));
add(new BasePageMapper("~administration/settings/issue-links", LinkSpecListPage.class));
add(new BasePageMapper("~administration/settings/issue-templates", IssueTemplateListPage.class));
+ add(new BasePageMapper("~administration/settings/commit-message-fix-patterns", CommitMessageFixPatternsPage.class));
add(new BasePageMapper("~administration/settings/branding", BrandingSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.html
new file mode 100644
index 0000000000..33ccf24eeb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.html
@@ -0,0 +1,13 @@
+<wicket:extend>
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/>Commit message can be used to fix issues
+ by prefixing and suffixing issue number with specified pattern. Each line of
+ the commit message will be matched against each entry defined here to find
+ issues to be fixed
+ </div>
+ <form wicket:id="form">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary" value="Update">
+ </form>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.java
new file mode 100644
index 0000000000..62ee9d03d7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/commitmessagefixpatterns/CommitMessageFixPatternsPage.java
@@ -0,0 +1,50 @@
+package io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.issue.CommitMessageFixPatterns;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class CommitMessageFixPatternsPage extends IssueSettingPage {
+
+ public CommitMessageFixPatternsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ CommitMessageFixPatterns patterns = getSettingManager().getIssueSetting().getCommitMessageFixPatterns();
+ Form<?> form = new Form<Void>("form") {
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ var issueSetting = getSettingManager().getIssueSetting();
+ issueSetting.setCommitMessageFixPatterns(patterns);
+ getSettingManager().saveIssueSetting(issueSetting);
+ Session.get().success("Setting updated");
+ }
+ };
+ form.add(new FencedFeedbackPanel("feedback", form));
+ form.add(BeanContext.edit("editor", patterns));
+ add(form);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Commit Message Fix Patterns</span>").setEscapeModelStrings(false);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index e3273e08cc..f798f725c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -34,6 +34,7 @@ import io.onedev.server.web.page.admin.groupmanagement.GroupPage;
import io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
@@ -194,6 +195,8 @@ public abstract class LayoutPage extends BasePage {
LinkSpecListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
IssueTemplateListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Commit Message Fix Patterns",
+ CommitMessageFixPatternsPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Settings", issueSettingMenuItems));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 186b85fbfb..2d74f2f49b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -81,7 +81,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.joda.time.DateTime;
import javax.annotation.Nullable;
import java.util.*;
@@ -151,9 +150,9 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
if (verifiedEmailAddresses.contains(commit.getAuthorIdent().getEmailAddress().toLowerCase()))
branchUpdates.add(new Pair<>(GitUtils.ref2branch(ref.getName()), commit.getCommitTime()));
}
- branchUpdates.sort(Comparator.comparing(Pair::getSecond));
+ branchUpdates.sort(Comparator.comparing(Pair::getRight));
if (!branchUpdates.isEmpty())
- return branchUpdates.get(branchUpdates.size()-1).getFirst();
+ return branchUpdates.get(branchUpdates.size()-1).getLeft();
else
return getProject().getDefaultBranch();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
index 26e0425e8b..4d7d70fb19 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
@@ -167,13 +167,13 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends Pro
@Override
public int compare(Pair<Method, Integer> o1, Pair<Method, Integer> o2) {
- return o1.getSecond() - o2.getSecond();
+ return o1.getRight() - o2.getRight();
}
});
List<List<Method>> groupedMetricGetters = new ArrayList<>();
- metricGetters.stream().map(it->it.getFirst()).forEach(it-> {
+ metricGetters.stream().map(it->it.getLeft()).forEach(it-> {
MetricIndicator indicator = Preconditions.checkNotNull(it.getAnnotation(MetricIndicator.class));
if (indicator.group().length() != 0) {
List<Method> metricGettersOfGroup = null;
diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.java
new file mode 100644
index 0000000000..c720406ab9
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixPatternsTest.java
@@ -0,0 +1,36 @@
+package io.onedev.server.model.support.issue;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class CommitMessageFixPatternsTest {
+
+ @Test
+ public void parseFixedIssues() {
+ var commitMessageFixPatterns = new CommitMessageFixPatterns();
+ var entry = new CommitMessageFixPatterns.Entry();
+ entry.setPrefix("(^|\\W)(fix|fixed|fixes|fixing|resolve|resolved|resolves|resolving|close|closed|closes|closing)[\\s:]+");
+ entry.setSuffix("(?=$|\\W)");
+ commitMessageFixPatterns.getEntries().add(entry);
+ entry = new CommitMessageFixPatterns.Entry();
+ entry.setPrefix("\\(\\s*");
+ entry.setSuffix("\\s*\\)\\s*$");
+ commitMessageFixPatterns.getEntries().add(entry);
+
+ var issues = commitMessageFixPatterns.parseFixedIssues("" +
+ "fix #123,resolve : issue #456 Closing path/to/test#100 Resolves issue path/to/test#200\n" +
+ "feat(doc): this is a doc feat ( path/to/test#300 )");
+ assertEquals(null, issues.get(0).getLeft());
+ assertEquals(123L, issues.get(0).getRight().longValue());
+ assertEquals(null, issues.get(1).getLeft());
+ assertEquals(456L, issues.get(1).getRight().longValue());
+ assertEquals("path/to/test", issues.get(2).getLeft());
+ assertEquals(100L, issues.get(2).getRight().longValue());
+ assertEquals("path/to/test", issues.get(3).getLeft());
+ assertEquals(200L, issues.get(3).getRight().longValue());
+ assertEquals("path/to/test", issues.get(4).getLeft());
+ assertEquals(300L, issues.get(4).getRight().longValue());
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
index bce0a78186..f57236ce84 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
@@ -357,10 +357,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField labelField = new IssueField();
labelField.setIssue(issue);
- labelField.setName(mapped.getFirst().getName());
+ labelField.setName(mapped.getLeft().getName());
labelField.setType(InputSpec.ENUMERATION);
- labelField.setValue(mapped.getSecond());
- labelField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ labelField.setValue(mapped.getRight());
+ labelField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(labelField);
} else {
currentUnmappedLabels.add(labelName);
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index b649601e86..15c817d527 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -358,10 +358,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField tagField = new IssueField();
tagField.setIssue(issue);
- tagField.setName(mapped.getFirst().getName());
+ tagField.setName(mapped.getLeft().getName());
tagField.setType(InputSpec.ENUMERATION);
- tagField.setValue(mapped.getSecond());
- tagField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ tagField.setValue(mapped.getRight());
+ tagField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(tagField);
} else {
currentUnmappedLabels.add(labelName);
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index b0ba3a6900..134eb3176e 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -558,10 +558,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField labelField = new IssueField();
labelField.setIssue(issue);
- labelField.setName(mapped.getFirst().getName());
+ labelField.setName(mapped.getLeft().getName());
labelField.setType(InputSpec.ENUMERATION);
- labelField.setValue(mapped.getSecond());
- labelField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ labelField.setValue(mapped.getRight());
+ labelField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(labelField);
} else {
currentUnmappedLabels.add(labelName);
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
index 1e0a049222..a42d8dd0be 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
@@ -524,10 +524,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField typeField = new IssueField();
typeField.setIssue(issue);
- typeField.setName(mapped.getFirst().getName());
+ typeField.setName(mapped.getLeft().getName());
typeField.setType(InputSpec.ENUMERATION);
- typeField.setValue(mapped.getSecond());
- typeField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ typeField.setValue(mapped.getRight());
+ typeField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(typeField);
} else {
extraIssueInfo.put("Type", HtmlEscape.escapeHtml5(untranslatedTypeName));
@@ -544,10 +544,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField priorityField = new IssueField();
priorityField.setIssue(issue);
- priorityField.setName(mapped.getFirst().getName());
+ priorityField.setName(mapped.getLeft().getName());
priorityField.setType(InputSpec.ENUMERATION);
- priorityField.setValue(mapped.getSecond());
- priorityField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ priorityField.setValue(mapped.getRight());
+ priorityField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(priorityField);
} else {
extraIssueInfo.put("Priority", HtmlEscape.escapeHtml5(priorityName));
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index 7d0e13e1f5..85e0f4c44c 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -500,13 +500,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof TextField)) {
+ } else if (!(mapped.getLeft() instanceof TextField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a text field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.TEXT);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -524,13 +524,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, joinAsMultilineHtml(fieldValues));
- } else if (!(mapped.getFirst() instanceof TextField)) {
+ } else if (!(mapped.getLeft() instanceof TextField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a text field");
extraIssueInfo.put(fieldName, joinAsMultilineHtml(fieldValues));
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.TEXT);
issueField.setValue(StringUtils.join(fieldValues, ", "));
issue.getFields().add(issueField);
@@ -546,15 +546,15 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldNameWithValue);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof ChoiceField) || mapped.getFirst().isAllowMultiple()) {
+ } else if (!(mapped.getLeft() instanceof ChoiceField) || mapped.getLeft().isAllowMultiple()) {
mismatchedIssueFields.put(fieldNameWithValue, "Should be mapped to a single-valued enum field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.ENUMERATION);
- issueField.setValue(mapped.getSecond());
+ issueField.setValue(mapped.getRight());
issue.getFields().add(issueField);
}
}
@@ -573,15 +573,15 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldNameWithValue);
hasErrors = true;
- } else if (!(mapped.getFirst() instanceof ChoiceField) || !mapped.getFirst().isAllowMultiple()) {
+ } else if (!(mapped.getLeft() instanceof ChoiceField) || !mapped.getLeft().isAllowMultiple()) {
mismatchedIssueFields.put(fieldNameWithValue, "Should be mapped to a multi-valued enum field");
hasErrors = true;
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.ENUMERATION);
- issueField.setValue(mapped.getSecond());
+ issueField.setValue(mapped.getRight());
issueFields.add(issueField);
}
}
@@ -602,7 +602,7 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fullName);
- } else if (!(mapped.getFirst() instanceof UserChoiceField) || mapped.getFirst().isAllowMultiple()) {
+ } else if (!(mapped.getLeft() instanceof UserChoiceField) || mapped.getLeft().isAllowMultiple()) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a single-valued user field");
extraIssueInfo.put(fieldName, fullName);
} else {
@@ -622,7 +622,7 @@ public class ImportServer implements Serializable, Validatable {
if (fieldValue != null) {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.USER);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -639,7 +639,7 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, joinAsMultilineHtml(fullNames));
- } else if (!(mapped.getFirst() instanceof UserChoiceField) || !mapped.getFirst().isAllowMultiple()) {
+ } else if (!(mapped.getLeft() instanceof UserChoiceField) || !mapped.getLeft().isAllowMultiple()) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a multi-valued user field");
extraIssueInfo.put(fieldName, joinAsMultilineHtml(fullNames));
} else {
@@ -663,7 +663,7 @@ public class ImportServer implements Serializable, Validatable {
if (fieldValue != null) {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.USER);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -679,13 +679,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, DateUtils.formatDate(date));
- } else if (!(mapped.getFirst() instanceof DateField)) {
+ } else if (!(mapped.getLeft() instanceof DateField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a date field");
extraIssueInfo.put(fieldName, DateUtils.formatDate(date));
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.DATE);
issueField.setValue(DateUtils.formatDate(date));
issue.getFields().add(issueField);
@@ -704,13 +704,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, DateUtils.formatDateTime(date));
- } else if (!(mapped.getFirst() instanceof DateTimeField)) {
+ } else if (!(mapped.getLeft() instanceof DateTimeField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a datetime field");
extraIssueInfo.put(fieldName, DateUtils.formatDateTime(date));
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.DATE_TIME);
issueField.setValue(DateUtils.formatDateTime(date));
issue.getFields().add(issueField);
@@ -722,13 +722,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof FloatField)) {
+ } else if (!(mapped.getLeft() instanceof FloatField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a float field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.FLOAT);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -740,13 +740,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof IntegerField)) {
+ } else if (!(mapped.getLeft() instanceof IntegerField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to an integer field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.INTEGER);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -758,13 +758,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof TextField)) {
+ } else if (!(mapped.getLeft() instanceof TextField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a text field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.TEXT);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -781,14 +781,14 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof TextField)
- || !((TextField) mapped.getFirst()).isMultiline()) {
+ } else if (!(mapped.getLeft() instanceof TextField)
+ || !((TextField) mapped.getLeft()).isMultiline()) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a multi-line text field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.TEXT);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -802,13 +802,13 @@ public class ImportServer implements Serializable, Validatable {
if (mapped == null) {
unmappedIssueFields.add(fieldName);
extraIssueInfo.put(fieldName, fieldValue);
- } else if (!(mapped.getFirst() instanceof WorkingPeriodField)) {
+ } else if (!(mapped.getLeft() instanceof WorkingPeriodField)) {
mismatchedIssueFields.put(fieldName, "Should be mapped to a working period field");
extraIssueInfo.put(fieldName, fieldValue);
} else {
IssueField issueField = new IssueField();
issueField.setIssue(issue);
- issueField.setName(mapped.getFirst().getName());
+ issueField.setName(mapped.getLeft().getName());
issueField.setType(InputSpec.WORKING_PERIOD);
issueField.setValue(fieldValue);
issue.getFields().add(issueField);
@@ -878,10 +878,10 @@ public class ImportServer implements Serializable, Validatable {
if (mapped != null) {
IssueField tagField = new IssueField();
tagField.setIssue(issue);
- tagField.setName(mapped.getFirst().getName());
+ tagField.setName(mapped.getLeft().getName());
tagField.setType(InputSpec.ENUMERATION);
- tagField.setValue(mapped.getSecond());
- tagField.setOrdinal(mapped.getFirst().getOrdinal(mapped.getSecond()));
+ tagField.setValue(mapped.getRight());
+ tagField.setOrdinal(mapped.getLeft().getOrdinal(mapped.getRight()));
issue.getFields().add(tagField);
} else {
currentUnmappedTags.add(HtmlEscape.escapeHtml5(tagName));
@@ -995,16 +995,16 @@ public class ImportServer implements Serializable, Validatable {
for (Map.Entry<Long, Pair<LinkSpec, List<Long>>> entry : issueLinkInfo.entrySet()) {
Issue source = issueMappings.get(entry.getKey());
if (source != null) {
- for (Long targetNumber : entry.getValue().getSecond()) {
+ for (Long targetNumber : entry.getValue().getRight()) {
Issue target = issueMappings.get(targetNumber);
if (target != null) {
var triple = new ImmutableTriple<>(source.getId(), target.getId(),
- entry.getValue().getFirst().getId());
+ entry.getValue().getLeft().getId());
if (linkTriples.add(triple)) {
IssueLink link = new IssueLink();
link.setSource(source);
link.setTarget(target);
- link.setSpec(entry.getValue().getFirst());
+ link.setSpec(entry.getValue().getLeft());
OneDev.getInstance(IssueLinkManager.class).create(link);
}
}