Skip to content

The Unified and Autonomous Development Platform

feat: able to create branch when issue is opened or transited to certain state (#1454)

Robin Shen02198a7eabd1
diff --git a/server-core/src/main/java/io/onedev/server/annotation/BranchName.java b/server-core/src/main/java/io/onedev/server/annotation/BranchName.java
new file mode 100644
index 0000000000..1faea5aeee
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/annotation/BranchName.java
@@ -0,0 +1,24 @@
+package io.onedev.server.annotation;
+
+import io.onedev.server.validation.validator.BranchNameValidator;
+import io.onedev.server.validation.validator.TagNameValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = BranchNameValidator.class)
+public @interface BranchName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java
index fcc08fedc1..ef9c256ba6 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java
@@ -14,6 +14,8 @@ import io.onedev.server.validation.validator.IssueQueryValidator;
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy=IssueQueryValidator.class)
public @interface IssueQuery {
+ boolean withProjectCriteria() default true;
+
boolean withCurrentProjectCriteria() default false;
boolean withCurrentUserCriteria() default false;
@@ -26,6 +28,8 @@ public @interface IssueQuery {
boolean withCurrentCommitCriteria() default false;
+ boolean withStateCriteria() default true;
+
boolean withOrder() default true;
String message() default "";
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
index ad744e6fd8..5ddbbcb5ed 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
@@ -92,6 +92,15 @@ public enum JobVariable {
return null;
}
+ },
+ ISSUE_NUMBER {
+ @Override
+ public String getValue(Build build) {
+ if (build.getIssue() != null)
+ return String.valueOf(build.getIssue().getNumber());
+ else
+ return null;
+ }
};
public abstract String getValue(Build build);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
index f73a2c4442..9a7e193752 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
@@ -2,7 +2,9 @@ package io.onedev.server.buildspec.job;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.param.supply.ParamSupply;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import javax.annotation.Nullable;
@@ -14,13 +16,17 @@ public class TriggerMatch {
private final Long requestId;
+ private final Long issueId;
+
private final List<ParamSupply> params;
private final String reason;
- public TriggerMatch(String refName, @Nullable PullRequest request, List<ParamSupply> params, String reason) {
+ public TriggerMatch(String refName, @Nullable PullRequest request, @Nullable Issue issue,
+ List<ParamSupply> params, String reason) {
this.refName = refName;
requestId = PullRequest.idOf(request);
+ issueId = Issue.idOf(issue);
this.params = params;
this.reason = reason;
}
@@ -37,6 +43,14 @@ public class TriggerMatch {
return null;
}
+ @Nullable
+ public Issue getIssue() {
+ if (issueId != null)
+ return OneDev.getInstance(IssueManager.class).load(issueId);
+ else
+ return null;
+ }
+
public List<ParamSupply> getParams() {
return params;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
index cc46bca5ac..65d01c0ffd 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
@@ -89,7 +89,8 @@ public class RunJobAction extends PostBuildAction {
JobManager jobManager = OneDev.getInstance(JobManager.class);
jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),
paramMap, build.getPipeline(), build.getRefName(),
- build.getSubmitter(), build.getRequest(), "Post build action of job '" + build.getJobName() + "'");
+ build.getSubmitter(), build.getRequest(), build.getIssue(),
+ "Post build action of job '" + build.getJobName() + "'");
}
}.run();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
index cd701704d5..6a0788b3e3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
@@ -103,7 +103,7 @@ public class BranchUpdateTrigger extends JobTrigger {
&& !SKIP_COMMIT.apply(event.getProject().getRevCommit(refUpdated.getNewCommitId(), true))
&& (branches == null || PatternSet.parse(branches).matches(matcher, updatedBranch))
&& touchedFile(refUpdated)) {
- return new TriggerMatch(refUpdated.getRefName(), null,
+ return new TriggerMatch(refUpdated.getRefName(), null, null,
getParams(), "Branch '" + updatedBranch + "' is updated");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
index 2a56708d9e..7f43ffdcce 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
@@ -33,7 +33,7 @@ public class DependencyFinishedTrigger extends JobTrigger {
}
}
- return new TriggerMatch(build.getRefName(), build.getRequest(), getParams(),
+ return new TriggerMatch(build.getRefName(), build.getRequest(), build.getIssue(), getParams(),
"Dependency job '" + dependency.getJobName() + "' is finished");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java
new file mode 100644
index 0000000000..2f34decbd3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java
@@ -0,0 +1,105 @@
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.issue.IssueChanged;
+import io.onedev.server.event.project.issue.IssueOpened;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryParseOption;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+import static java.util.stream.Collectors.toList;
+
+@Editable(order=400, name="Issue in state", description = "Job will run on head commit of default branch")
+public class IssueInStateTrigger extends JobTrigger {
+
+ private String state;
+
+ private String applicableIssues;
+
+ @Editable(order=100)
+ @ChoiceProvider("getStateChoices")
+ @NotEmpty
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ private static List<String> getStateChoices() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting()
+ .getStateSpecs().stream().map(StateSpec::getName).collect(toList());
+ }
+
+ @Editable(order=800, placeholder = "Any issue")
+ @io.onedev.server.annotation.IssueQuery(withProjectCriteria = false, withStateCriteria = false, withOrder = false)
+ public String getApplicableIssues() {
+ return applicableIssues;
+ }
+
+ public void setApplicableIssues(String applicableIssues) {
+ this.applicableIssues = applicableIssues;
+ }
+
+ @Nullable
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof IssueOpened) {
+ IssueOpened issueOpened = (IssueOpened) event;
+ var issue = issueOpened.getIssue();
+ if (issue.getState().equals(state))
+ return triggerMatches(issue);
+ else
+ return null;
+ } else if (event instanceof IssueChanged) {
+ IssueChanged issueChanged = (IssueChanged) event;
+ if (issueChanged.getChange().getData() instanceof IssueStateChangeData) {
+ IssueStateChangeData changeData = (IssueStateChangeData) issueChanged.getChange().getData();
+ if (changeData.getNewState().equals(state))
+ return triggerMatches(issueChanged.getIssue());
+ else
+ return null;
+ } else {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Nullable
+ private TriggerMatch triggerMatches(Issue issue) {
+ var options = new IssueQueryParseOption().withOrder(false);
+ var query = IssueQuery.parse(issue.getProject(), getApplicableIssues(), options, true);
+ if (query.matches(issue)) {
+ var refName = GitUtils.branch2ref(issue.getProject().getDefaultBranch());
+ return new TriggerMatch(refName, null, issue, getParams(),
+ "Issue state is '" + issue.getState() + "'");
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ if (getApplicableIssues() != null)
+ return "When issue is in state '" + getState() + "' and matches: " + getApplicableIssues();
+ else
+ return "When issue is in state '" + getState() + "'";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index 275b6dbf8f..acd627d67a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -88,7 +88,7 @@ public abstract class PullRequestTrigger extends JobTrigger {
if ((branches == null || PatternSet.parse(branches).matches(matcher, targetBranch))
&& touchedFile(request)) {
- return new TriggerMatch(request.getMergeRef(), request, getParams(),
+ return new TriggerMatch(request.getMergeRef(), request, null, getParams(),
"Pull request is opened/updated");
}
return null;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
index 5e43613ad7..b10aac06d4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
@@ -33,7 +33,7 @@ public class ScheduleTrigger extends JobTrigger {
protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
if (event instanceof ScheduledTimeReaches) {
return new TriggerMatch(GitUtils.branch2ref(event.getProject().getDefaultBranch()),
- null, getParams(), "Scheduled");
+ null, null, getParams(), "Scheduled");
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
index 609d4c45bb..23f0b9465f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
@@ -72,7 +72,7 @@ public class TagCreateTrigger extends JobTrigger {
if (updatedTag != null && !commitId.equals(ObjectId.zeroId())
&& (tags == null || PatternSet.parse(tags).matches(new PathMatcher(), updatedTag))
&& (branches == null || project.isCommitOnBranches(commitId, PatternSet.parse(branches)))) {
- return new TriggerMatch(refUpdated.getRefName(), null, getParams(),
+ return new TriggerMatch(refUpdated.getRefName(), null, null, getParams(),
"Tag '" + updatedTag + "' is created");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java
new file mode 100644
index 0000000000..a277d890dc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java
@@ -0,0 +1,116 @@
+package io.onedev.server.buildspec.step;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.OneDev;
+import io.onedev.server.annotation.*;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.git.service.RefFacade;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.util.SuggestionUtils;
+import org.eclipse.jgit.lib.Repository;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Editable(name="Create Branch", order=280)
+public class CreateBranchStep extends ServerSideStep {
+
+ private static final long serialVersionUID = 1L;
+
+ private String branchName;
+
+ private String branchRevision;
+
+ private String accessTokenSecret;
+
+ @Editable(order=1000, description="Specify name of the branch")
+ @Interpolative(variableSuggester="suggestVariables")
+ @BranchName
+ @NotEmpty
+ public String getBranchName() {
+ return branchName;
+ }
+
+ public void setBranchName(String branchName) {
+ this.branchName = branchName;
+ }
+
+ @Editable(order=1100, placeholder = "Build Commit", description="Optionally specify revision " +
+ "to create branch from. Leave empty to create from build commit")
+ @Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestRevisions")
+ @NotEmpty
+ public String getBranchRevision() {
+ return branchRevision;
+ }
+
+ public void setBranchRevision(String branchRevision) {
+ this.branchRevision = branchRevision;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, true, true, false);
+ }
+
+ private static List<InputSuggestion> suggestRevisions(String matchWith) {
+ Project project = Project.get();
+ if (project != null)
+ return SuggestionUtils.suggestRevisions(project, matchWith);
+ else
+ return new ArrayList<>();
+ }
+
+ @Editable(order=1060, description="Specify a secret to be used as access token. This access token " +
+ "should have permission to create above branch in the project")
+ @ChoiceProvider("getAccessTokenSecretChoices")
+ @NotEmpty
+ public String getAccessTokenSecret() {
+ return accessTokenSecret;
+ }
+
+ public void setAccessTokenSecret(String accessTokenSecret) {
+ this.accessTokenSecret = accessTokenSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getAccessTokenSecretChoices() {
+ return Project.get().getHierarchyJobSecrets()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ }
+
+ @Override
+ public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {
+ Project project = build.getProject();
+ String branchName = getBranchName();
+
+ if (!Repository.isValidRefName(GitUtils.branch2ref(branchName)))
+ throw new ExplicitException("Invalid branch name: " + branchName);
+
+ if (build.canCreateBranch(getAccessTokenSecret(), branchName)) {
+ RefFacade branchRef = project.getBranchRef(branchName);
+ if (branchRef != null) {
+ logger.warning("Branch '" + branchName + "' already exists");
+ } else {
+ String branchRevision = getBranchRevision();
+ if (branchRevision == null)
+ branchRevision = build.getCommitHash();
+ OneDev.getInstance(GitService.class).createBranch(project, branchName, branchRevision);
+ }
+ } else {
+ throw new ExplicitException("This build is not authorized to create branch '" + branchName + "'");
+ }
+
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 93de68661d..32019641a1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -5,13 +5,10 @@ import java.util.*;
import javax.annotation.Nullable;
+import io.onedev.server.model.*;
import io.onedev.server.util.artifact.ArtifactInfo;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.model.Agent;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectBuildStats;
@@ -42,8 +39,9 @@ public interface BuildManager extends EntityManager<Build> {
Collection<Long> queryStreamPreviousNumbers(Build build, @Nullable Build.Status status, int limit);
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
- @Nullable String refName, @Nullable Optional<PullRequest> request,
- Map<String, List<String>> params, @Nullable String pipeline);
+ @Nullable String refName, @Nullable Optional<PullRequest> request,
+ @Nullable Optional<Issue> issue, Map<String, List<String>> params,
+ @Nullable String pipeline);
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
@Nullable String pipeline);
@@ -59,7 +57,8 @@ public interface BuildManager extends EntityManager<Build> {
Map<Long, Long> queryUnfinished();
Collection<Build> queryUnfinished(Project project, String jobName, @Nullable String refName,
- @Nullable Optional<PullRequest> request, Map<String, List<String>> params);
+ @Nullable Optional<PullRequest> request, @Nullable Optional<Issue> issue,
+ @Nullable Map<String, List<String>> params);
List<Build> query(Project project, String term, int count);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index b6979f3727..286f35074d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -251,14 +251,14 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Sessional
@Override
public Collection<Build> query(Project project, ObjectId commitId, String jobName, String pipeline) {
- return query(project, commitId, jobName, null, null, new HashMap<>(), pipeline);
+ return query(project, commitId, jobName, null, null, null, new HashMap<>(), pipeline);
}
@Sessional
@Override
- public Collection<Build> query(Project project, ObjectId commitId, String jobName,
- String refName, Optional<PullRequest> request, Map<String, List<String>> params,
- String pipeline) {
+ public Collection<Build> query(Project project, ObjectId commitId, String jobName, String refName,
+ Optional<PullRequest> request, Optional<Issue> issue,
+ Map<String, List<String>> params, String pipeline) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Build> query = builder.createQuery(Build.class);
Root<Build> root = query.from(Build.class);
@@ -279,7 +279,14 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
else
predicates.add(builder.isNull(root.get(Build.PROP_PULL_REQUEST)));
}
-
+
+ if (issue != null) {
+ if (issue.isPresent())
+ predicates.add(builder.equal(root.get(Build.PROP_ISSUE), issue.get()));
+ else
+ predicates.add(builder.isNull(root.get(Build.PROP_ISSUE)));
+ }
+
predicates.addAll(getPredicates(root, builder, params));
query.where(predicates.toArray(new Predicate[0]));
@@ -305,7 +312,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Sessional
@Override
public Collection<Build> queryUnfinished(Project project, String jobName, @Nullable String refName,
- @Nullable Optional<PullRequest> request, Map<String, List<String>> params) {
+ @Nullable Optional<PullRequest> request, @Nullable Optional<Issue> issue,
+ Map<String, List<String>> params) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Build> query = builder.createQuery(Build.class);
Root<Build> root = query.from(Build.class);
@@ -327,6 +335,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
else
predicates.add(builder.isNull(root.get(Build.PROP_PULL_REQUEST)));
}
+ if (issue != null) {
+ if (issue.isPresent())
+ predicates.add(builder.equal(root.get(Build.PROP_ISSUE), issue.get()));
+ else
+ predicates.add(builder.isNull(root.get(Build.PROP_ISSUE)));
+ }
predicates.addAll(getPredicates(root, builder, params));
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
index c63b4c7db5..0e367f9364 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
@@ -11,11 +11,14 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.notification.ActivityDetail;
+import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
-public class IssueChanged extends IssueEvent {
+public class IssueChanged extends IssueEvent implements CommitAware {
private static final long serialVersionUID = 1L;
@@ -77,4 +80,18 @@ public class IssueChanged extends IssueEvent {
public boolean isMinor() {
return getChange().isMinor();
}
+
+ @Override
+ public ProjectScopedCommit getCommit() {
+ if (getChange().getData() instanceof IssueStateChangeData) {
+ var project = getIssue().getProject();
+ if (project.getDefaultBranch() != null)
+ return new ProjectScopedCommit(project, project.getObjectId(project.getDefaultBranch(), true));
+ else
+ return null;
+ } else {
+ return null;
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java
index b6965d885a..34e0638d6f 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java
@@ -1,10 +1,5 @@
package io.onedev.server.event.project.issue;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.UrlManager;
@@ -13,6 +8,11 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
public abstract class IssueEvent extends ProjectEvent {
private static final long serialVersionUID = 1L;
@@ -47,5 +47,5 @@ public abstract class IssueEvent extends ProjectEvent {
public String getUrl() {
return OneDev.getInstance(UrlManager.class).urlFor(getIssue());
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
index 058e166d1d..b3e497f14e 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
@@ -1,11 +1,5 @@
package io.onedev.server.event.project.issue;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
@@ -13,11 +7,19 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.util.CommitAware;
import io.onedev.server.util.Input;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
-public class IssueOpened extends IssueEvent {
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class IssueOpened extends IssueEvent implements CommitAware {
private static final long serialVersionUID = 1L;
@@ -74,4 +76,13 @@ public class IssueOpened extends IssueEvent {
return "opened";
}
+ @Override
+ public ProjectScopedCommit getCommit() {
+ var project = getIssue().getProject();
+ if (project.getDefaultBranch() != null)
+ return new ProjectScopedCommit(project, project.getObjectId(project.getDefaultBranch(), true));
+ else
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 57ed10f584..da29619e21 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -129,6 +129,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private final BuildManager buildManager;
private final PullRequestManager pullRequestManager;
+
+ private final IssueManager issueManager;
private final ListenerRegistry listenerRegistry;
@@ -174,7 +176,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,
ProjectManager projectManager, Validator validator, TaskScheduler taskScheduler,
ClusterManager clusterManager, CodeIndexManager codeIndexManager, PullRequestManager pullRequestManager,
- GitService gitService, SSLFactory sslFactory, Dao dao) {
+ IssueManager issueManager, GitService gitService, SSLFactory sslFactory, Dao dao) {
this.dao = dao;
this.settingManager = settingManager;
this.buildManager = buildManager;
@@ -191,6 +193,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
this.codeIndexManager = codeIndexManager;
this.clusterManager = clusterManager;
this.pullRequestManager = pullRequestManager;
+ this.issueManager = issueManager;
this.gitService = gitService;
this.sslFactory = sslFactory;
}
@@ -214,10 +217,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Transactional
@Override
- public Build submit(Project project, ObjectId commitId, String jobName,
+ public Build submit(Project project, ObjectId commitId, String jobName,
Map<String, List<String>> paramMap, String pipeline,
String refName, User submitter, @Nullable PullRequest request,
- String reason) {
+ @Nullable Issue issue, String reason) {
Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
transactionManager.mustRunAfterTransaction(() -> lock.unlock());
@@ -243,7 +246,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
return doSubmit(project, commitId, jobName, paramMap, pipeline, refName,
- submitter, request, reason);
+ submitter, request, issue, reason);
} catch (Throwable e) {
throw ExceptionUtils.unchecked(e);
} finally {
@@ -253,8 +256,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private Build doSubmit(Project project, ObjectId commitId, String jobName,
Map<String, List<String>> paramMap, String pipeline,
- String refName, User submitter,
- @Nullable PullRequest request, String reason) {
+ String refName, User submitter, @Nullable PullRequest request,
+ @Nullable Issue issue, String reason) {
if (request != null) {
request.setBuildCommitHash(commitId.name());
dao.persist(request);
@@ -270,6 +273,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setSubmitter(submitter);
build.setRefName(refName);
build.setRequest(request);
+ build.setIssue(issue);
build.setPipeline(pipeline);
ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
@@ -281,7 +285,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
Collection<Build> builds = buildManager.query(project, commitId, jobName,
- refName, Optional.ofNullable(request), paramMapToQuery, pipeline);
+ refName, Optional.ofNullable(request), Optional.ofNullable(issue),
+ paramMapToQuery, pipeline);
if (builds.isEmpty()) {
for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
@@ -314,7 +319,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void run(Map<String, List<String>> paramMap) {
Build dependencyBuild = doSubmit(project, commitId,
interpolated.getJobName(), paramMap, pipeline,
- refName, submitter, request, reason);
+ refName, submitter, request, issue, reason);
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
@@ -373,19 +378,25 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Long buildId = build.getId();
Long projectId = project.getId();
- Long pullRequestId = PullRequest.idOf(request);
+ Long requestId = PullRequest.idOf(request);
+ Long issueId = Issue.idOf(issue);
sessionManager.runAsyncAfterCommit(() -> {
SecurityUtils.bindAsSystem();
- Project project1 = projectManager.load(projectId);
- PullRequest pullRequest;
- if (pullRequestId != null)
- pullRequest = pullRequestManager.load(pullRequestId);
+ Project innerProject = projectManager.load(projectId);
+ PullRequest innerRequest;
+ if (requestId != null)
+ innerRequest = pullRequestManager.load(requestId);
else
- pullRequest = null;
- for (Build unfinished : buildManager.queryUnfinished(project1, jobName, refName,
- Optional.ofNullable(pullRequest), paramMapToQuery)) {
+ innerRequest = null;
+ Issue innerIssue;
+ if (issueId != null)
+ innerIssue = issueManager.load(issueId);
+ else
+ innerIssue = null;
+ for (Build unfinished : buildManager.queryUnfinished(innerProject, jobName, refName,
+ Optional.ofNullable(innerRequest), Optional.ofNullable(innerIssue), paramMapToQuery)) {
if (unfinished.getId() < buildId
- && (pullRequest != null || gitService.isMergedInto(project1, null, unfinished.getCommitId(), commitId))) {
+ && (innerRequest != null || gitService.isMergedInto(innerProject, null, unfinished.getCommitId(), commitId))) {
cancel(unfinished);
}
}
@@ -645,7 +656,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Sessional
@Listen
public void on(ProjectEvent event) {
- if (event instanceof CommitAware) {
+ if (event instanceof CommitAware && ((CommitAware) event).getCommit() != null) {
ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();
if (!commitId.equals(ObjectId.zeroId())) {
String pipeline;
@@ -684,7 +695,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void run(Map<String, List<String>> paramMap) {
submit(project, commitId, job.getName(), paramMap,
pipeline, match.getRefName(), SecurityUtils.getUser(),
- match.getRequest(), match.getReason());
+ match.getRequest(), match.getIssue(), match.getReason());
}
}.run();
@@ -1054,8 +1065,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run(Map<String, List<String>> paramMap) {
- submit(aProject, commitId, job.getName(), paramMap, pipeline,
- refName, SecurityUtils.getUser(), null, reason);
+ submit(aProject, commitId, job.getName(), paramMap, pipeline,
+ refName, SecurityUtils.getUser(), null, null, reason);
}
}.run();
diff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.java
index c32728c870..94c91e54bc 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobManager.java
@@ -4,10 +4,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.CacheAllocationRequest;
import io.onedev.k8shelper.CacheInstance;
import io.onedev.server.cluster.ClusterRunnable;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;
import io.onedev.server.terminal.WebShell;
@@ -27,7 +24,7 @@ public interface JobManager {
Build submit(Project project, ObjectId commitId, String jobName,
Map<String, List<String>> paramMap, String pipeline,
String refName, User submitter, @Nullable PullRequest request,
- String reason);
+ @Nullable Issue issue, String reason);
void resubmit(Build build, String reason);
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 0d367721c4..80b9751439 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -151,6 +151,8 @@ public class Build extends ProjectBelonging
public static final String PROP_PULL_REQUEST = "request";
+ public static final String PROP_ISSUE = "issue";
+
public static final String NAME_LOG = "Log";
public static final String PROP_TRIGGER_ID = "triggerId";
@@ -331,6 +333,9 @@ public class Build extends ProjectBelonging
@ManyToOne(fetch=FetchType.LAZY)
private PullRequest request;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Issue issue;
private transient Collection<Long> fixedIssueIds;
@@ -640,6 +645,15 @@ public class Build extends ProjectBelonging
this.request = request;
}
+ @Nullable
+ public Issue getIssue() {
+ return issue;
+ }
+
+ public void setIssue(Issue issue) {
+ this.issue = issue;
+ }
+
public Map<String, List<String>> getParamMap() {
if (paramMap == null) {
paramMap = new HashMap<>();
@@ -885,7 +899,10 @@ public class Build extends ProjectBelonging
public static void pop() {
stack.get().pop();
}
-
+
+ public boolean canCreateBranch(String accessTokenSecret, String branchName) {
+ return SecurityUtils.canCreateBranch(getUser(accessTokenSecret), getProject(), branchName);
+ }
public boolean canCreateTag(String accessTokenSecret, String tagName) {
return SecurityUtils.canCreateTag(getUser(accessTokenSecret), getProject(), tagName);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 76ea7c6dd9..d31eebc7a0 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -46,6 +46,8 @@ import java.util.stream.Collectors;
import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;
import static io.onedev.server.model.Issue.*;
import static io.onedev.server.model.IssueSchedule.NAME_MILESTONE;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.comparingInt;
@Entity
@Table(
@@ -144,55 +146,13 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
public static final Map<String, SortField<Issue>> ORDER_FIELDS = new LinkedHashMap<>();
static {
- ORDER_FIELDS.put(NAME_VOTE_COUNT, new SortField<Issue>(PROP_VOTE_COUNT, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return o1.getVoteCount() - o1.getVoteCount();
- }
-
- }));
- ORDER_FIELDS.put(NAME_COMMENT_COUNT, new SortField<Issue>(PROP_COMMENT_COUNT, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return o1.getCommentCount() - o2.getCommentCount();
- }
-
- }));
- ORDER_FIELDS.put(NAME_NUMBER, new SortField<Issue>(PROP_NUMBER, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return (int)(o1.getNumber() - o2.getNumber());
- }
-
- }));
- ORDER_FIELDS.put(NAME_STATE, new SortField<Issue>(PROP_STATE_ORDINAL, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return o1.getStateOrdinal() - o2.getStateOrdinal();
- }
-
- }));
- ORDER_FIELDS.put(NAME_SUBMIT_DATE, new SortField<Issue>(PROP_SUBMIT_DATE, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return o1.getSubmitDate().compareTo(o2.getSubmitDate());
- }
-
- }));
- ORDER_FIELDS.put(NAME_PROJECT, new SortField<Issue>(PROP_PROJECT, new Comparator<Issue>() {
-
- @Override
- public int compare(Issue o1, Issue o2) {
- return o1.getProject().getId().compareTo(o2.getProject().getId());
- }
-
- }));
- ORDER_FIELDS.put(NAME_LAST_ACTIVITY_DATE, new SortField<Issue>(PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE, new Comparator<Issue>() {
+ ORDER_FIELDS.put(NAME_VOTE_COUNT, new SortField<>(PROP_VOTE_COUNT, comparingInt(Issue::getVoteCount)));
+ ORDER_FIELDS.put(NAME_COMMENT_COUNT, new SortField<>(PROP_COMMENT_COUNT, comparingInt(Issue::getCommentCount)));
+ ORDER_FIELDS.put(NAME_NUMBER, new SortField<>(PROP_NUMBER, (o1, o2) -> (int)(o1.getNumber() - o2.getNumber())));
+ ORDER_FIELDS.put(NAME_STATE, new SortField<>(PROP_STATE_ORDINAL, comparingInt(Issue::getStateOrdinal)));
+ ORDER_FIELDS.put(NAME_SUBMIT_DATE, new SortField<>(PROP_SUBMIT_DATE, comparing(Issue::getSubmitDate)));
+ ORDER_FIELDS.put(NAME_PROJECT, new SortField<>(PROP_PROJECT, comparing(o -> o.getProject().getId())));
+ ORDER_FIELDS.put(NAME_LAST_ACTIVITY_DATE, new SortField<>(PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE, new Comparator<Issue>() {
@Override
public int compare(Issue o1, Issue o2) {
@@ -234,6 +194,9 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueSchedule> schedules = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<Build> builds = new ArrayList<>();
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 4783743f6e..8a24413bbd 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1677,7 +1677,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
Collection<Build> builds = buildsCache.get(commitId);
if (builds == null) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- builds = buildManager.query(this, commitId, null, null, null, new HashMap<>(), null);
+ builds = buildManager.query(this, commitId, null, null, null, null, new HashMap<>(), null);
buildsCache.put(commitId, builds);
}
return builds;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
index 66b0bb33ff..c7ef2b59c3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
@@ -1,12 +1,11 @@
package io.onedev.server.model.support.issue;
-import java.io.Serializable;
-
-import javax.validation.constraints.NotEmpty;
-
import io.onedev.server.annotation.Color;
import io.onedev.server.annotation.Editable;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
@Editable
public class StateSpec implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
index 1057168b6c..943788805f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
@@ -106,7 +106,7 @@ public class JobRunResource {
Build build = jobManager.submit(project, commitId, jobRun.getJobName(),
jobRun.getParams(), UUID.randomUUID().toString(), refName,
- SecurityUtils.getUser(), request, jobRun.getReason());
+ SecurityUtils.getUser(), request, null, jobRun.getReason());
return build.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
index a5b0799334..72d4b7c5fe 100644
--- a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
@@ -130,7 +130,7 @@ public class TriggerJobResource {
Build build = jobManager.submit(project, commit.copy(), job,
jobParams, UUID.randomUUID().toString(), refName,
- SecurityUtils.getUser(), null,
+ SecurityUtils.getUser(), null, null,
"Triggered via restful api");
return build.getId();
} finally {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryParseOption.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryParseOption.java
index cc1d24c320..9c099bbc48 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryParseOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryParseOption.java
@@ -6,6 +6,8 @@ public class IssueQueryParseOption implements Serializable {
private static final long serialVersionUID = 1L;
+ private boolean withProjectCriteria = true;
+
private boolean withCurrentProjectCriteria;
private boolean withCurrentUserCriteria;
@@ -18,8 +20,19 @@ public class IssueQueryParseOption implements Serializable {
private boolean withCurrentCommitCriteria;
+ private boolean withStateCriteria = true;
+
private boolean withOrder = true;
+ public boolean withProjectCriteria() {
+ return withProjectCriteria;
+ }
+
+ public IssueQueryParseOption withProjectCriteria(boolean withProjectCriteria) {
+ this.withProjectCriteria = withProjectCriteria;
+ return this;
+ }
+
public boolean withCurrentProjectCriteria() {
return withCurrentProjectCriteria;
}
@@ -74,6 +87,15 @@ public class IssueQueryParseOption implements Serializable {
return this;
}
+ public boolean withStateCriteria() {
+ return withStateCriteria;
+ }
+
+ public IssueQueryParseOption withStateCriteria(boolean withStateCriteria) {
+ this.withStateCriteria = withStateCriteria;
+ return this;
+ }
+
public boolean withOrder() {
return withOrder;
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index d11d2ed176..54fe632278 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -97,12 +97,16 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return false;
}
- public static boolean canCreateBranch(Project project, String branchName) {
- if (canWriteCode(project))
- return !project.getBranchProtection(branchName, getUser()).isPreventCreation();
+ public static boolean canCreateBranch(@Nullable User user, Project project, String branchName) {
+ if (canWriteCode(user, project))
+ return !project.getBranchProtection(branchName, user).isPreventCreation();
else
return false;
}
+
+ public static boolean canCreateBranch(Project project, String branchName) {
+ return canCreateBranch(getUser(), project, branchName);
+ }
public static boolean canModify(Project project, String branch, String file) {
User user = getUser();
diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java
new file mode 100644
index 0000000000..0bf6912217
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java
@@ -0,0 +1,38 @@
+package io.onedev.server.validation.validator;
+
+import io.onedev.server.annotation.BranchName;
+import io.onedev.server.annotation.TagName;
+import io.onedev.server.git.GitUtils;
+import org.eclipse.jgit.lib.Repository;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class BranchNameValidator implements ConstraintValidator<BranchName, String> {
+
+ private String message;
+
+ @Override
+ public void initialize(BranchName constaintAnnotation) {
+ message = constaintAnnotation.message();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null)
+ return true;
+
+ if (!Repository.isValidRefName(GitUtils.branch2ref(value))) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = this.message;
+ if (message.length() == 0) {
+ message = "Invalid git branch name";
+ }
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 4b526fb6f3..df3ffcc6f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -90,6 +90,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(Issue.QUERY_FIELDS);
+ if (!option.withProjectCriteria())
+ candidates.remove(NAME_PROJECT);
+ if (!option.withStateCriteria())
+ candidates.remove(NAME_STATE);
for (FieldSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
return SuggestionUtils.suggest(candidates, matchWith);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 3b0ed6c3f5..bd9f5f73a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -103,7 +103,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
for (String refName: selectedRefNames) {
builds.add(getJobManager().submit(getProject(), commitId, job.getName(),
paramMap, pipeline, refName, SecurityUtils.getUser(),
- getPullRequest(), "Submitted manually"));
+ getPullRequest(), null, "Submitted manually"));
}
if (builds.size() == 1)
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));
@@ -132,7 +132,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
} else {
Build build = getJobManager().submit(getProject(), commitId, job.getName(),
new HashMap<>(), getPipeline(), refNames.iterator().next(),
- SecurityUtils.getUser(), getPullRequest(), "Submitted manually");
+ SecurityUtils.getUser(), getPullRequest(), null, "Submitted manually");
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
if (build.isFinished())
Session.get().warn("Build already fired in current pipeline");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index c255cd4313..767422fbee 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -147,7 +147,7 @@ public abstract class JobListPanel extends Panel {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
List<Build> builds = new ArrayList<>(buildManager.query(getProject(),
commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),
- new HashMap<>(), getPipeline()));
+ null, new HashMap<>(), getPipeline()));
builds.sort(Comparator.comparing(Build::getNumber));
return builds;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
index ff4cb483b3..c50806e714 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
@@ -65,12 +65,14 @@ public class IssueQueryEditSupport implements EditSupport {
IssueQuery issueQuery = Preconditions.checkNotNull(
getDescriptor().getPropertyGetter().getAnnotation(IssueQuery.class));
IssueQueryParseOption option = new IssueQueryParseOption()
+ .withProjectCriteria(issueQuery.withProjectCriteria())
.withCurrentProjectCriteria(issueQuery.withCurrentProjectCriteria())
.withCurrentBuildCriteria(issueQuery.withCurrentBuildCriteria())
.withCurrentCommitCriteria(issueQuery.withCurrentCommitCriteria())
.withCurrentIssueCriteria(issueQuery.withCurrentIssueCriteria())
.withCurrentPullRequestCriteria(issueQuery.withCurrentPullRequestCriteria())
.withCurrentUserCriteria(issueQuery.withCurrentUserCriteria())
+ .withStateCriteria(issueQuery.withStateCriteria())
.withOrder(issueQuery.withOrder());
return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(
new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index bd8b6c2530..84f0b9c47b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -145,7 +145,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
List<String> lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>(), null)) {
+ for (Build build: buildManager.query(project, commitId, null, null, null, null, new HashMap<>(), null)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
for (CodeProblem problem: contribution.getCodeProblems(build, path, context.getProblemReport()))
problems.add(problem.normalizeRange(lines));