The Unified and Autonomous Development Platform
Move job default fixed issues filter out of build spec
Robin Shencd770542327f
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex caa0b94ce6..8dd56323af 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -286,4 +286,22 @@ public class BuildSpec implements Serializable, Validatable {}}+ @SuppressWarnings("unused")+ private void migrate2(VersionedYamlDoc doc, Stack<Integer> versions) {+ for (NodeTuple specTuple: doc.getValue()) {+ if (((ScalarNode)specTuple.getKeyNode()).getValue().equals("jobs")) {+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();+ for (Node jobsNodeItem: jobsNode.getValue()) {+ MappingNode jobNode = (MappingNode) jobsNodeItem;+ for (Iterator<NodeTuple> itJobTuple = jobNode.getValue().iterator(); itJobTuple.hasNext();) {+ NodeTuple jobTuple = itJobTuple.next();+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();+ if (jobTupleKey.equals("defaultFixedIssuesFilter"))+ itJobTuple.remove();+ }+ }+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex d17d0805fa..0cda12771d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -46,8 +46,8 @@ import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.k8shelper.CacheInstance;import io.onedev.k8shelper.CloneInfo;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 37be0a0e8e..70739ee220 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -1,11 +1,10 @@package io.onedev.server.buildspec.job;+import static io.onedev.server.model.Build.NAME_BRANCH;import static io.onedev.server.model.Build.NAME_COMMIT;import static io.onedev.server.model.Build.NAME_JOB;-import static io.onedev.server.model.Build.NAME_BRANCH;-import static io.onedev.server.model.Build.NAME_TAG;import static io.onedev.server.model.Build.NAME_PULL_REQUEST;-+import static io.onedev.server.model.Build.NAME_TAG;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;@@ -53,7 +52,6 @@ import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.annotation.RetryCondition;@@ -120,8 +118,6 @@ public class Job implements Serializable, Validatable {private int retryDelay = 30;- private String defaultFixedIssuesFilter;-private transient Map<String, ParamSpec> paramSpecMap;@Editable(order=100, description="Specify name of the job")@@ -400,20 +396,6 @@ public class Job implements Serializable, Validatable {this.postBuildActions = postBuildActions;}- @Editable(order=10700, group="More Settings", description="Optionally specify a default query "- + "to filter/order fixed issues of the builds generated by current job")- @IssueQuery(withCurrentBuildCriteria = false, withCurrentCommitCriteria = false,- withCurrentPullRequestCriteria = false, withCurrentUserCriteria = true,- withOrder = true)- @NameOfEmptyValue("No default filter")- public String getDefaultFixedIssuesFilter() {- return defaultFixedIssuesFilter;- }-- public void setDefaultFixedIssuesFilter(String defaultFixedIssuesFilterQuery) {- this.defaultFixedIssuesFilter = defaultFixedIssuesFilterQuery;- }-@Nullablepublic JobTriggerMatch getTriggerMatch(ProjectEvent event) {for (JobTrigger trigger: getTriggers()) {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.javaindex 8308308b54..93dab77f81 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@@ -31,7 +31,7 @@ public interface BuildManager extends EntityManager<Build> {@NullableBuild findStreamPrevious(Build build, @Nullable Build.Status status);- Collection<Long> queryNumbersOfStreamPrevious(Build build, @Nullable Build.Status status, int limit);+ 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 PullRequest request, Map<String, List<String>> params);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.javaindex 14e1727461..6f8bc591aa 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@@ -710,7 +710,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}}- private CriteriaQuery<Object[]> buildQueryOfStreamPrevios(Build build, Status status, String...fields) {+ private CriteriaQuery<Object[]> buildStreamPreviousQuery(Build build, Status status, String...fields) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Object[]> query = builder.createQuery(Object[].class);Root<Build> root = query.from(Build.class);@@ -732,9 +732,9 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Sessional@Override- public Collection<Long> queryNumbersOfStreamPrevious(Build build, Status status, int limit) {+ public Collection<Long> queryStreamPreviousNumbers(Build build, Status status, int limit) {Map<ObjectId, Long> buildNumbers = new HashMap<>();- for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(build, status, "commitHash", "number")).list()) {+ for (Object[] fields: getSession().createQuery(buildStreamPreviousQuery(build, status, "commitHash", "number")).list()) {buildNumbers.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);}@@ -762,7 +762,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Overridepublic Build findStreamPrevious(Build build, Status status) {Map<ObjectId, Long> buildIds = new HashMap<>();- for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(+ for (Object[] fields: getSession().createQuery(buildStreamPreviousQuery(build, status, "commitHash", "id")).list()) {buildIds.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);}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.javaindex bb7f5f3699..40b839c033 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@@ -313,8 +313,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssundefinedStates.add(state);}- for (Project project: projectManager.query())+ for (Project project: projectManager.query()) {undefinedStates.addAll(project.getIssueSetting().getUndefinedStates(project));+ undefinedStates.addAll(project.getBuildSetting().getUndefinedStates(project));+ }for (IssueQuerySetting setting: issueQuerySettingManager.query())populateUndefinedStates(undefinedStates, setting.getProject(), setting.getUserQueries());@@ -349,8 +351,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssundefinedFields.add(fieldName);}- for (Project project: projectManager.query())+ for (Project project: projectManager.query()) {undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));+ undefinedFields.addAll(project.getBuildSetting().getUndefinedFields(project));+ }for (IssueQuerySetting setting: issueQuerySettingManager.query())populateUndefinedFields(undefinedFields, setting.getProject(), setting.getUserQueries());@@ -389,8 +393,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}}- for (Project project: projectManager.query())+ for (Project project: projectManager.query()) {undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));+ undefinedFieldValues.addAll(project.getBuildSetting().getUndefinedFieldValues(project));+ }for (IssueQuerySetting setting: issueQuerySettingManager.query())populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());@@ -449,8 +455,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}}- for (Project project: projectManager.query())+ for (Project project: projectManager.query()) {project.getIssueSetting().fixUndefinedStates(project, resolutions);+ project.getBuildSetting().fixUndefinedStates(project, resolutions);+ }for (IssueQuerySetting setting: issueQuerySettingManager.query())fixUndefinedStates(setting.getProject(), resolutions, setting.getUserQueries());@@ -466,9 +474,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isstry {IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (parsedQuery.fixUndefinedStates(resolutions))- it.remove();- elsenamedQuery.setQuery(parsedQuery.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -492,8 +500,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issquery.executeUpdate();}- for (Project project: projectManager.query())+ for (Project project: projectManager.query()) {project.getIssueSetting().fixUndefinedFields(project, resolutions);+ project.getBuildSetting().fixUndefinedFields(project, resolutions);+ }for (IssueQuerySetting setting: issueQuerySettingManager.query())fixUndefinedFields(resolutions, setting.getProject(), setting.getUserQueries());@@ -514,9 +524,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isstry {IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (parsedQuery.fixUndefinedFields(resolutions))- it.remove();- elsenamedQuery.setQuery(parsedQuery.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -544,6 +554,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issfor (Project project: projectManager.query()) {project.getIssueSetting().fixUndefinedFieldValues(project, resolutions);+ project.getBuildSetting().fixUndefinedFieldValues(project, resolutions);}for (IssueQuerySetting setting: issueQuerySettingManager.query())@@ -565,9 +576,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isstry {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (query.fixUndefinedFieldValues(resolutions))- it.remove();- elsenamedQuery.setQuery(query.toString());+ else+ it.remove();} catch (Exception e) {}}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.javaindex d9a63f49f6..df0c4649a1 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@@ -2318,4 +2318,18 @@ public class DataMigrator {}}+ // migrate to 4.2.0+ private void migrate49(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element buildSettingElement = element.element("buildSetting");+ buildSettingElement.addElement("defaultFixedIssueFilters");+ }+ dom.writeToFile(file, false);+ }+ }+ }+}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.javaindex 0cc18c2ad5..34c220c8b5 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@@ -344,7 +344,7 @@ public class Build extends AbstractEntity implements Referenceable {private transient Map<Build.Status, Build> streamPreviousCache = new HashMap<>();- private transient Map<Integer, Collection<Long>> numbersOfStreamPreviousCache = new HashMap<>();+ private transient Map<Integer, Collection<Long>> streamPreviousNumbersCache = new HashMap<>();public Project getNumberScope() {return numberScope;@@ -868,15 +868,15 @@ public class Build extends AbstractEntity implements Referenceable {return streamPreviousCache.get(status);}- public Collection<Long> getNumbersOfStreamPrevious(int limit) {- if (numbersOfStreamPreviousCache == null)- numbersOfStreamPreviousCache = new HashMap<>();- if (!numbersOfStreamPreviousCache.containsKey(limit)) {+ public Collection<Long> getStreamPreviousNumbers(int limit) {+ if (streamPreviousNumbersCache == null)+ streamPreviousNumbersCache = new HashMap<>();+ if (!streamPreviousNumbersCache.containsKey(limit)) {BuildManager buildManager = OneDev.getInstance(BuildManager.class);- numbersOfStreamPreviousCache.put(limit, buildManager.queryNumbersOfStreamPrevious(+ streamPreviousNumbersCache.put(limit, buildManager.queryStreamPreviousNumbers(this, null, EntityCriteria.IN_CLAUSE_LIMIT));}- return numbersOfStreamPreviousCache.get(limit);+ return streamPreviousNumbersCache.get(limit);}public void retrieveArtifacts(Build dependency, String artifacts, File workspaceDir) {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.javaindex 4e058c5640..4afd69216e 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@@ -416,15 +416,15 @@ public class GlobalIssueSetting implements Serializable {public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedStates(resolutions))+ if (!it.next().fixUndefinedStates(resolutions))it.remove();}for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedStates(null, resolutions))+ if (!it.next().fixUndefinedStates(null, resolutions))it.remove();}for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (it.next().fixUndefinedStates(resolutions))+ if (!it.next().fixUndefinedStates(resolutions))it.remove();}for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {@@ -432,9 +432,9 @@ public class GlobalIssueSetting implements Serializable {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.fixUndefinedStates(resolutions))- it.remove();- elsenamedQuery.setQuery(query.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -453,15 +453,15 @@ public class GlobalIssueSetting implements Serializable {}for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))+ if (!it.next().fixUndefinedFields(resolutions))it.remove();}for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(null, resolutions))+ if (!it.next().fixUndefinedFields(null, resolutions))it.remove();}for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))+ if (!it.next().fixUndefinedFields(resolutions))it.remove();}for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {@@ -469,9 +469,9 @@ public class GlobalIssueSetting implements Serializable {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.fixUndefinedFields(resolutions))- it.remove();- elsenamedQuery.setQuery(query.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -479,7 +479,7 @@ public class GlobalIssueSetting implements Serializable {Collection<String> derivedDeletions = new HashSet<>();for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {FieldSpec field = it.next();- if (field.fixUndefinedFields(resolutions)) {+ if (!field.fixUndefinedFields(resolutions)) {it.remove();derivedDeletions.add(field.getName());}@@ -490,15 +490,15 @@ public class GlobalIssueSetting implements Serializable {public Collection<String> fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(resolutions))+ if (!it.next().fixUndefinedFieldValues(resolutions))it.remove();}for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(null, resolutions))+ if (!it.next().fixUndefinedFieldValues(null, resolutions))it.remove();}for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(resolutions))+ if (!it.next().fixUndefinedFieldValues(resolutions))it.remove();}for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {@@ -506,9 +506,9 @@ public class GlobalIssueSetting implements Serializable {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.fixUndefinedFieldValues(resolutions))- it.remove();- elsenamedQuery.setQuery(query.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -516,7 +516,7 @@ public class GlobalIssueSetting implements Serializable {Collection<String> derivedDeletions = new HashSet<>();for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {FieldSpec field = it.next();- if (field.fixUndefinedFieldValues(resolutions)) {+ if (!field.fixUndefinedFieldValues(resolutions)) {it.remove();derivedDeletions.add(field.getName());}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.javanew file mode 100644index 0000000000..0f74573a88--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java@@ -0,0 +1,60 @@+package io.onedev.server.model.support.build;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Project;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable+public class DefaultFixedIssueFilter implements Serializable {++ private static final long serialVersionUID = 1L;++ private String jobNames;++ private String issueQuery;++ @Editable(order=100, description="Specify space-separated jobs. Use '*' or '?' for wildcard match. "+ + "Prefix with '-' to exclude")+ @Patterns(suggester = "suggestJobNames")+ @NotEmpty+ public String getJobNames() {+ return jobNames;+ }++ public void setJobNames(String jobNames) {+ this.jobNames = jobNames;+ }++ @Editable(order=200, description="Specify a default query to filter/order fixed issues of specified jobs")+ @IssueQuery(withCurrentBuildCriteria = false, withCurrentCommitCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentUserCriteria = true,+ withOrder = true)+ @NotEmpty+ public String getIssueQuery() {+ return issueQuery;+ }++ public void setIssueQuery(String issueQuery) {+ this.issueQuery = issueQuery;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestJobNames(String matchWith) {+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(Project.get()));+ Collections.sort(jobNames);+ return SuggestionUtils.suggest(jobNames, matchWith);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex e35012c306..ab52a0f273 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -2,7 +2,12 @@ package io.onedev.server.model.support.build;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Iterator;import java.util.List;+import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;@@ -10,10 +15,19 @@ import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;import io.onedev.server.model.support.build.actionauthorization.CreateTagAuthorization;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.StringMatcher;+import io.onedev.server.util.patternset.PatternSet;+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.web.editable.annotation.Editable;@Editable@@ -31,6 +45,8 @@ public class ProjectBuildSetting implements Serializable {private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();+ private List<DefaultFixedIssueFilter> defaultFixedIssueFilters = new ArrayList<>();+private transient GlobalBuildSetting globalSetting;public ProjectBuildSetting() {@@ -62,6 +78,14 @@ public class ProjectBuildSetting implements Serializable {this.actionAuthorizations = actionAuthorizations;}+ public List<DefaultFixedIssueFilter> getDefaultFixedIssueFilters() {+ return defaultFixedIssueFilters;+ }++ public void setDefaultFixedIssueFilters(List<DefaultFixedIssueFilter> defaultFixedIssueFilters) {+ this.defaultFixedIssueFilters = defaultFixedIssueFilters;+ }+private GlobalBuildSetting getGlobalSetting() {if (globalSetting == null)globalSetting = OneDev.getInstance(SettingManager.class).getBuildSetting();@@ -110,4 +134,90 @@ public class ProjectBuildSetting implements Serializable {return false;}+ @Nullable+ public String getDefaultFixedIssueQuery(String jobName) {+ Matcher matcher = new StringMatcher();+ for (DefaultFixedIssueFilter each: getDefaultFixedIssueFilters()) {+ if (PatternSet.parse(each.getJobNames()).matches(matcher, jobName))+ return each.getIssueQuery();+ }+ return null;+ }++ public Collection<String> getUndefinedStates(Project project) {+ Set<String> undefinedStates = new HashSet<>();++ for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {+ try {+ undefinedStates.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedStates());+ } catch (Exception e) {+ }+ }++ return undefinedStates;+ }++ public Collection<String> getUndefinedFields(Project project) {+ Set<String> undefinedFields = new HashSet<>();+ for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {+ try {+ undefinedFields.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedFields());+ } catch (Exception e) {+ }+ }+ return undefinedFields;+ }++ public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {+ try {+ undefinedFieldValues.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedFieldValues());+ } catch (Exception e) {+ }+ }+ return undefinedFieldValues;+ }++ public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {+ for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {+ DefaultFixedIssueFilter filter = it.next();+ try {+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);+ if (parsedQuery.fixUndefinedStates(resolutions))+ filter.setIssueQuery(parsedQuery.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }+ }++ public void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {+ for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {+ DefaultFixedIssueFilter filter = it.next();+ try {+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);+ if (parsedQuery.fixUndefinedFields(resolutions))+ filter.setIssueQuery(parsedQuery.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }+ }++ public void fixUndefinedFieldValues(Project project, Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {+ DefaultFixedIssueFilter filter = it.next();+ try {+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);+ if (parsedQuery.fixUndefinedFieldValues(resolutions))+ filter.setIssueQuery(parsedQuery.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex ade60782ae..21f10f1f29 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -313,10 +313,10 @@ public class BoardSpec implements Serializable {elsegetColumns().remove(entry.getKey());if (getColumns().size() < 2)- return true;+ return false;}}- return false;+ return true;}private String fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,@@ -326,16 +326,15 @@ public class BoardSpec implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);if (parsedQuery.fixUndefinedStates(resolutions))- query = null;- elsequery = parsedQuery.toString();+ else+ query = null;} catch (Exception e) {}}return query;}- @Nullablepublic boolean fixUndefinedFields(@Nullable Project project, Map<String, UndefinedFieldResolution> resolutions) {setBaseQuery(fixUndefinedFields(project, resolutions, getBaseQuery()));setBacklogBaseQuery(fixUndefinedFields(project, resolutions, getBacklogBaseQuery()));@@ -349,10 +348,10 @@ public class BoardSpec implements Serializable {} else {getDisplayFields().remove(entry.getKey());if (getIdentifyField().equals(entry.getKey()))- return true;+ return false;}}- return false;+ return true;}private String fixUndefinedFields(@Nullable Project project, Map<String, UndefinedFieldResolution> resolutions,@@ -362,9 +361,9 @@ public class BoardSpec implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);if (parsedQuery.fixUndefinedFields(resolutions))- query = null;- elsequery = parsedQuery.toString();+ else+ query = null;} catch (Exception e) {}}@@ -388,7 +387,7 @@ public class BoardSpec implements Serializable {}}}- return getColumns().size() < 2;+ return getColumns().size() >= 2;}@Nullable@@ -399,9 +398,9 @@ public class BoardSpec implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);if (parsedQuery.fixUndefinedFieldValues(resolutions))- query = null;- elsequery = parsedQuery.toString();+ else+ query = null;} catch (Exception e) {}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.javaindex 22e59da662..4be7d13d2f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java@@ -94,13 +94,13 @@ public class IssueTemplate implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedStates(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}}- return false;+ return true;}public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {@@ -109,13 +109,13 @@ public class IssueTemplate implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedFields(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}}- return false;+ return true;}public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {@@ -124,13 +124,13 @@ public class IssueTemplate implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedFieldValues(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}}- return false;+ return true;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex 3e4620e33d..bef1fe6dbf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -172,9 +172,9 @@ public class ProjectIssueSetting implements Serializable {try {IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (parsedQuery.fixUndefinedStates(resolutions))- it.remove();- elsenamedQuery.setQuery(parsedQuery.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -201,9 +201,9 @@ public class ProjectIssueSetting implements Serializable {try {IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (parsedQuery.fixUndefinedFields(resolutions))- it.remove();- elsenamedQuery.setQuery(parsedQuery.toString());+ else+ it.remove();} catch (Exception e) {}}@@ -211,7 +211,7 @@ public class ProjectIssueSetting implements Serializable {if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(project, resolutions))+ if (!it.next().fixUndefinedFields(project, resolutions))it.remove();}}@@ -224,16 +224,16 @@ public class ProjectIssueSetting implements Serializable {try {IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (parsedQuery.fixUndefinedFieldValues(resolutions))- it.remove();- elsenamedQuery.setQuery(parsedQuery.toString());+ else+ it.remove();} catch (Exception e) {}}}if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(project, resolutions)) {+ if (!it.next().fixUndefinedFieldValues(project, resolutions)) {it.remove();break;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 143f89a7ca..5bd56aa837 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -176,7 +176,7 @@ public class TransitionSpec implements Serializable {} else {fromStates.remove(entry.getKey());if (fromStates.isEmpty() || toState.equals(entry.getKey()))- return true;+ return false;}}return trigger.fixUndefinedStates(resolutions);diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.javaindex db8aa0a2c8..b02df56cae 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java@@ -160,11 +160,11 @@ public abstract class FieldSpec extends InputSpec {if (entry.getKey().equals(showCondition.getInputName()))showCondition.setInputName(entry.getValue().getNewField());} else if (showCondition.getInputName().equals(entry.getKey())) {- return true;+ return false;}}}- return false;+ return true;}public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {@@ -185,7 +185,7 @@ public abstract class FieldSpec extends InputSpec {}}if (valueIsOneOf.getValues().isEmpty())- return true;+ return false;} else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();valueIsNotAnyOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());@@ -199,12 +199,12 @@ public abstract class FieldSpec extends InputSpec {}}if (valueIsNotAnyOf.getValues().isEmpty())- return true;+ return false;}}}}- return false;+ return true;}public void onRenameUser(String oldName, String newName) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex a995765ffe..37137f8678 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -87,15 +87,15 @@ public class PressButtonTrigger extends TransitionTrigger {@Overridepublic boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- if (super.fixUndefinedFields(resolutions))- return true;+ if (!super.fixUndefinedFields(resolutions))+ return false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD)ReconcileUtils.renameItem(getPromptFields(), entry.getKey(), entry.getValue().getNewField());elsegetPromptFields().remove(entry.getKey());}- return false;+ return true;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.javaindex bf0698edcd..f006103917 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java@@ -77,12 +77,12 @@ public abstract class TransitionTrigger implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedStates(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}- return false;+ return true;}public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {@@ -90,12 +90,12 @@ public abstract class TransitionTrigger implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedFields(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}- return false;+ return true;}public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {@@ -103,12 +103,12 @@ public abstract class TransitionTrigger implements Serializable {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);if (parsedQuery.fixUndefinedFieldValues(resolutions))- return true;- elseissueQuery = parsedQuery.toString();+ else+ return false;} catch (Exception e) {}- return false;+ return true;}public abstract String getDescription();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.javaindex 01067d4de2..cb7f1b4522 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java@@ -71,28 +71,28 @@ public class AndIssueCriteria extends IssueCriteria {@Overridepublic boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedStates(resolutions))+ if (!it.next().fixUndefinedStates(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}@Overridepublic boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))+ if (!it.next().fixUndefinedFields(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}@Overridepublic boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(resolutions))+ if (!it.next().fixUndefinedFieldValues(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex deba2f2882..41a818c5b4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -88,13 +88,13 @@ public class ChoiceFieldCriteria extends FieldCriteria {for (Map.Entry<String, UndefinedFieldValuesResolution> entry: resolutions.entrySet()) {if (entry.getKey().equals(getFieldName())) {if (entry.getValue().getDeletions().contains(value))- return true;+ return false;String newValue = entry.getValue().getRenames().get(value);if (newValue != null)value = newValue;}}- return false;+ return true;}@SuppressWarnings({"unchecked" })diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex 8d9996792d..c619429945 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -79,10 +79,10 @@ public abstract class FieldCriteria extends IssueCriteria {if (entry.getKey().equals(fieldName))fieldName = entry.getValue().getNewField();} else if (entry.getKey().equals(fieldName)) {- return true;+ return false;}}- return false;+ return true;}public FieldSpec getFieldSpec() {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 85e9b5ac4a..382b14ebb9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -85,13 +85,13 @@ public class FieldOperatorCriteria extends FieldCriteria {if (getFieldSpec() instanceof BuildChoiceField) {Build build = Build.get();if (build != null) {- Collection<Long> numbersOfStreamPrevious = Build.get().getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT);- if (!numbersOfStreamPrevious.isEmpty()) {+ Collection<Long> streamPreviousNumbers = Build.get().getStreamPreviousNumbers(EntityCriteria.IN_CLAUSE_LIMIT);+ if (!streamPreviousNumbers.isEmpty()) {return builder.and(builder.equal(projectAttribute, build.getProject()),- valueAttribute.in(numbersOfStreamPrevious.stream().map(it->it.toString()).collect(Collectors.toSet())));+ valueAttribute.in(streamPreviousNumbers.stream().map(it->it.toString()).collect(Collectors.toSet())));} else {- return builder.equal(projectAttribute, build.getProject());+ return builder.disjunction();}} else {throw new ExplicitException("No current build in query context");@@ -141,7 +141,7 @@ public class FieldOperatorCriteria extends FieldCriteria {Build build = Build.get();if (build != null) {return build.getProject().equals(issue.getProject())- && build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT)+ && build.getStreamPreviousNumbers(EntityCriteria.IN_CLAUSE_LIMIT).stream().anyMatch(it->it.equals(fieldValue));} else {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex 7c9b1ed6da..a0ce2bfb7a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -34,15 +34,15 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {}public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- return false;+ return true;}public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- return false;+ return true;}public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {- return false;+ return true;}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 55b3f496e6..59c9fa1143 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -469,21 +469,21 @@ public class IssueQuery extends EntityQuery<Issue> {if (criteria != null)return criteria.fixUndefinedStates(resolutions);else- return false;+ return true;}public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {if (criteria != null)return criteria.fixUndefinedFields(resolutions);else- return false;+ return true;}public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {if (criteria != null)return criteria.fixUndefinedFieldValues(resolutions);else- return false;+ return true;}public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.javaindex 3d363f2f29..994581dcae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java@@ -71,28 +71,28 @@ public class OrIssueCriteria extends IssueCriteria {@Overridepublic boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedStates(resolutions))+ if (!it.next().fixUndefinedStates(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}@Overridepublic boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))+ if (!it.next().fixUndefinedFields(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}@Overridepublic boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(resolutions))+ if (!it.next().fixUndefinedFieldValues(resolutions))it.remove();}- return criterias.isEmpty();+ return !criterias.isEmpty();}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 189902c7d5..03d71ae57e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -58,10 +58,10 @@ public class StateCriteria extends IssueCriteria {if (entry.getKey().equals(value))value = entry.getValue().getNewState();} else if (entry.getKey().equals(value)) {- return true;+ return false;}}- return false;+ return true;}}diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex 39ef9535b1..20729b3f78 100644--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -92,6 +92,7 @@ import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;@@ -269,6 +270,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("projects/${project}/settings/build/job-secrets", JobSecretsPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));+ add(new DynamicPathPageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.htmlindex 1736ea2735..e479887eb9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="job-executors">- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"></wicket:svg>For a given build job, the first matching executor will be used</div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.htmlindex bc9dc06c39..8d54e95cf2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html@@ -2,7 +2,7 @@<wicket:container wicket:id="content"></wicket:container><wicket:fragment wicket:id="ownerFrag"><div class="alert alert-notice bg-white shadow">- <b>Owner</b> is a built-in role with full permission over projects+ <b>Project Owner</b> is a built-in role with full permission over projects</div></wicket:fragment><wicket:fragment wicket:id="nonOwnerFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 6d0f9830a1..1469c7190d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -58,6 +58,7 @@ import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;@@ -218,6 +219,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {ActionAuthorizationsPage.class, ActionAuthorizationsPage.paramsOf(getProject())));buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Build Preserve Rules",BuildPreservationsPage.class, BuildPreservationsPage.paramsOf(getProject())));+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Fixed Issue Filters",+ DefaultFixedIssueFiltersPage.class, DefaultFixedIssueFiltersPage.paramsOf(getProject())));settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build Setting", buildSettingMenuItems));settingMenuItems.add(new SidebarMenuItem.Page(null, "Web Hooks",diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 82a1ed37c8..8c07db1247 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -47,6 +47,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.build.ProjectBuildSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;@@ -407,9 +408,10 @@ public abstract class BuildDetailPage extends ProjectPage@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass,- FixedIssuesPage.paramsOf(getBuild(),- getBuild().getJob().getDefaultFixedIssuesFilter()));+ ProjectBuildSetting buildSetting = getProject().getBuildSetting();+ return new ViewStateAwarePageLink<Void>(+ linkId, pageClass, FixedIssuesPage.paramsOf(getBuild(),+ buildSetting.getDefaultFixedIssueQuery(getBuild().getJobName())));}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.htmlindex 4f2adda5a8..70c7e6ed3c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="branch-protections">- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"></wicket:svg>Define branch protection rules. The first matching rule will take effect</div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.htmlindex d23709f7e3..077d3aa5d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"/> Define rules to authorize build actions. A build action will be allowed as long as one rule allows it</div><div class="card">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.htmlindex f4c95d5e58..a65b5c88d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"/>Define rules to preserve builds. A build will be preserved as long as one rule preserves it.All builds will be preserved if no rules are defineddiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersBean.javanew file mode 100644index 0000000000..7341381ca3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersBean.java@@ -0,0 +1,26 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.build.DefaultFixedIssueFilter;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class DefaultFixedIssueFiltersBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<DefaultFixedIssueFilter> defaultFixedIssueFilters = new ArrayList<>();++ @Editable+ public List<DefaultFixedIssueFilter> getDefaultFixedIssueFilters() {+ return defaultFixedIssueFilters;+ }++ public void setDefaultFixedIssueFilters(List<DefaultFixedIssueFilter> defaultFixedIssueFilters) {+ this.defaultFixedIssueFilters = defaultFixedIssueFilters;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.htmlnew file mode 100644index 0000000000..8390130ceb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.html@@ -0,0 +1,17 @@+<wicket:extend>+ <div class="alert alert-notice bg-white shadow mb-5 text-gray">+ <wicket:svg href="bulb" class="icon mr-2"/>+ For each build, OneDev calculates a list of fixed issues since previous build automatically.+ This setting provides a default query to further filter/order this list. For a given job,+ the first matching entry will be used.+ </div>+ <div class="card">+ <div class="card-body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback" class="mb-4"></div>+ <div wicket:id="editor"></div>+ <input type="submit" value="Save" class="dirty-aware btn btn-primary mt-4">+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.javanew file mode 100644index 0000000000..467a79b1b4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java@@ -0,0 +1,55 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;++import org.apache.wicket.Component;+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;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class DefaultFixedIssueFiltersPage extends BuildSettingPage {++ public DefaultFixedIssueFiltersPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ DefaultFixedIssueFiltersBean bean = new DefaultFixedIssueFiltersBean();+ bean.setDefaultFixedIssueFilters(getProject().getBuildSetting().getDefaultFixedIssueFilters());++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "defaultFixedIssueFilters");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Default fixed issue filters saved");+ getProject().getBuildSetting().setDefaultFixedIssueFilters(bean.getDefaultFixedIssueFilters());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(DefaultFixedIssueFiltersPage.class,+ DefaultFixedIssueFiltersPage.paramsOf(getProject()));+ }++ };+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(editor);+ add(form);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, "Default Fixed Issue Filters");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.htmlindex fb509cbb8f..f9a27d96b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div wicket:id="secretsNote" class="alert alert-notice bg-white shadow mb-5"></div>+ <div wicket:id="secretsNote" class="alert alert-notice bg-white shadow mb-5 text-gray"></div><div class="card job-secrets"><div class="card-body"><a wicket:id="addNew" class="btn btn-primary btn-icon mb-4" title="Add new secret"><wicket:svg href="plus" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.htmlindex 38b30823c7..5482f8807b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="tag-protections">- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"></wicket:svg>Define tag protection rules. The first matching rule will take effect</div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlindex c5e09af4cb..49a74f7041 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div class="alert alert-notice bg-white shadow mb-5">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"/>OneDev will post event data in JSON format to specified URLs when subscribed events happen</div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.htmlindex 571f0b6e58..465219bef4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html@@ -1,8 +1,10 @@<wicket:extend><div class="project-contribs p-2 p-sm-5">- <div class="alert alert-notice bg-white shadow mb-5">+ <wicket:enclosure child="note">+ <div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"/><span wicket:id="note"></span></div>+ </wicket:enclosure><div class="card mb-5"><div class="card-body"><div class="d-flex align-items-center">