The Unified and Autonomous Development Platform
Tolerate issue workflow inconsistency when edit workflow
Robin Shen67e09334c967
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 6d683f51d3..8de3be11f1 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -97,11 +97,10 @@ import io.onedev.server.manager.GroupAuthorizationManager;import io.onedev.server.manager.GroupManager;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.manager.IssueCommentManager;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueNotificationManager;import io.onedev.server.manager.IssueQuerySettingManager;-import io.onedev.server.manager.IssueRelationManager;import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.IssueWatchManager;import io.onedev.server.manager.MailManager;@@ -141,11 +140,10 @@ import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.manager.impl.DefaultGroupManager;import io.onedev.server.manager.impl.DefaultIssueChangeManager;import io.onedev.server.manager.impl.DefaultIssueCommentManager;-import io.onedev.server.manager.impl.DefaultIssueFieldManager;+import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;import io.onedev.server.manager.impl.DefaultIssueManager;import io.onedev.server.manager.impl.DefaultIssueNotificationManager;import io.onedev.server.manager.impl.DefaultIssueQuerySettingManager;-import io.onedev.server.manager.impl.DefaultIssueRelationManager;import io.onedev.server.manager.impl.DefaultIssueVoteManager;import io.onedev.server.manager.impl.DefaultIssueWatchManager;import io.onedev.server.manager.impl.DefaultMailManager;@@ -304,7 +302,7 @@ public class CoreModule extends AbstractPluginModule {bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);- bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);+ bind(IssueFieldUnaryManager.class).to(DefaultIssueFieldUnaryManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(VisitManager.class).to(DefaultVisitManager.class);@@ -326,7 +324,6 @@ public class CoreModule extends AbstractPluginModule {bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);bind(IssueVoteManager.class).to(DefaultIssueVoteManager.class);- bind(IssueRelationManager.class).to(DefaultIssueRelationManager.class);bind(CacheManager.class).to(DefaultCacheManager.class);bind(VerificationManager.class).to(DefaultVerificationManager.class);bind(Session.class).toProvider(SessionProvider.class);diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.javaindex 2586a347e7..5cb0839a7c 100644--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java@@ -1,14 +1,13 @@package io.onedev.server.manager;import java.io.Serializable;-import java.util.Collection;import java.util.Map;import javax.annotation.Nullable;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.persistence.dao.EntityManager;public interface IssueChangeManager extends EntityManager<IssueChange> {@@ -17,9 +16,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void changeDescription(Issue issue, String oldDescription);- void changeFields(Issue issue, Serializable fieldBean,- Map<String, PromptedField> prevFields, Collection<String> promptedFields);+ void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields);void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,- Map<String, PromptedField> prevFields, Collection<String> promptedFields);+ Map<String, IssueField> prevFields);}diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/manager/IssueFieldManager.javarename to core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.javaindex 1c6d09e39d..6ef6809283 100644--- a/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java@@ -1,7 +1,6 @@package io.onedev.server.manager;import java.io.Serializable;-import java.util.Collection;import java.util.List;import java.util.Map;import java.util.Set;@@ -9,14 +8,14 @@ import java.util.Set;import javax.annotation.Nullable;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.InvalidFieldResolution;import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.UndefinedFieldValueResolution;-public interface IssueFieldManager extends EntityManager<IssueField> {+public interface IssueFieldUnaryManager extends EntityManager<IssueFieldUnary> {Class<? extends Serializable> defineFieldBeanClass(Project project);@@ -25,7 +24,7 @@ public interface IssueFieldManager extends EntityManager<IssueField> {Serializable readFields(Issue issue);- void writeFields(Issue issue, Serializable fieldBean, Collection<String> promptedFields);+ void writeFields(Issue issue, Serializable fieldBean);Set<String> getExcludedFields(Project project, String state);diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex c99f54da88..7bd64538fd 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -19,7 +19,7 @@ public interface IssueManager extends EntityManager<Issue> {@NullableIssue find(Project target, long number);- void open(Issue issue, Serializable fieldBean, Collection<String> promptedFields);+ void open(Issue issue, Serializable fieldBean);void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions);diff --git a/core/src/main/java/io/onedev/server/manager/IssueRelationManager.java b/core/src/main/java/io/onedev/server/manager/IssueRelationManager.javadeleted file mode 100644index 34694fb7c8..0000000000--- a/core/src/main/java/io/onedev/server/manager/IssueRelationManager.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.manager;--import javax.annotation.Nullable;--import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueRelation;-import io.onedev.server.persistence.dao.EntityManager;--public interface IssueRelationManager extends EntityManager<IssueRelation> {-- @Nullable- IssueRelation find(Issue current, Issue other);--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.javaindex 2fede21bba..d556bc0f1d 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java@@ -10,7 +10,7 @@ import io.onedev.server.exception.InUseException;import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Group;import io.onedev.server.model.Project;@@ -32,11 +32,11 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsprivate final CacheManager cacheManager;- private final IssueFieldManager issueFieldManager;+ private final IssueFieldUnaryManager issueFieldManager;@Injectpublic DefaultGroupManager(Dao dao, ProjectManager projectManager, ConfigManager configManager,- CacheManager cacheManager, IssueFieldManager issueFieldManager) {+ CacheManager cacheManager, IssueFieldUnaryManager issueFieldManager) {super(dao);this.projectManager = projectManager;this.configManager = configManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javaindex 0c8f6d14cb..4ff26f3227 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java@@ -1,7 +1,6 @@package io.onedev.server.manager.impl;import java.io.Serializable;-import java.util.Collection;import java.util.Date;import java.util.Map;@@ -14,13 +13,13 @@ import org.hibernate.criterion.Restrictions;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.issue.IssueChanged;import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.support.LastActivity;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.changedata.DescriptionChangeData;import io.onedev.server.model.support.issue.changedata.FieldChangeData;import io.onedev.server.model.support.issue.changedata.StateChangeData;@@ -37,16 +36,16 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeprivate final IssueManager issueManager;- private final IssueFieldManager issueFieldManager;+ private final IssueFieldUnaryManager issueFieldUnaryManager;private final ListenerRegistry listenerRegistry;@Injectpublic DefaultIssueChangeManager(Dao dao, IssueManager issueManager,- IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {+ IssueFieldUnaryManager issueFieldUnaryManager, ListenerRegistry listenerRegistry) {super(dao);this.issueManager = issueManager;- this.issueFieldManager = issueFieldManager;+ this.issueFieldUnaryManager = issueFieldUnaryManager;this.listenerRegistry = listenerRegistry;}@@ -90,26 +89,25 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Override- public void changeFields(Issue issue, Serializable fieldBean, Map<String, PromptedField> prevFields,- Collection<String> promptedFields) {+ public void changeFields(Issue issue, Serializable fieldBean, Map<String, IssueField> prevFields) {LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed custom fields");lastActivity.setDate(new Date());lastActivity.setUser(SecurityUtils.getUser());issueManager.save(issue);- issueFieldManager.writeFields(issue, fieldBean, promptedFields);+ issueFieldUnaryManager.writeFields(issue, fieldBean);IssueChange change = new IssueChange();change.setIssue(issue);change.setDate(new Date());change.setUser(SecurityUtils.getUser());getSession().flush();- EntityCriteria<IssueField> criteria = EntityCriteria.of(IssueField.class);+ EntityCriteria<IssueFieldUnary> criteria = EntityCriteria.of(IssueFieldUnary.class);criteria.add(Restrictions.eq("issue", issue));- issue.setFields(dao.findAll(criteria));+ issue.setFieldUnaries(dao.findAll(criteria));- change.setData(new FieldChangeData(prevFields, issue.getPromptedFields()));+ change.setData(new FieldChangeData(prevFields, issue.getEffectiveFields()));save(change);listenerRegistry.post(new IssueChanged(change));@@ -119,7 +117,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Overridepublic void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,- Map<String, PromptedField> prevFields, Collection<String> promptedFields) {+ Map<String, IssueField> prevFields) {long time = System.currentTimeMillis();LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed state to \"" + issue.getState() + "\"");@@ -127,7 +125,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangelastActivity.setUser(SecurityUtils.getUser());issueManager.save(issue);- issueFieldManager.writeFields(issue, fieldBean, promptedFields);+ issueFieldUnaryManager.writeFields(issue, fieldBean);IssueChange change = new IssueChange();change.setIssue(issue);change.setDate(new Date(time));@@ -135,11 +133,11 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangegetSession().flush();- EntityCriteria<IssueField> criteria = EntityCriteria.of(IssueField.class);+ EntityCriteria<IssueFieldUnary> criteria = EntityCriteria.of(IssueFieldUnary.class);criteria.add(Restrictions.eq("issue", issue));- issue.setFields(dao.findAll(criteria));+ issue.setFieldUnaries(dao.findAll(criteria));- change.setData(new StateChangeData(issue.getState(), prevFields, issue.getPromptedFields(), commentContent));+ change.setData(new StateChangeData(issue.getState(), prevFields, issue.getEffectiveFields(), commentContent));save(change);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javasimilarity index 79%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.javarename to core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javaindex 0b467098b7..87e89f9948 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java@@ -2,7 +2,6 @@ package io.onedev.server.manager.impl;import java.io.Serializable;import java.util.ArrayList;-import java.util.Collection;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;@@ -22,12 +21,13 @@ import org.apache.commons.lang.SerializationUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.exception.OneException;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -47,7 +47,7 @@ import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.Undeimport io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.UndefinedFieldValueResolution;@Singleton-public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField> implements IssueFieldManager {+public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFieldUnary> implements IssueFieldUnaryManager {private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);@@ -56,7 +56,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>private final ProjectManager projectManager;@Inject- public DefaultIssueFieldManager(Dao dao, ProjectManager projectManager) {+ public DefaultIssueFieldUnaryManager(Dao dao, ProjectManager projectManager) {super(dao);this.projectManager = projectManager;}@@ -87,12 +87,12 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>Map<String, PropertyDescriptor> propertyDescriptors = beanDescriptor.getMapOfDisplayNameToPropertyDescriptor();Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();-- for (Map.Entry<String, PromptedField> entry: issue.getPromptedFields().entrySet()) {++ for (Map.Entry<String, IssueField> entry: issue.getEffectiveFields().entrySet()) {List<String> strings = entry.getValue().getValues();Collections.sort(strings);- InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getField(entry.getKey());+ InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(entry.getKey());if (fieldSpec != null) {try {Object fieldValue;@@ -100,8 +100,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>fieldValue = fieldSpec.convertToObject(strings);elsefieldValue = null;- propertyDescriptors.get(fieldSpec.getName()).setPropertyValue(- fieldBean, fieldValue);+ propertyDescriptors.get(fieldSpec.getName()).setPropertyValue(fieldBean, fieldValue);} catch (Exception e) {logger.error("Error populating bean for field: " + fieldSpec.getName(), e);}@@ -113,18 +112,18 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Transactional@Override- public void writeFields(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {- Query query = getSession().createQuery("delete from IssueField where issue = :issue");+ public void writeFields(Issue issue, Serializable fieldBean) {+ Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue");query.setParameter("issue", issue);query.executeUpdate();- issue.getFields().clear();+ issue.getFieldUnaries().clear();BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {String fieldName = propertyDescriptor.getDisplayName();Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);- InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getField(fieldName);+ InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);if (fieldSpec != null) {long ordinal = fieldSpec.getOrdinal(new OneContext() {@@ -152,31 +151,25 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>}, fieldValue);- IssueField field = new IssueField();+ IssueFieldUnary field = new IssueFieldUnary();field.setIssue(issue);field.setName(fieldName);field.setOrdinal(ordinal);field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));- /*- * Need to add database records even for not-yet-prompted field in order to- * work with joined field query- */- field.setPrompted(promptedFields.contains(fieldName));-if (fieldValue != null) {List<String> strings = fieldSpec.convertToStrings(fieldValue);if (!strings.isEmpty()) {for (String string: strings) {- IssueField cloned = (IssueField) SerializationUtils.clone(field);+ IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);cloned.setIssue(issue);cloned.setValue(string);save(cloned);- issue.getFields().add(cloned);+ issue.getFieldUnaries().add(cloned);}} else {save(field);- issue.getFields().add(field);+ issue.getFieldUnaries().add(field);}} else {/*@@ -184,7 +177,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>* joined field query*/save(field);- issue.getFields().add(field);+ issue.getFieldUnaries().add(field);}}}@@ -194,7 +187,9 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>public Set<String> getExcludedFields(Project project, String state) {Map<String, PropertyDescriptor> propertyDescriptors =new BeanDescriptor(defineFieldBeanClass(project)).getMapOfDisplayNameToPropertyDescriptor();- StateSpec stateSpec = project.getIssueWorkflow().getState(state);+ StateSpec stateSpec = project.getIssueWorkflow().getStateSpec(state);+ if (stateSpec == null)+ throw new OneException("Unable to find state spec: " + state);Set<String> excludedFields = new HashSet<>();for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {if (!stateSpec.getFields().contains(fieldSpec.getName()))@@ -206,7 +201,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Transactional@Overridepublic void onRenameGroup(String oldName, String newName) {- Query query = getSession().createQuery("update IssueField set value=:newName where type=:groupChoice and value=:oldName");+ Query query = getSession().createQuery("update IssueFieldUnary set value=:newName where type=:groupChoice and value=:oldName");query.setParameter("groupChoice", InputSpec.GROUP_CHOICE);query.setParameter("oldName", oldName);query.setParameter("newName", newName);@@ -216,7 +211,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Transactional@Overridepublic void onRenameUser(String oldName, String newName) {- Query query = getSession().createQuery("update IssueField set value=:newName where type=:userChoice and value=:oldName");+ Query query = getSession().createQuery("update IssueFieldUnary set value=:newName where type=:userChoice and value=:oldName");query.setParameter("userChoice", InputSpec.USER_CHOICE);query.setParameter("oldName", oldName);query.setParameter("newName", newName);@@ -227,9 +222,9 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Overridepublic void populateFields(List<Issue> issues) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<IssueField> query = builder.createQuery(IssueField.class);+ CriteriaQuery<IssueFieldUnary> query = builder.createQuery(IssueFieldUnary.class);- Root<IssueField> root = query.from(IssueField.class);+ Root<IssueFieldUnary> root = query.from(IssueFieldUnary.class);query.select(root);root.join("issue");@@ -237,23 +232,23 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>query.where(issueExpr.in(issues));for (Issue issue: issues)- issue.setFields(new ArrayList<>());+ issue.setFieldUnaries(new ArrayList<>());- for (IssueField field: getSession().createQuery(query).getResultList())- field.getIssue().getFields().add(field);+ for (IssueFieldUnary field: getSession().createQuery(query).getResultList())+ field.getIssue().getFieldUnaries().add(field);}@SuppressWarnings("unchecked")@Sessional@Overridepublic Map<String, String> getInvalidFields(Project project) {- Query query = getSession().createQuery("select distinct name, type from IssueField where issue.project=:project");+ Query query = getSession().createQuery("select distinct name, type from IssueFieldUnary where issue.project=:project");query.setParameter("project", project);Map<String, String> invalidFields = new HashMap<>();for (Object[] row: (List<Object[]>)query.getResultList()) {String name = (String) row[0];String type = (String) row[1];- InputSpec fieldSpec = project.getIssueWorkflow().getField(name);+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);if (fieldSpec == null || !EditableUtils.getDisplayName(fieldSpec.getClass()).equals(type))invalidFields.put(name, type);}@@ -266,11 +261,11 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>for (Map.Entry<String, InvalidFieldResolution> entry: resolutions.entrySet()) {Query query;if (entry.getValue().getFixType() == InvalidFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query = getSession().createQuery("update IssueField set name=:newName where name=:oldName and issue.id in (select id from Issue where project=:project)");+ query = getSession().createQuery("update IssueFieldUnary set name=:newName where name=:oldName and issue.id in (select id from Issue where project=:project)");query.setParameter("oldName", entry.getKey());query.setParameter("newName", entry.getValue().getNewField());} else {- query = getSession().createQuery("delete from IssueField where name=:fieldName and issue.id in (select id from Issue where project=:project)");+ query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and issue.id in (select id from Issue where project=:project)");query.setParameter("fieldName", entry.getKey());}query.setParameter("project", project);@@ -282,7 +277,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Sessional@Overridepublic Map<String, String> getUndefinedFieldValues(Project project) {- Query query = getSession().createQuery("select distinct name, value from IssueField where issue.project=:project and (type=:choice or type=:multiChoice)");+ Query query = getSession().createQuery("select distinct name, value from IssueFieldUnary where issue.project=:project and (type=:choice or type=:multiChoice)");query.setParameter("project", project);query.setParameter("choice", InputSpec.CHOICE);query.setParameter("multiChoice", InputSpec.MULTI_CHOICE);@@ -316,7 +311,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>for (Object[] row: (List<Object[]>)query.getResultList()) {String name = (String) row[0];String value = (String) row[1];- InputSpec fieldSpec = project.getIssueWorkflow().getField(name);+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);if (fieldSpec != null && value != null) {List<String> choices;if (fieldSpec instanceof ChoiceInput)@@ -339,12 +334,12 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {Query query;if (entry.getValue().getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {- query = getSession().createQuery("update IssueField set value=:newValue where name=:fieldName and value=:oldValue and issue.id in (select id from Issue where project=:project)");+ query = getSession().createQuery("update IssueFieldUnary set value=:newValue where name=:fieldName and value=:oldValue and issue.id in (select id from Issue where project=:project)");query.setParameter("fieldName", entry.getKey().getFieldName());query.setParameter("oldValue", entry.getKey().getFieldValue());query.setParameter("newValue", entry.getValue().getNewValue());} else {- query = getSession().createQuery("delete from IssueField where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");+ query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");query.setParameter("fieldName", entry.getKey().getFieldName());query.setParameter("fieldValue", entry.getKey().getFieldValue());}@@ -383,7 +378,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>});try {- Query query = getSession().createQuery("select distinct name, value, ordinal from IssueField where issue.project=:project and type=:choice");+ Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldUnary where issue.project=:project and type=:choice");query.setParameter("project", project);query.setParameter("choice", InputSpec.CHOICE);@@ -391,12 +386,12 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>String name = (String) row[0];String value = (String) row[1];long ordinal = (long) row[2];- InputSpec fieldSpec = project.getIssueWorkflow().getField(name);+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);if (fieldSpec != null) {List<String> choices = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());long newOrdinal = choices.indexOf(value);if (ordinal != newOrdinal) {- query = getSession().createQuery("update IssueField set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");+ query = getSession().createQuery("update IssueFieldUnary set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");query.setParameter("fieldName", name);query.setParameter("fieldValue", value);query.setParameter("newOrdinal", newOrdinal);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex b45d328688..9192d151dd 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -23,7 +23,7 @@ import org.hibernate.query.Query;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;@@ -41,14 +41,14 @@ import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.Unde@Singletonpublic class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {- private final IssueFieldManager issueFieldManager;+ private final IssueFieldUnaryManager issueFieldManager;private final ListenerRegistry listenerRegistry;private final Map<String, AtomicLong> nextNumbers = new HashMap<>();@Inject- public DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {+ public DefaultIssueManager(Dao dao, IssueFieldUnaryManager issueFieldManager, ListenerRegistry listenerRegistry) {super(dao);this.issueFieldManager = issueFieldManager;this.listenerRegistry = listenerRegistry;@@ -65,7 +65,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Transactional@Override- public void open(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {+ public void open(Issue issue, Serializable fieldBean) {LastActivity lastActivity = new LastActivity();lastActivity.setAction("submitted");lastActivity.setUser(issue.getSubmitter());@@ -73,7 +73,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsissue.setLastActivity(lastActivity);issue.setNumber(getNextNumber(issue.getProject()));save(issue);- issueFieldManager.writeFields(issue, fieldBean, promptedFields);+ issueFieldManager.writeFields(issue, fieldBean);listenerRegistry.post(new IssueOpened(issue));}@@ -145,7 +145,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<String> states = query.getResultList();for (Iterator<String> it = states.iterator(); it.hasNext();) {- if (project.getIssueWorkflow().getState(it.next()) != null)+ if (project.getIssueWorkflow().getStateSpec(it.next()) != null)it.remove();}return states;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javaindex 2ab0d0bdb3..bbd00e6d57 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java@@ -134,7 +134,7 @@ public class DefaultIssueNotificationManager implements IssueNotificationManager}if (!watched) {for (Map.Entry<String, Boolean> entry: setting.getProjectQueryWatches().entrySet()) {- if (matches(parsedQueries, issue, issue.getProject().getIssueWorkflow().getQueries().get(entry.getKey()))) {+ if (matches(parsedQueries, issue, issue.getProject().getIssueWorkflow().getSavedQueries().get(entry.getKey()))) {watch(issue, setting.getUser(), entry.getValue());watched = true;break;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.javaindex b4da422e6c..433132bce5 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java@@ -36,7 +36,7 @@ public class DefaultIssueQuerySettingManager extends AbstractEntityManager<Issue@Overridepublic void save(IssueQuerySetting setting) {setting.getUserQueryWatches().keySet().retainAll(setting.getUserQueries().keySet());- setting.getProjectQueryWatches().keySet().retainAll(setting.getProject().getIssueWorkflow().getQueries().keySet());+ setting.getProjectQueryWatches().keySet().retainAll(setting.getProject().getIssueWorkflow().getSavedQueries().keySet());if (setting.getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.javadeleted file mode 100644index a82b6d9115..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.manager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--import io.onedev.server.manager.IssueRelationManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueRelation;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultIssueRelationManager extends AbstractEntityManager<IssueRelation>- implements IssueRelationManager {-- @Inject- public DefaultIssueRelationManager(Dao dao) {- super(dao);- }-- @Override- public IssueRelation find(Issue current, Issue other) {- EntityCriteria<IssueRelation> criteria = EntityCriteria.of(IssueRelation.class);- criteria.add(Restrictions.eq("current", current));- criteria.add(Restrictions.eq("other", other));- return find(criteria);- }--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.javaindex 0c4b1043ea..70fced4469 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java@@ -16,7 +16,7 @@ import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.lifecycle.SystemStarted;import io.onedev.server.exception.InUseException;import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;@@ -38,7 +38,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final ProjectManager projectManager;- private final IssueFieldManager issueFieldManager;+ private final IssueFieldUnaryManager issueFieldManager;private final CacheManager cacheManager;@@ -46,7 +46,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U@Injectpublic DefaultUserManager(Dao dao, ProjectManager projectManager,- IssueFieldManager issueFieldManager, CacheManager cacheManager,+ IssueFieldUnaryManager issueFieldManager, CacheManager cacheManager,PasswordService passwordService, ListenerRegistry listenerRegistry) {super(dao);diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 7d99efa988..371520ae9a 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -31,7 +31,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.VisitManager;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.Referenceable;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.inputspec.InputSpec;@@ -132,13 +132,7 @@ public class Issue extends AbstractEntity implements Referenceable {private LastActivity lastActivity;@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueField> fields = new ArrayList<>();-- @OneToMany(mappedBy="current", cascade=CascadeType.REMOVE)- private Collection<IssueRelation> relationsByCurrent = new ArrayList<>();-- @OneToMany(mappedBy="other", cascade=CascadeType.REMOVE)- private Collection<IssueRelation> relationsByOther = new ArrayList<>();+ private Collection<IssueFieldUnary> fieldUnaries = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueComment> comments = new ArrayList<>();@@ -152,7 +146,7 @@ public class Issue extends AbstractEntity implements Referenceable {@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueWatch> watches = new ArrayList<>();- private transient Map<String, PromptedField> promptedFields;+ private transient Map<String, IssueField> effectiveFields;public long getVersion() {return version;@@ -278,13 +272,13 @@ public class Issue extends AbstractEntity implements Referenceable {this.numOfComments = numOfComments;}- public Collection<IssueField> getFields() {- return fields;+ public Collection<IssueFieldUnary> getFieldUnaries() {+ return fieldUnaries;}- public void setFields(Collection<IssueField> fields) {- this.fields = fields;- promptedFields = null;+ public void setFieldUnaries(Collection<IssueFieldUnary> fieldUnaries) {+ this.fieldUnaries = fieldUnaries;+ effectiveFields = null;}public LastActivity getLastActivity() {@@ -305,14 +299,16 @@ public class Issue extends AbstractEntity implements Referenceable {}}- public Map<String, PromptedField> getPromptedFields() {- if (promptedFields == null) {- promptedFields = new LinkedHashMap<>();+ public Map<String, IssueField> getEffectiveFields() {+ if (effectiveFields == null) {+ effectiveFields = new LinkedHashMap<>();- Map<String, List<IssueField>> fieldMap = new HashMap<>();- for (IssueField field: getFields()) {- if (field.isPrompted()) {- List<IssueField> fieldsOfName = fieldMap.get(field.getName());+ Collection<String> effectiveFieldNames = getProject().getIssueWorkflow().getEffectiveFields(state);++ Map<String, List<IssueFieldUnary>> fieldMap = new HashMap<>();+ for (IssueFieldUnary field: getFieldUnaries()) {+ if (effectiveFieldNames.contains(field.getName())) {+ List<IssueFieldUnary> fieldsOfName = fieldMap.get(field.getName());if (fieldsOfName == null) {fieldsOfName = new ArrayList<>();fieldMap.put(field.getName(), fieldsOfName);@@ -323,37 +319,21 @@ public class Issue extends AbstractEntity implements Referenceable {for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {String fieldName = fieldSpec.getName();- List<IssueField> fields = fieldMap.get(fieldName);+ List<IssueFieldUnary> fields = fieldMap.get(fieldName);if (fields != null) {String type = fields.iterator().next().getType();List<String> values = new ArrayList<>();- for (IssueField field: fields) {+ for (IssueFieldUnary field: fields) {if (field.getValue() != null)values.add(field.getValue());}- promptedFields.put(fieldName, new PromptedField(fieldName, type, values));+ effectiveFields.put(fieldName, new IssueField(fieldName, type, values));}}}- return promptedFields;+ return effectiveFields;}- public Collection<IssueRelation> getRelationsByCurrent() {- return relationsByCurrent;- }-- public void setRelationsByCurrent(Collection<IssueRelation> relationsByCurrent) {- this.relationsByCurrent = relationsByCurrent;- }-- public Collection<IssueRelation> getRelationsByOther() {- return relationsByOther;- }-- public void setRelationsByOther(Collection<IssueRelation> relationsByOther) {- this.relationsByOther = relationsByOther;- }-public static String getWebSocketObservable(Long issueId) {return Issue.class.getName() + ":" + issueId;}diff --git a/core/src/main/java/io/onedev/server/model/IssueField.java b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/model/IssueField.javarename to core/src/main/java/io/onedev/server/model/IssueFieldUnary.javaindex 2e25c4e44a..63fa91fb17 100644--- a/core/src/main/java/io/onedev/server/model/IssueField.java+++ b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java@@ -15,7 +15,7 @@ import javax.persistence.Table;@Index(columnList="g_issue_id"), @Index(columnList="name"),@Index(columnList="value"), @Index(columnList="type"),@Index(columnList="ordinal")})-public class IssueField extends AbstractEntity {+public class IssueFieldUnary extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -37,8 +37,6 @@ public class IssueField extends AbstractEntity {@Column(nullable=false)private String type;- private boolean prompted;-private long ordinal;public Issue getIssue() {@@ -88,12 +86,4 @@ public class IssueField extends AbstractEntity {this.ordinal = ordinal;}- public boolean isPrompted() {- return prompted;- }-- public void setPrompted(boolean prompted) {- this.prompted = prompted;- }-}diff --git a/core/src/main/java/io/onedev/server/model/IssueRelation.java b/core/src/main/java/io/onedev/server/model/IssueRelation.javadeleted file mode 100644index 84d96a07d6..0000000000--- a/core/src/main/java/io/onedev/server/model/IssueRelation.java+++ /dev/null@@ -1,47 +0,0 @@-package io.onedev.server.model;--import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;--@Entity-@Table(- indexes={@Index(columnList="g_current_id"), @Index(columnList="g_other_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_current_id", "g_other_id"})})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-public class IssueRelation extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Issue current;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Issue other;-- public Issue getCurrent() {- return current;- }-- public void setCurrent(Issue current) {- this.current = current;- }-- public Issue getOther() {- return other;- }-- public void setOther(Issue other) {- this.other = other;- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/PromptedField.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueField.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/model/support/issue/PromptedField.javarename to core/src/main/java/io/onedev/server/model/support/issue/IssueField.javaindex 5a8ede4886..2539b9f58a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/PromptedField.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java@@ -5,7 +5,7 @@ import java.util.List;import com.thoughtworks.xstream.annotations.XStreamOmitField;-public class PromptedField implements Serializable {+public class IssueField implements Serializable {private static final long serialVersionUID = 1L;@@ -16,7 +16,7 @@ public class PromptedField implements Serializable {private final List<String> values;- public PromptedField(String name, String type, List<String> values) {+ public IssueField(String name, String type, List<String> values) {this.name = name;this.type = type;this.values = values;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.javaindex e23a925495..9bc503e04e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.diff.plain.PlainDiffPanel;@@ -27,33 +27,34 @@ public class FieldChangeData implements ChangeData {private static final long serialVersionUID = 1L;- private final Map<String, PromptedField> oldFields;+ private final Map<String, IssueField> oldFields;- private final Map<String, PromptedField> newFields;+ private final Map<String, IssueField> newFields;- public FieldChangeData(Map<String, PromptedField> oldFields, Map<String, PromptedField> newFields) {+ public FieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {this.oldFields = copyFields(oldFields);this.newFields = copyFields(newFields);- for (Iterator<Map.Entry<String, PromptedField>> it = this.oldFields.entrySet().iterator(); it.hasNext();) {- Map.Entry<String, PromptedField> entry = it.next();- if (entry.getValue().getValues().equals(this.newFields.get(entry.getKey()).getValues())) {+ for (Iterator<Map.Entry<String, IssueField>> it = this.oldFields.entrySet().iterator(); it.hasNext();) {+ Map.Entry<String, IssueField> entry = it.next();+ IssueField newField = this.newFields.get(entry.getKey());+ if (newField != null && entry.getValue().getValues().equals(newField.getValues())) {this.newFields.remove(entry.getKey());it.remove();}}}- public Map<String, PromptedField> getOldFields() {+ public Map<String, IssueField> getOldFields() {return oldFields;}- public Map<String, PromptedField> getNewFields() {+ public Map<String, IssueField> getNewFields() {return newFields;}- private Map<String, PromptedField> copyFields(Map<String, PromptedField> fields) {- Map<String, PromptedField> copyOfFields = new LinkedHashMap<>();- for (Map.Entry<String, PromptedField> entry: fields.entrySet()) {+ private Map<String, IssueField> copyFields(Map<String, IssueField> fields) {+ Map<String, IssueField> copyOfFields = new LinkedHashMap<>();+ for (Map.Entry<String, IssueField> entry: fields.entrySet()) {if (!entry.getValue().getValues().contains(null) && !entry.getValue().getValues().isEmpty())copyOfFields.put(entry.getKey(), entry.getValue());}@@ -74,9 +75,9 @@ public class FieldChangeData implements ChangeData {return "changed custom fields";}- public List<String> getLines(Map<String, PromptedField> fields) {+ public List<String> getLines(Map<String, IssueField> fields) {List<String> lines = new ArrayList<>();- for (Map.Entry<String, PromptedField> entry: fields.entrySet()) {+ for (Map.Entry<String, IssueField> entry: fields.entrySet()) {if (entry.getValue().getType().equals(InputSpec.ISSUE_CHOICE))lines.add(entry.getKey() + ": #" + entry.getValue().getValues().iterator().next());else@@ -102,7 +103,7 @@ public class FieldChangeData implements ChangeData {@Overridepublic Map<String, User> getNewUsers() {Map<String, User> newUsers = new HashMap<>();- for (PromptedField field: newFields.values()) {+ for (IssueField field: newFields.values()) {if (field.getType().equals(InputSpec.USER_CHOICE)) {User user = OneDev.getInstance(UserManager.class).findByName(field.getValues().iterator().next());if (user != null)@@ -115,7 +116,7 @@ public class FieldChangeData implements ChangeData {@Overridepublic Map<String, Group> getNewGroups() {Map<String, Group> newGroups = new HashMap<>();- for (PromptedField field: newFields.values()) {+ for (IssueField field: newFields.values()) {if (field.getType().equals(InputSpec.GROUP_CHOICE)) {Group group = OneDev.getInstance(GroupManager.class).find(field.getValues().iterator().next());if (group != null)diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.javaindex 371aa22cc1..2351e0f36a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java@@ -10,7 +10,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.StateChangePanel;import io.onedev.utils.HtmlUtils;@@ -23,7 +23,7 @@ public class StateChangeData extends FieldChangeData {private String comment;- public StateChangeData(String state, Map<String, PromptedField> oldFields, Map<String, PromptedField> newFields,+ public StateChangeData(String state, Map<String, IssueField> oldFields, Map<String, IssueField> newFields,@Nullable String comment) {super(oldFields, newFields);this.state = state;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.javaindex 25383cd1ff..8bf8f38ab0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class BooleanFieldCriteria extends FieldCriteria {@@ -24,7 +24,7 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueField.VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, String.valueOf(value));elsediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.javaindex bc257ddb11..262c2158d9 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Join;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class ChoiceFieldCriteria extends FieldCriteria {@@ -29,13 +29,13 @@ public class ChoiceFieldCriteria extends FieldCriteria {public Predicate getPredicate(QueryBuildContext context) {Join<Issue, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(join.get(IssueField.VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(join.get(IssueField.VALUE), value);+ return context.getBuilder().notEqual(join.get(IssueFieldUnary.VALUE), value);else if (operator == IssueQueryLexer.IsGreaterThan)- return context.getBuilder().greaterThan(join.get(IssueField.ORDINAL), ordinal);+ return context.getBuilder().greaterThan(join.get(IssueFieldUnary.ORDINAL), ordinal);else- return context.getBuilder().lessThan(join.get(IssueField.ORDINAL), ordinal);+ return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), ordinal);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.javaindex 675f5dbf9a..52b984b80c 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Join;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class DateFieldCriteria extends FieldCriteria {@@ -26,9 +26,9 @@ public class DateFieldCriteria extends FieldCriteria {public Predicate getPredicate(QueryBuildContext context) {Join<Issue, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.IsBefore)- return context.getBuilder().lessThan(join.get(IssueField.ORDINAL), value.getTime());+ return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());else- return context.getBuilder().greaterThan(join.get(IssueField.ORDINAL), value.getTime());+ return context.getBuilder().greaterThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.javaindex 9a3c6aaad3..d71daea277 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -26,9 +26,9 @@ public abstract class FieldCriteria extends IssueCriteria {}protected long getFieldOrdinal(Issue issue) {- InputSpec field = issue.getProject().getIssueWorkflow().getField(fieldName);- if (field != null) {- return field.getOrdinal(new OneContext() {+ InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec != null) {+ return fieldSpec.getOrdinal(new OneContext() {@Overridepublic Project getProject() {@@ -60,16 +60,16 @@ public abstract class FieldCriteria extends IssueCriteria {private Object getFieldValue(Issue issue, String fieldName) {List<String> strings = new ArrayList<>();- for (IssueField field: issue.getFields()) {+ for (IssueFieldUnary field: issue.getFieldUnaries()) {if (field.getName().equals(fieldName))strings.add(field.getValue());}if (strings.isEmpty() || strings.contains(null)) {return null;} else {- InputSpec field = issue.getProject().getIssueWorkflow().getField(fieldName);- if (field != null)- return field.convertToObject(strings);+ InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec != null)+ return fieldSpec.convertToObject(strings);elsereturn null;}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.javaindex b4bb4c1b8d..0c93ce6b94 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.security.SecurityUtils;public class FieldUnaryCriteria extends FieldCriteria {@@ -22,7 +22,7 @@ public class FieldUnaryCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<?> attribute = context.getJoin(getFieldName()).get(IssueField.VALUE);+ Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);else if (operator == IssueQueryLexer.IsNotEmpty)diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.javaindex c46fda7d58..8621d6142a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class IssueFieldCriteria extends FieldCriteria {@@ -24,7 +24,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<Long> attribute = context.getJoin(getFieldName()).get(IssueField.ORDINAL);+ Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);elsediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.javaindex 7304c7faa6..31e53c93ef 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java@@ -29,7 +29,7 @@ import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.query.IssueQueryParser.AllCriteriaContext;@@ -95,12 +95,12 @@ public class IssueQuery implements Serializable {elseorders.add(builder.desc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));} else {- Join<Issue, IssueField> join = root.join("fields", JoinType.LEFT);- join.on(builder.equal(join.get(IssueField.NAME), sort.getField()));+ Join<Issue, IssueFieldUnary> join = root.join("fields", JoinType.LEFT);+ join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(join.get(IssueField.ORDINAL)));+ orders.add(builder.asc(join.get(IssueFieldUnary.ORDINAL)));else- orders.add(builder.desc(join.get(IssueField.ORDINAL)));+ orders.add(builder.desc(join.get(IssueFieldUnary.ORDINAL)));}}@@ -271,8 +271,8 @@ public class IssueQuery implements Serializable {} else if (fieldName.equals(Issue.DESCRIPTION)) {return new DescriptionCriteria(value, operator);} else {- InputSpec field = project.getIssueWorkflow().getField(fieldName);- if (field instanceof TextInput)+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec instanceof TextInput)return new StringFieldCriteria(fieldName, value, operator);elsereturn new MultiChoiceFieldCriteria(fieldName, value, operator);@@ -293,7 +293,7 @@ public class IssueQuery implements Serializable {throw new OneException("Unable to find user with login: " + value);return new SubmitterCriteria(user, operator);} else {- InputSpec field = project.getIssueWorkflow().getField(fieldName);+ InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);if (field instanceof IssueChoiceInput) {value = value.trim();if (value.startsWith("#"))@@ -322,7 +322,7 @@ public class IssueQuery implements Serializable {} else if (fieldName.equals(Issue.NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {- InputSpec field = project.getIssueWorkflow().getField(fieldName);+ InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);if (field instanceof NumberInput)return new NumberFieldCriteria(fieldName, getIntValue(value), operator);else@@ -360,9 +360,9 @@ public class IssueQuery implements Serializable {if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE)&& !fieldName.equals(Issue.VOTES) && !fieldName.equals(Issue.COMMENTS)&& !fieldName.equals(Issue.NUMBER)) {- InputSpec field = project.getIssueWorkflow().getField(fieldName);- if (!(field instanceof ChoiceInput) && !(field instanceof DateInput)- && !(field instanceof NumberInput)) {+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);+ if (!(fieldSpec instanceof ChoiceInput) && !(fieldSpec instanceof DateInput)+ && !(fieldSpec instanceof NumberInput)) {throw new OneException("Can not order by field: " + fieldName);}}@@ -387,8 +387,8 @@ public class IssueQuery implements Serializable {}public static void checkField(Project project, String fieldName, int operator) {- InputSpec field = project.getIssueWorkflow().getField(fieldName);- if (field == null && !Issue.BUILTIN_FIELDS.containsKey(fieldName))+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec == null && !Issue.BUILTIN_FIELDS.containsKey(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case IssueQueryLexer.IsEmpty:@@ -398,20 +398,20 @@ public class IssueQuery implements Serializable {break;case IssueQueryLexer.IsMe:case IssueQueryLexer.IsNotMe:- if (!fieldName.equals(Issue.SUBMITTER) && !(field instanceof UserChoiceInput))+ if (!fieldName.equals(Issue.SUBMITTER) && !(fieldSpec instanceof UserChoiceInput))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE) && !(field instanceof DateInput))+ if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE) && !(fieldSpec instanceof DateInput))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.Contains:case IssueQueryLexer.DoesNotContain:if (!fieldName.equals(Issue.TITLE)&& !fieldName.equals(Issue.DESCRIPTION)- && !(field instanceof TextInput)- && !(field instanceof MultiChoiceInput)) {+ && !(fieldSpec instanceof TextInput)+ && !(fieldSpec instanceof MultiChoiceInput)) {throw newOperatorException(fieldName, operator);}break;@@ -422,13 +422,13 @@ public class IssueQuery implements Serializable {&& !fieldName.equals(Issue.COMMENTS)&& !fieldName.equals(Issue.SUBMITTER)&& !fieldName.equals(Issue.NUMBER)- && !(field instanceof IssueChoiceInput)- && !(field instanceof BooleanInput)- && !(field instanceof NumberInput)- && !(field instanceof ChoiceInput)- && !(field instanceof UserChoiceInput)- && !(field instanceof GroupChoiceInput)- && !(field instanceof TextInput)) {+ && !(fieldSpec instanceof IssueChoiceInput)+ && !(fieldSpec instanceof BooleanInput)+ && !(fieldSpec instanceof NumberInput)+ && !(fieldSpec instanceof ChoiceInput)+ && !(fieldSpec instanceof UserChoiceInput)+ && !(fieldSpec instanceof GroupChoiceInput)+ && !(fieldSpec instanceof TextInput)) {throw newOperatorException(fieldName, operator);}break;@@ -437,8 +437,8 @@ public class IssueQuery implements Serializable {if (!fieldName.equals(Issue.VOTES)&& !fieldName.equals(Issue.COMMENTS)&& !fieldName.equals(Issue.NUMBER)- && !(field instanceof NumberInput)- && !(field instanceof ChoiceInput))+ && !(fieldSpec instanceof NumberInput)+ && !(fieldSpec instanceof ChoiceInput))throw newOperatorException(fieldName, operator);break;}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MultiChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MultiChoiceFieldCriteria.javaindex f7b360991b..b8af8aa0b3 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MultiChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MultiChoiceFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class MultiChoiceFieldCriteria extends FieldCriteria {@@ -24,7 +24,7 @@ public class MultiChoiceFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<?> attribute = context.getJoin(getFieldName()).get(IssueField.VALUE);+ Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Contains)return context.getBuilder().equal(attribute, value);elsediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.javaindex 6e023c6375..2cd0176cf3 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class NumberFieldCriteria extends FieldCriteria {@@ -24,7 +24,7 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueField.ORDINAL);+ Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsNot)diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.javaindex c9cd640ba8..ec4b92ef29 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueFieldUnary;public class StringFieldCriteria extends FieldCriteria {@@ -28,7 +28,7 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(QueryBuildContext context) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueField.VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsNot)diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex ccf9cea0f9..b265457468 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -2,6 +2,8 @@ package io.onedev.server.model.support.issue.workflow;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;@@ -42,7 +44,7 @@ public class IssueWorkflow implements Serializable, InputContext {private List<InputSpec> fieldSpecs = new ArrayList<>();- private Map<String, String> queries = new LinkedHashMap<>();+ private Map<String, String> savedQueries = new LinkedHashMap<>();private List<String> listFields = new ArrayList<>();@@ -217,14 +219,14 @@ public class IssueWorkflow implements Serializable, InputContext {listFields.add("Priority");listFields.add("Assignee");- queries.put("All", "all");- queries.put("Outstanding", "\"State\" is not \"Closed\"");- queries.put("Closed", "\"State\" is \"Closed\"");- queries.put("Added recently", "\"Submit Date\" is after \"one week ago\"");- queries.put("Updated recently", "\"Update Date\" is after \"one week ago\"");- queries.put("Submitted by me", "\"Submitter\" is me");- queries.put("Assigned to me", "\"Assignee\" is me");- queries.put("Hight Priority", "\"Priority\" is \"High\"");+ savedQueries.put("All", "all");+ savedQueries.put("Outstanding", "\"State\" is not \"Closed\"");+ savedQueries.put("Closed", "\"State\" is \"Closed\"");+ savedQueries.put("Added recently", "\"Submit Date\" is after \"one week ago\"");+ savedQueries.put("Updated recently", "\"Update Date\" is after \"one week ago\"");+ savedQueries.put("Submitted by me", "\"Submitter\" is me");+ savedQueries.put("Assigned to me", "\"Assignee\" is me");+ savedQueries.put("Hight Priority", "\"Priority\" is \"High\"");}public List<StateSpec> getStateSpecs() {@@ -251,12 +253,12 @@ public class IssueWorkflow implements Serializable, InputContext {this.fieldSpecs = fieldSpecs;}- public Map<String, String> getQueries() {- return queries;+ public Map<String, String> getSavedQueries() {+ return savedQueries;}- public void setQueries(Map<String, String> queries) {- this.queries = queries;+ public void setSavedQueries(Map<String, String> savedQueries) {+ this.savedQueries = savedQueries;}public List<String> getListFields() {@@ -299,11 +301,8 @@ public class IssueWorkflow implements Serializable, InputContext {}@Override- public InputSpec getInput(String inputName) {- InputSpec field = getFieldSpecMap().get(inputName);- if (field == null)- throw new RuntimeException("Unable to find input: " + inputName);- return field;+ public InputSpec getInputSpec(String inputName) {+ return getFieldSpecMap().get(inputName);}public List<String> onDeleteState(String stateName) {@@ -327,11 +326,11 @@ public class IssueWorkflow implements Serializable, InputContext {}@Nullable- public StateSpec getState(String stateName) {+ public StateSpec getStateSpec(String stateName) {return getStateSpecMap().get(stateName);}- public int getStateIndex(String stateName) {+ public int getStateSpecIndex(String stateName) {for (int i=0; i<getStateSpecs().size(); i++) {if (getStateSpecs().get(i).getName().equals(stateName))return i;@@ -339,7 +338,7 @@ public class IssueWorkflow implements Serializable, InputContext {return -1;}- public int getTransitionIndex(TransitionSpec transition) {+ public int getTransitionSpecIndex(TransitionSpec transition) {for (int i=0; i<getTransitionSpecs().size(); i++) {if (getTransitionSpecs().get(i) == transition)return i;@@ -348,11 +347,11 @@ public class IssueWorkflow implements Serializable, InputContext {}@Nullable- public InputSpec getField(String fieldName) {+ public InputSpec getFieldSpec(String fieldName) {return getFieldSpecMap().get(fieldName);}- public int getFieldIndex(String fieldName) {+ public int getFieldSpecIndex(String fieldName) {for (int i=0; i<getFieldSpecs().size(); i++) {if (getFieldSpecs().get(i).getName().equals(fieldName))return i;@@ -416,15 +415,24 @@ public class IssueWorkflow implements Serializable, InputContext {return usages;}- public StateSpec getInitialState() {+ public StateSpec getInitialStateSpec() {if (!getStateSpecs().isEmpty())return getStateSpecs().iterator().next();elsethrow new OneException("No any issue state is defined");}+@Overridepublic boolean isReservedName(String inputName) {throw new UnsupportedOperationException();}+ public Collection<String> getEffectiveFields(String state) {+ int index = getStateSpecIndex(state);+ Collection<String> effectiveFields = new HashSet<>();+ for (int i=0; i<=index; i++)+ effectiveFields.addAll(getStateSpecs().get(i).getFields());+ return effectiveFields;+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.javaindex faaeb844f0..4b59322629 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/HasSpecifiedValues.java@@ -3,10 +3,14 @@ package io.onedev.server.model.support.issue.workflow.transitionprerequisite;import java.util.ArrayList;import java.util.List;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;import io.onedev.server.web.util.WicketUtils;@@ -15,6 +19,8 @@ public class HasSpecifiedValues implements ValueSpecification {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(HasSpecifiedValues.class);+private List<String> fieldValues;@Override@@ -38,10 +44,13 @@ public class HasSpecifiedValues implements ValueSpecification {String fieldName = (String) OneContext.get().getEditContext(1).getInputValue("fieldName");if (fieldName != null) {IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();- return page.getWorkflow().getInput(fieldName).getPossibleValues();- } else {- return new ArrayList<>();- }+ InputSpec fieldSpec = page.getWorkflow().getInputSpec(fieldName);+ if (fieldSpec != null)+ return fieldSpec.getPossibleValues();+ else+ logger.error("Unable to find field spec: " + fieldName);+ }+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java b/core/src/main/java/io/onedev/server/util/inputspec/InputContext.javaindex 04a54ce5cd..78d8862eb3 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java@@ -2,11 +2,14 @@ package io.onedev.server.util.inputspec;import java.util.List;+import javax.annotation.Nullable;+public interface InputContext {List<String> getInputNames();- InputSpec getInput(String inputName);+ @Nullable+ InputSpec getInputSpec(String inputName);boolean isReservedName(String inputName);diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javaindex b91fefd28e..fedf488775 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java@@ -7,6 +7,8 @@ import java.util.List;import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.ChoiceProvider;@@ -19,6 +21,8 @@ public class ShowCondition implements Serializable {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(ShowCondition.class);+private String inputName;private ValueMatcher valueMatcher = new ValueIsOneOf();@@ -51,18 +55,23 @@ public class ShowCondition implements Serializable {}public boolean isVisible() {- InputSpec input = OneContext.get().getInputContext().getInput(getInputName());- Object inputValue = OneContext.get().getEditContext().getInputValue(getInputName());- if (inputValue != null) {- List<String> strings = input.convertToStrings(inputValue);- if (strings.isEmpty())+ InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(getInputName());+ if (inputSpec != null) {+ Object inputValue = OneContext.get().getEditContext().getInputValue(getInputName());+ if (inputValue != null) {+ List<String> strings = inputSpec.convertToStrings(inputValue);+ if (strings.isEmpty())+ return getValueMatcher().matches(null);+ else if (strings.size() == 1)+ return getValueMatcher().matches(strings.iterator().next());+ else+ throw new IllegalStateException("Show condition should not be based on a multi-value input");+ } else {return getValueMatcher().matches(null);- else if (strings.size() == 1)- return getValueMatcher().matches(strings.iterator().next());- else- throw new IllegalStateException("Show condition should not be based on a multi-value input");+ }} else {- return getValueMatcher().matches(null);+ logger.error("Unable to find input spec: " + getInputName());+ return false;}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.javaindex 188c3cf159..72bd54a290 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java@@ -4,18 +4,24 @@ import java.util.List;import javax.validation.constraints.Size;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.collect.Lists;import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.inputspec.InputSpec;@Editable(order=200, name="does not have any value of")public class ValueIsNotAnyOf implements ValueMatcher {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(ValueIsNotAnyOf.class);+private List<String> values;@Editable@@ -34,10 +40,14 @@ public class ValueIsNotAnyOf implements ValueMatcher {private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedNameString inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");- if (inputName != null)- return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();- else- return Lists.newArrayList();+ if (inputName != null) {+ InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);+ if (inputSpec != null)+ return inputSpec.getPossibleValues();+ else+ logger.error("Unable to find input spec: " + inputName);+ }+ return Lists.newArrayList();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javaindex 3cb2ee065c..2c265c6419 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java@@ -4,17 +4,23 @@ import java.util.List;import javax.validation.constraints.Size;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.collect.Lists;import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.inputspec.InputSpec;@Editable(order=100, name="has value of")public class ValueIsOneOf implements ValueMatcher {private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(ValueIsOneOf.class);private List<String> values;@@ -34,10 +40,14 @@ public class ValueIsOneOf implements ValueMatcher {private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedNameString inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");- if (inputName != null)- return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();- else- return Lists.newArrayList();+ if (inputName != null) {+ InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);+ if (inputSpec != null)+ return inputSpec.getPossibleValues();+ else+ logger.error("Unable to find input spec: " + inputName);+ }+ return Lists.newArrayList();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.javaindex 0d0573d4ed..526c03357f 100644--- a/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.java@@ -4,6 +4,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;+import io.onedev.server.exception.OneException;import io.onedev.server.model.Issue;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.utils.ColorUtils;@@ -29,14 +30,12 @@ public class IssueStateLabel extends Label {super.onInitialize();Issue issue = issueModel.getObject();- StateSpec stateSpec = issue.getProject().getIssueWorkflow().getState(issue.getState());- if (stateSpec != null) {- String fontColor = ColorUtils.isLight(stateSpec.getColor())?"black":"white";- String style = String.format(- "background-color: %s; color: %s;",- stateSpec.getColor(), fontColor);- add(AttributeAppender.append("style", style));- }+ StateSpec stateSpec = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());+ if (stateSpec == null)+ throw new OneException("Unable to find state spec: " + issue.getState());+ String fontColor = ColorUtils.isLight(stateSpec.getColor())?"black":"white";+ String style = String.format("background-color: %s; color: %s;", stateSpec.getColor(), fontColor);+ add(AttributeAppender.append("style", style));add(AttributeAppender.append("title", "State"));}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex aef8f8c0cf..123591d547 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -67,7 +67,8 @@ public class BeanViewer extends Panel implements EditContext {Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));- item.setVisible(propertyContext.isPropertyVisible(new ComponentContext(BeanViewer.this), beanDescriptor) && !propertyContext.isExcluded());+ item.setVisible(propertyContext.isPropertyVisible(new ComponentContext(BeanViewer.this), beanDescriptor)+ && !propertyContext.isExcluded());item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 8730498a9b..0021e5df6b 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -117,9 +117,9 @@ public class PropertyDescriptor implements Serializable {return isPropertyVisible(oneContext, beanDescriptor, new HashSet<>());}- public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {+ private boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {if (checkedPropertyNames.contains(getPropertyName()))- return true;+ return false;checkedPropertyNames.add(getPropertyName());OneContext.push(oneContext);diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 19d24729a5..12ade8dd05 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -68,8 +68,16 @@ public class SingleChoiceEditor extends PropertyEditor<String> {tag.remove("type");super.onComponentTag(tag);}++ @Override+ protected String getNullValidDisplayValue() {+ if (propertyDescriptor.isPropertyRequired())+ return "Please choose...";+ else+ return super.getNullValidDisplayValue();+ }- };+ }.setNullValid(true);}input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex bb5bab349f..2fc9ba7981 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -160,7 +160,7 @@ public abstract class ProjectPage extends LayoutPage {if (setting != null)queries.addAll(setting.getUserQueries().values());}- queries.addAll(getProject().getIssueWorkflow().getQueries().values());+ queries.addAll(getProject().getIssueWorkflow().getSavedQueries().values());for (String each: queries) {try {if (getLoginUser() != null || !IssueQuery.parse(getProject(), each).needsLogin()) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.javaindex 75f01d77c5..8be50d357c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java@@ -19,7 +19,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.EditableUtils;@@ -73,7 +73,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {}} else {Label label = new Label("value", value);- InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getField(getField().getName());+ InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());ChoiceProvider choiceProvider = null;if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();@@ -106,7 +106,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else {InputSpec fieldSpec = null;if (getField() != null)- fieldSpec = getIssue().getProject().getIssueWorkflow().getField(getField().getName());+ fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());String displayValue;if (fieldSpec != null && fieldSpec.getNameOfEmptyValue() != null)displayValue = fieldSpec.getNameOfEmptyValue();@@ -119,8 +119,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {@Overridepublic Object getInputValue(String name) {- PromptedField field = getIssue().getPromptedFields().get(name);- InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getField(name);+ IssueField field = getIssue().getEffectiveFields().get(name);+ InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(name);if (field != null && fieldSpec != null && field.getType().equals(EditableUtils.getDisplayName(fieldSpec.getClass()))) {return fieldSpec.convertToObject(field.getValues());} else {@@ -130,7 +130,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {protected abstract Issue getIssue();- protected abstract PromptedField getField();+ protected abstract IssueField getField();@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 82c9a96ee3..76125ffb2c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -51,7 +51,7 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.IssueWatchManager;@@ -61,7 +61,7 @@ import io.onedev.server.model.IssueVote;import io.onedev.server.model.IssueWatch;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.WatchStatus;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;@@ -85,7 +85,6 @@ import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;@@ -237,7 +236,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic int compare(TransitionSpec o1, TransitionSpec o2) {IssueWorkflow workflow = getProject().getIssueWorkflow();- return workflow.getStateIndex(o1.getToState()) - workflow.getStateIndex(o2.getToState());+ return workflow.getStateSpecIndex(o1.getToState()) - workflow.getStateSpecIndex(o2.getToState());}});@@ -250,7 +249,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexif (transition.getPrerequisite() == null) {applicable = true;} else {- PromptedField field = getIssue().getPromptedFields().get(transition.getPrerequisite().getFieldName());+ IssueField field = getIssue().getEffectiveFields().get(transition.getPrerequisite().getFieldName());List<String> fieldValues;if (field != null)fieldValues = field.getValues();@@ -267,8 +266,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onClick(AjaxRequestTarget target) {Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);- Serializable fieldBean = getIssueFieldManager().readFields(getIssue());- Set<String> excludedFields = getIssueFieldManager().getExcludedFields(getIssue().getProject(), transition.getToState());+ Serializable fieldBean = getIssueFieldUnaryManager().readFields(getIssue());+ Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedFields(getIssue().getProject(), transition.getToState());Form<?> form = new Form<Void>("form") {@@ -302,7 +301,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex});- Map<String, PromptedField> prevFields = getIssue().getPromptedFields();+ Map<String, IssueField> prevFields = getIssue().getEffectiveFields();form.add(new AjaxButton("save") {@@ -310,17 +309,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);getIssue().setState(transition.getToState());- Set<String> promptedFields = new HashSet<>(getIssue().getPromptedFields().keySet());-- for (PropertyContext<?> propertyContext: editor.getPropertyContexts()) {- if (!propertyContext.isExcluded()) {- if (propertyContext.isPropertyVisible(editor.getOneContext(propertyContext.getPropertyName()), editor.getBeanDescriptor()))- promptedFields.add(propertyContext.getDisplayName());- else- promptedFields.remove(propertyContext.getDisplayName());- }- }- getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevFields, promptedFields);+ getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevFields);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));}@@ -518,24 +507,61 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getIssue().getFields().isEmpty());+ setVisible(!getIssue().getEffectiveFields().isEmpty());}};fieldsContainer.setOutputMarkupId(true);- fieldsContainer.add(new ListView<PromptedField>("fields", new LoadableDetachableModel<List<PromptedField>>() {+ fieldsContainer.add(new ListView<IssueField>("fields", new LoadableDetachableModel<List<IssueField>>() {+ private boolean isVisible(IssueField field, Set<String> checkedFieldNames) {+ if (!checkedFieldNames.contains(field.getName())) {+ checkedFieldNames.add(field.getName());++ IssueWorkflow workflow = getProject().getIssueWorkflow();+ InputSpec fieldSpec = workflow.getFieldSpec(field.getName());+ if (fieldSpec != null) {+ if (fieldSpec.getShowCondition() != null) {+ IssueField dependentField = getIssue().getEffectiveFields().get(fieldSpec.getShowCondition().getInputName());+ if (dependentField != null) {+ if (!isVisible(dependentField, checkedFieldNames))+ return false;+ String value;+ if (!dependentField.getValues().isEmpty())+ value = dependentField.getValues().iterator().next();+ else+ value = null;+ return fieldSpec.getShowCondition().getValueMatcher().matches(value);+ } else {+ return false;+ }+ } else {+ return true;+ }+ } else {+ return false;+ }+ } else {+ return false;+ }+ }+@Override- protected List<PromptedField> load() {- return new ArrayList<>(getIssue().getPromptedFields().values());+ protected List<IssueField> load() {+ List<IssueField> fields = new ArrayList<>();+ for (IssueField field: getIssue().getEffectiveFields().values()) {+ if (isVisible(field, new HashSet<>()))+ fields.add(field);+ }+ return fields;}}) {@Override- protected void populateItem(ListItem<PromptedField> item) {- PromptedField field = item.getModelObject();+ protected void populateItem(ListItem<IssueField> item) {+ IssueField field = item.getModelObject();item.add(new Label("name", field.getName()));item.add(new FieldValuesPanel("values") {@@ -545,7 +571,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}@Override- protected PromptedField getField() {+ protected IssueField getField() {return item.getModelObject();}@@ -561,15 +587,15 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexFragment fragment = new Fragment(id, "fieldEditFrag", IssueDetailPage.this);Form<?> form = new Form<Void>("form");- Serializable fieldBean = OneDev.getInstance(IssueFieldManager.class).readFields(getIssue());- Map<String, PromptedField> prevFields = getIssue().getPromptedFields();+ Serializable fieldBean = OneDev.getInstance(IssueFieldUnaryManager.class).readFields(getIssue());+ Map<String, IssueField> prevFields = getIssue().getEffectiveFields();Map<String, PropertyDescriptor> propertyDescriptors =new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();Set<String> excludedFields = new HashSet<>();for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {- if (!getIssue().getPromptedFields().containsKey(fieldSpec.getName()))+ if (!getIssue().getEffectiveFields().containsKey(fieldSpec.getName()))excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());}@@ -580,8 +606,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- OneDev.getInstance(IssueChangeManager.class).changeFields(- getIssue(), fieldBean, prevFields, getIssue().getPromptedFields().keySet());+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldBean, prevFields);modal.close();target.add(fieldsContainer);}@@ -873,8 +898,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn OneDev.getInstance(IssueChangeManager.class);}- private IssueFieldManager getIssueFieldManager() {- return OneDev.getInstance(IssueFieldManager.class);+ private IssueFieldUnaryManager getIssueFieldUnaryManager() {+ return OneDev.getInstance(IssueFieldUnaryManager.class);}private IssueManager getIssueManager() {@@ -908,8 +933,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}@Override- public InputSpec getInput(String inputName) {- return getProject().getIssueWorkflow().getInput(inputName);+ public InputSpec getInputSpec(String inputName) {+ return getProject().getIssueWorkflow().getInputSpec(inputName);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex b1fd28db08..0490eddedd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -55,7 +55,7 @@ import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.FieldsEditBean;-import io.onedev.server.model.support.issue.PromptedField;+import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.WatchStatus;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;@@ -205,7 +205,7 @@ public class IssueListPage extends ProjectPage {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- getProject().getIssueWorkflow().getQueries().put(bean.getName(), query);+ getProject().getIssueWorkflow().getSavedQueries().put(bean.getName(), query);OneDev.getInstance(ProjectManager.class).save(getProject());target.add(side);modal.close();@@ -249,7 +249,7 @@ public class IssueListPage extends ProjectPage {protected void onConfigure() {super.onConfigure();if (SecurityUtils.canManage(getProject())) {- setVisible(!getUserQueries().isEmpty() || !getProject().getIssueWorkflow().getQueries().isEmpty());+ setVisible(!getUserQueries().isEmpty() || !getProject().getIssueWorkflow().getSavedQueries().isEmpty());} else {setVisible(getLoginUser() != null && !getUserQueries().isEmpty());}@@ -284,7 +284,7 @@ public class IssueListPage extends ProjectPage {@Overrideprotected void onSave(AjaxRequestTarget target, LinkedHashMap<String, String> queries) {- getProject().getIssueWorkflow().setQueries(queries);+ getProject().getIssueWorkflow().setSavedQueries(queries);OneDev.getInstance(ProjectManager.class).save(getProject());target.add(side);modal.close();@@ -324,7 +324,7 @@ public class IssueListPage extends ProjectPage {fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));}- Map<String, String> projectQueries = getProject().getIssueWorkflow().getQueries();+ Map<String, String> projectQueries = getProject().getIssueWorkflow().getSavedQueries();if (SecurityUtils.canManage(getProject()) && !projectQueries.isEmpty()) {tabs.add(new AjaxActionTab(Model.of("For All Users")) {@@ -428,7 +428,7 @@ public class IssueListPage extends ProjectPage {@Overrideprotected List<NamedQuery> load() {List<NamedQuery> namedQueries = new ArrayList<>();- for (Map.Entry<String, String> entry: getProject().getIssueWorkflow().getQueries().entrySet()) {+ for (Map.Entry<String, String> entry: getProject().getIssueWorkflow().getSavedQueries().entrySet()) {try {if (getLoginUser() != null || !IssueQuery.parse(getProject(), entry.getValue()).needsLogin())namedQueries.add(new NamedQuery(entry.getKey(), entry.getValue()));@@ -749,8 +749,8 @@ public class IssueListPage extends ProjectPage {}@Override- protected PromptedField getField() {- return item.getModelObject().getPromptedFields().get(fieldName);+ protected IssueField getField() {+ return item.getModelObject().getEffectiveFields().get(fieldName);}}.add(AttributeAppender.append("title", fieldName)));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.javaindex 9f065ed28f..58f318546d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java@@ -124,15 +124,15 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {try {IssueQuery.checkField(project, fieldName, IssueQuery.getOperator(operatorName));- InputSpec field = project.getIssueWorkflow().getField(fieldName);- if (field instanceof DateInput || fieldName.equals(Issue.SUBMIT_DATE)+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec instanceof DateInput || fieldName.equals(Issue.SUBMIT_DATE)|| fieldName.equals(Issue.UPDATE_DATE)) {List<String> candidates = new ArrayList<>(DATE_EXAMPLES);candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));- } else if (fieldName.equals(Issue.SUBMITTER) || field instanceof UserChoiceInput) {+ } else if (fieldName.equals(Issue.SUBMITTER) || fieldSpec instanceof UserChoiceInput) {for (User user: OneDev.getInstance(UserManager.class).findAll()) {Range match = Range.match(user.getName(), unfencedLowerCaseMatchWith, true, false, true);if (match != null) {@@ -144,40 +144,40 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {suggestions.add(new InputSuggestion(user.getName(), description, match).escape("\"\\"));}}- } else if (field instanceof IssueChoiceInput) {+ } else if (fieldSpec instanceof IssueChoiceInput) {List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);for (Issue issue: issues) {InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);suggestions.add(suggestion);}- } else if (field instanceof BooleanInput) {+ } else if (fieldSpec instanceof BooleanInput) {suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));- } else if (field instanceof GroupChoiceInput) {+ } else if (fieldSpec instanceof GroupChoiceInput) {List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} else if (fieldName.equals(Issue.STATE)) {List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));- } else if (field instanceof ChoiceInput) {+ } else if (fieldSpec instanceof ChoiceInput) {OneContext.push(newOneContext());try {- List<String> candidates = new ArrayList<>(((ChoiceInput)field).getChoiceProvider().getChoices(true).keySet());+ List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} finally {OneContext.pop();}- } else if (field instanceof MultiChoiceInput) {+ } else if (fieldSpec instanceof MultiChoiceInput) {OneContext.push(newOneContext());try {- List<String> candidates = new ArrayList<>(((MultiChoiceInput)field).getChoiceProvider().getChoices(true).keySet());+ List<String> candidates = new ArrayList<>(((MultiChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} finally {OneContext.pop();}} else if (fieldName.equals(Issue.TITLE) || fieldName.equals(Issue.DESCRIPTION)|| fieldName.equals(Issue.VOTES) || fieldName.equals(Issue.COMMENTS)- || fieldName.equals(Issue.NUMBER) || field instanceof NumberInput- || field instanceof TextInput) {+ || fieldName.equals(Issue.NUMBER) || fieldSpec instanceof NumberInput+ || fieldSpec instanceof TextInput) {return null;}} catch (OneException ex) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/UndefinedFieldValueResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/UndefinedFieldValueResolution.javaindex 983d7c7187..125127c693 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/UndefinedFieldValueResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/UndefinedFieldValueResolution.java@@ -69,7 +69,7 @@ public class UndefinedFieldValueResolution implements Serializable {@SuppressWarnings("unused")private static List<String> getValueChoices() {UndefinedFieldValueContainer container = ((ComponentContext)OneContext.get()).getComponent().findParent(UndefinedFieldValueContainer.class);- InputSpec fieldSpec = Preconditions.checkNotNull(OneContext.get().getProject().getIssueWorkflow().getField(container.getFieldName()));+ InputSpec fieldSpec = Preconditions.checkNotNull(OneContext.get().getProject().getIssueWorkflow().getFieldSpec(container.getFieldName()));OneContext.push(new OneContext() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/WorkflowReconcilePanel.javaindex 93ff225dfb..d553907638 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/WorkflowReconcilePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/workflowreconcile/WorkflowReconcilePanel.java@@ -22,7 +22,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;@@ -55,8 +55,8 @@ public abstract class WorkflowReconcilePanel extends Panel {return OneDev.getInstance(IssueManager.class);}- private IssueFieldManager getIssueFieldManager() {- return OneDev.getInstance(IssueFieldManager.class);+ private IssueFieldUnaryManager getIssueFieldManager() {+ return OneDev.getInstance(IssueFieldUnaryManager.class);}private Component checkStates(String markupId) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javaindex 82c2b4a199..3b7cfcacbf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -17,15 +17,12 @@ import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;-import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.comment.CommentInput;@@ -51,8 +48,8 @@ public class NewIssuePage extends ProjectPage implements InputContext {return OneDev.getInstance(IssueManager.class);}- private IssueFieldManager getIssueFieldManager() {- return OneDev.getInstance(IssueFieldManager.class);+ private IssueFieldUnaryManager getIssueFieldManager() {+ return OneDev.getInstance(IssueFieldUnaryManager.class);}@Override@@ -61,7 +58,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {Issue issue = new Issue();issue.setSubmitDate(new Date());- issue.setState(getProject().getIssueWorkflow().getInitialState().getName());+ issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());issue.setProject(getProject());issue.setSubmitter(getLoginUser());Serializable fieldBean = getIssueFieldManager().readFields(issue);@@ -71,10 +68,9 @@ public class NewIssuePage extends ProjectPage implements InputContext {@Overrideprotected void onSubmit() {super.onSubmit();- StateSpec stateSpec = Preconditions.checkNotNull(getProject().getIssueWorkflow().getState(issue.getState()));issue.setProject(getProject());issue.setSubmitter(getLoginUser());- getIssueManager().open(issue, fieldBean, stateSpec.getFields());+ getIssueManager().open(issue, fieldBean);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));}@@ -109,7 +105,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {});Set<String> excludedFields = getIssueFieldManager().getExcludedFields(- getProject(), getProject().getIssueWorkflow().getInitialState().getName());+ getProject(), getProject().getIssueWorkflow().getInitialStateSpec().getName());form.add(BeanContext.editBean("fields", fieldBean, excludedFields));add(form);@@ -127,8 +123,8 @@ public class NewIssuePage extends ProjectPage implements InputContext {}@Override- public InputSpec getInput(String inputName) {- return getProject().getIssueWorkflow().getInput(inputName);+ public InputSpec getInputSpec(String inputName) {+ return getProject().getIssueWorkflow().getInputSpec(inputName);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.javaindex e7647fa759..7c20b42089 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java@@ -85,12 +85,12 @@ abstract class FieldEditPanel extends Panel implements InputContext {InputSpec field = bean.getField();if (fieldIndex != -1) {InputSpec oldField = getWorkflow().getFieldSpecs().get(fieldIndex);- if (!field.getName().equals(oldField.getName()) && getWorkflow().getField(field.getName()) != null) {+ if (!field.getName().equals(oldField.getName()) && getWorkflow().getFieldSpec(field.getName()) != null) {editor.getErrorContext(new PathSegment.Property("field")).getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another field");}- } else if (getWorkflow().getField(field.getName()) != null) {+ } else if (getWorkflow().getFieldSpec(field.getName()) != null) {editor.getErrorContext(new PathSegment.Property("field")).getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another field");@@ -154,8 +154,8 @@ abstract class FieldEditPanel extends Panel implements InputContext {}@Override- public InputSpec getInput(String inputName) {- return getWorkflow().getField(inputName);+ public InputSpec getInputSpec(String inputName) {+ return getWorkflow().getFieldSpec(inputName);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.javaindex 5b05f1f9ad..8f4c77507e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java@@ -26,6 +26,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.base.Preconditions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;@@ -161,7 +163,8 @@ public class IssueFieldsPage extends IssueWorkflowPage {public ColumnFragment(String id, IModel<InputSpec> model, String label, boolean nameColumn) {super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueFieldsPage.this, model);- this.index = getWorkflow().getFieldIndex(getField().getName());+ this.index = getWorkflow().getFieldSpecIndex(getField().getName());+ Preconditions.checkState(this.index != -1);this.label = label;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.javaindex 03901ad05b..036bed21bc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java@@ -27,6 +27,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.base.Preconditions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;@@ -91,7 +93,8 @@ public class IssueStatesPage extends IssueWorkflowPage {public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueStatesPage.this);StateSpec state = rowModel.getObject();- int index = getWorkflow().getStateIndex(state.getName());+ int index = getWorkflow().getStateSpecIndex(state.getName());+ Preconditions.checkState(index != -1);AjaxLink<Void> link = new AjaxLink<Void>("link") {@Override@@ -113,7 +116,8 @@ public class IssueStatesPage extends IssueWorkflowPage {public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStatesPage.this);StateSpec state = rowModel.getObject();- int index = getWorkflow().getStateIndex(state.getName());+ int index = getWorkflow().getStateSpecIndex(state.getName());+ Preconditions.checkState(index != -1);AjaxLink<Void> link = new AjaxLink<Void>("link") {@Override@@ -136,7 +140,8 @@ public class IssueStatesPage extends IssueWorkflowPage {public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStatesPage.this);StateSpec state = rowModel.getObject();- int index = getWorkflow().getStateIndex(state.getName());+ int index = getWorkflow().getStateSpecIndex(state.getName());+ Preconditions.checkState(index != -1);AjaxLink<Void> link = new AjaxLink<Void>("link") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.javaindex 917adb3f6f..2701a5ffb0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java@@ -81,11 +81,11 @@ abstract class StateEditPanel extends Panel {if (stateIndex != -1) {StateSpec oldState = getWorkflow().getStateSpecs().get(stateIndex);- if (!state.getName().equals(oldState.getName()) && getWorkflow().getState(state.getName()) != null) {+ if (!state.getName().equals(oldState.getName()) && getWorkflow().getStateSpec(state.getName()) != null) {editor.getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another state");}- } else if (getWorkflow().getState(state.getName()) != null) {+ } else if (getWorkflow().getStateSpec(state.getName()) != null) {editor.getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another state");}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.javaindex c08a9c1624..19102689fd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java@@ -27,6 +27,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.base.Preconditions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;@@ -111,10 +113,10 @@ public class StateTransitionsPage extends IssueWorkflowPage {@Overridepublic int compare(TransitionSpec transition1, TransitionSpec transition2) {- int fromStateIndex1 = getWorkflow().getStateIndex(transition1.getFromStates().get(0));- int fromStateIndex2 = getWorkflow().getStateIndex(transition2.getFromStates().get(0));- int toStateIndex1 = getWorkflow().getStateIndex(transition1.getToState());- int toStateIndex2 = getWorkflow().getStateIndex(transition2.getToState());+ int fromStateIndex1 = getWorkflow().getStateSpecIndex(transition1.getFromStates().get(0));+ int fromStateIndex2 = getWorkflow().getStateSpecIndex(transition2.getFromStates().get(0));+ int toStateIndex1 = getWorkflow().getStateSpecIndex(transition1.getToState());+ int toStateIndex2 = getWorkflow().getStateSpecIndex(transition2.getToState());if (fromStateIndex1 != fromStateIndex2)return fromStateIndex1 - fromStateIndex2;else@@ -162,18 +164,19 @@ public class StateTransitionsPage extends IssueWorkflowPage {private class ColumnFragment extends Fragment {- private final int transitionIndex;+ private final int index;private final String label;public ColumnFragment(String id, TransitionSpec transition, String label) {super(id, "columnFrag", StateTransitionsPage.this);- this.transitionIndex = getWorkflow().getTransitionIndex(transition);+ this.index = getWorkflow().getTransitionSpecIndex(transition);+ Preconditions.checkState(this.index != -1);this.label = label;}private TransitionSpec getTransition() {- return getWorkflow().getTransitionSpecs().get(transitionIndex);+ return getWorkflow().getTransitionSpecs().get(index);}@Override@@ -206,7 +209,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {sideFloating.close();- return new TransitionEditPanel(id, transitionIndex) {+ return new TransitionEditPanel(id, index) {@Overrideprotected void onSave(AjaxRequestTarget target) {@@ -238,7 +241,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getWorkflow().getStateSpecs().remove(transitionIndex);+ getWorkflow().getStateSpecs().remove(index);getProject().setIssueWorkflow(getWorkflow());OneDev.getInstance(ProjectManager.class).save(getProject());target.add(transitionsTable);diff --git a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java b/core/src/main/java/io/onedev/server/web/util/ComponentContext.javaindex efa218c253..63d02a91ed 100644--- a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java+++ b/core/src/main/java/io/onedev/server/web/util/ComponentContext.java@@ -3,6 +3,8 @@ package io.onedev.server.web.util;import org.apache.wicket.Component;import org.apache.wicket.Page;+import com.google.common.base.Preconditions;+import io.onedev.server.model.Project;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -33,7 +35,7 @@ public class ComponentContext extends OneContext {@Overridepublic InputContext getInputContext() {- return WicketUtils.findInnermost(component, InputContext.class);+ return Preconditions.checkNotNull(WicketUtils.findInnermost(component, InputContext.class));}public Component getComponent() {diff --git a/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex 69d38baf3d..8c50730cbb 100644--- a/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -30,7 +30,7 @@ import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.util.collections.UrlExternalFormComparator;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueFieldUnaryManager;/*** An abstract implementation of a {@link IClassResolver} which uses a {@link ClassLoader} for@@ -59,7 +59,7 @@ public abstract class AbstractClassResolver implements IClassResolver@Overridepublic final Class<?> resolveClass(final String className) throws ClassNotFoundException{- Class<?> clazz = OneDev.getInstance(IssueFieldManager.class).loadFieldBeanClass(className);+ Class<?> clazz = OneDev.getInstance(IssueFieldUnaryManager.class).loadFieldBeanClass(className);if (clazz != null)return clazz;