The Unified and Autonomous Development Platform
Enhance issue field show conditions.
Robin Shenc962e563bafa
diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.javaindex 21ff04793b..20ef888781 100644--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java@@ -25,6 +25,7 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment);void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,- @Nullable Optional<Milestone> milestone, Map<String, Object> fieldValues, @Nullable String comment);+ @Nullable Optional<Milestone> milestone, Map<String, Object> fieldValues,+ @Nullable String comment);}diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.javaindex d3dba804bb..9bb68d4e9d 100644--- a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java@@ -8,7 +8,7 @@ import io.onedev.server.persistence.dao.EntityManager;public interface IssueFieldUnaryManager extends EntityManager<IssueFieldUnary> {- void writeFields(Issue issue);+ void saveFields(Issue issue);void onRenameUser(String oldName, String newName);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 45fd53e5af..212c93049b 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@@ -127,11 +127,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Overridepublic void changeFields(Issue issue, Map<String, Object> fieldValues) {- Map<String, IssueField> prevFields = issue.getEffectiveFields();- for (Map.Entry<String, Object> entry: fieldValues.entrySet())- issue.setFieldValue(entry.getKey(), entry.getValue());- if (!prevFields.equals(issue.getEffectiveFields())) {- issueFieldUnaryManager.writeFields(issue);+ Map<String, IssueField> prevFields = issue.getFields();+ issue.setFieldValues(fieldValues);+ if (!prevFields.equals(issue.getFields())) {+ issueFieldUnaryManager.saveFields(issue);LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed fields");@@ -144,7 +143,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangechange.setIssue(issue);change.setDate(new Date());change.setUser(SecurityUtils.getUser());- change.setData(new FieldChangeData(prevFields, issue.getEffectiveFields()));+ change.setData(new FieldChangeData(prevFields, issue.getFields()));save(change);listenerRegistry.post(new IssueChanged(change));@@ -156,12 +155,12 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangepublic void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment) {String prevState = issue.getState();if (!prevState.equals(state)) {- Map<String, IssueField> prevFields = issue.getEffectiveFields();+ Map<String, IssueField> prevFields = issue.getFields();issue.setState(state);- for (Map.Entry<String, Object> entry: fieldValues.entrySet())- issue.setFieldValue(entry.getKey(), entry.getValue());++ issue.setFieldValues(fieldValues);- issueFieldUnaryManager.writeFields(issue);+ issueFieldUnaryManager.saveFields(issue);LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed state to \"" + issue.getState() + "\"");@@ -174,7 +173,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangechange.setIssue(issue);change.setDate(new Date());change.setUser(SecurityUtils.getUser());- change.setData(new StateChangeData(prevState, issue.getState(), prevFields, issue.getEffectiveFields(), comment));+ change.setData(new StateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));save(change);@@ -191,14 +190,14 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeIssue issue = issues.next();String prevState = issue.getState();Milestone prevMilestone = issue.getMilestone();- Map<String, IssueField> prevFields = issue.getEffectiveFields();+ Map<String, IssueField> prevFields = issue.getFields();if (state != null)issue.setState(state);if (milestone != null)issue.setMilestone(milestone.orNull());- for (Map.Entry<String, Object> entry: fieldValues.entrySet())- issue.setFieldValue(entry.getKey(), entry.getValue());- issueFieldUnaryManager.writeFields(issue);++ issue.setFieldValues(fieldValues);+ issueFieldUnaryManager.saveFields(issue);LastActivity lastActivity = new LastActivity();lastActivity.setAction("batch edited issue");@@ -211,7 +210,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangechange.setIssue(issue);change.setDate(new Date());change.setUser(SecurityUtils.getUser());- change.setData(new BatchChangeData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getEffectiveFields(), comment));+ change.setData(new BatchChangeData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getFields(), comment));save(change);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javaindex 39dae20516..ded566d909 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java@@ -32,7 +32,7 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi@Transactional@Override- public void writeFields(Issue issue) {+ public void saveFields(Issue issue) {Collection<Long> ids = new HashSet<>();for (IssueFieldUnary unary: issue.getFieldUnaries()) {if (unary.getId() != null)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 982799dd14..85fc46eeeb 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@@ -105,7 +105,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsissue.setNumber(getNextNumber(issue.getProject()));save(issue);- issueFieldUnaryManager.writeFields(issue);+ issueFieldUnaryManager.saveFields(issue);listenerRegistry.post(new IssueOpened(issue));}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 59d96ec4c2..e9706fb42b 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -5,12 +5,10 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.HashMap;-import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import java.util.UUID;import javax.annotation.Nullable;@@ -31,23 +29,20 @@ import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.exception.OneException;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.IssueField;-import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;@@ -70,8 +65,6 @@ public class Issue extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;- private static final Logger logger = LoggerFactory.getLogger(Issue.class);-public static final Map<String, String> BUILTIN_FIELDS = new LinkedHashMap<>();public static final String NUMBER = "Number";@@ -336,21 +329,17 @@ public class Issue extends AbstractEntity implements Referenceable {}}- public Map<String, IssueField> getEffectiveFields() {- Map<String, IssueField> effectiveFields = new LinkedHashMap<>();+ public Map<String, IssueField> getFields() {+ Map<String, IssueField> fields = new LinkedHashMap<>();- Collection<String> fieldNames = getProject().getIssueWorkflow().getApplicableFields(state);-Map<String, List<IssueFieldUnary>> unaryMap = new HashMap<>();for (IssueFieldUnary unary: getFieldUnaries()) {- if (fieldNames.contains(unary.getName())) {- List<IssueFieldUnary> fieldsOfName = unaryMap.get(unary.getName());- if (fieldsOfName == null) {- fieldsOfName = new ArrayList<>();- unaryMap.put(unary.getName(), fieldsOfName);- }- fieldsOfName.add(unary);+ List<IssueFieldUnary> fieldsOfName = unaryMap.get(unary.getName());+ if (fieldsOfName == null) {+ fieldsOfName = new ArrayList<>();+ unaryMap.put(unary.getName(), fieldsOfName);}+ fieldsOfName.add(unary);}for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {@@ -366,10 +355,10 @@ public class Issue extends AbstractEntity implements Referenceable {Collections.sort(values);if (!fieldSpec.isAllowMultiple() && values.size() > 1)values = Lists.newArrayList(values.iterator().next());- effectiveFields.put(fieldName, new IssueField(fieldName, type, values));+ fields.put(fieldName, new IssueField(fieldName, type, values));}}- return effectiveFields;+ return fields;}public static String getWebSocketObservable(Long issueId) {@@ -390,41 +379,14 @@ public class Issue extends AbstractEntity implements Referenceable {return getMilestone()!=null? getMilestone().getName():null;}- public Collection<String> getExcludedFields(Class<?> fieldBeanClass, String state) {- Map<String, PropertyDescriptor> propertyDescriptors =- new BeanDescriptor(fieldBeanClass).getMapOfDisplayNameToPropertyDescriptor();- StateSpec stateSpec = getProject().getIssueWorkflow().getStateSpec(state);- if (stateSpec == null)- throw new OneException("Unable to find state spec: " + state);- Set<String> excludedProperties = new HashSet<>();- for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {- if (!stateSpec.getFields().contains(fieldSpec.getName())- || getEffectiveFields().containsKey(fieldSpec.getName())) {- excludedProperties.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());- }- }- return excludedProperties;- }-@Nullablepublic Object getFieldValue(String fieldName) {- IssueField field = getEffectiveFields().get(fieldName);+ IssueField field = getFields().get(fieldName);- if (field != null) {- List<String> strings = field.getValues();- Collections.sort(strings);-- InputSpec fieldSpec = getProject().getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec != null) {- try {- if (!strings.isEmpty())- return fieldSpec.convertToObject(strings);- } catch (Exception e) {- logger.error("Error populating bean for field: " + fieldSpec.getName(), e);- }- }- }- return null;+ if (field != null)+ return field.getValue(getProject());+ else+ return null;}public long getFieldOrdinal(String fieldName, Object fieldValue) {@@ -435,21 +397,29 @@ public class Issue extends AbstractEntity implements Referenceable {return -1;}- public Serializable getFieldBean(Class<?> fieldBeanClass) {+ public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);-- Map<String, PropertyDescriptor> propertyDescriptors = beanDescriptor.getMapOfDisplayNameToPropertyDescriptor();-Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();- for (Map.Entry<String, IssueField> entry: getEffectiveFields().entrySet()) {- String fieldName = entry.getKey();- propertyDescriptors.get(fieldName).setPropertyValue(fieldBean, getFieldValue(fieldName));+ for (PropertyDescriptor property: beanDescriptor.getPropertyDescriptors()) {+ if (property.getDisplayName().equals(Issue.STATE)) {+ property.setPropertyValue(fieldBean, getState());+ } else {+ IssueField field = getFields().get(property.getDisplayName());+ if (field != null)+ property.setPropertyValue(fieldBean, field.getValue(getProject()));+ else if (!withDefaultValue)+ property.setPropertyValue(fieldBean, null);+ }}-return fieldBean;}+ public void setFieldValues(Map<String, Object> fieldValues) {+ for (Map.Entry<String, Object> entry: fieldValues.entrySet())+ setFieldValue(entry.getKey(), entry.getValue());+ }+public void setFieldValue(String fieldName, @Nullable Object fieldValue) {for (Iterator<IssueFieldUnary> it = getFieldUnaries().iterator(); it.hasNext();) {if (fieldName.equals(it.next().getName()))@@ -464,7 +434,7 @@ public class Issue extends AbstractEntity implements Referenceable {field.setIssue(this);field.setName(fieldName);field.setOrdinal(ordinal);- field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));+ field.setType(fieldSpec.getType());if (fieldValue != null) {List<String> strings = fieldSpec.convertToStrings(fieldValue);@@ -483,16 +453,38 @@ public class Issue extends AbstractEntity implements Referenceable {}}}-- public void setFieldBean(Serializable fieldBean, Collection<String> fieldNames) {- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- String fieldName = propertyDescriptor.getDisplayName();- if (fieldNames.contains(fieldName)) {- Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);- setFieldValue(fieldName, fieldValue);++ public boolean isFieldVisible(String fieldName, String state) {+ IssueWorkflow workflow = getProject().getIssueWorkflow();+ InputSpec fieldSpec = workflow.getFieldSpec(fieldName);+ if (fieldSpec != null) {+ if (fieldSpec.getShowConditions() != null) {+ for (ShowCondition condition: fieldSpec.getShowConditions()) {+ if (condition.getInputName().equals(Issue.STATE)) {+ if (!condition.getValueMatcher().matches(state))+ return false;+ } else {+ IssueField dependentField = getFields().get(condition.getInputName());+ if (dependentField != null) {+ String value;+ if (!dependentField.getValues().isEmpty())+ value = dependentField.getValues().iterator().next();+ else+ value = null;+ if (!condition.getValueMatcher().matches(value))+ return false;+ } else {+ return false;+ }+ }+ }+ return true;+ } else {+ return true;}+ } else {+ return false;}}-+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueField.javaindex 9309ea51c3..cbe6d448f6 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java@@ -1,22 +1,25 @@package io.onedev.server.model.support.issue;import java.io.Serializable;-import java.util.HashSet;import java.util.List;-import java.util.Set;++import javax.annotation.Nullable;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.thoughtworks.xstream.annotations.XStreamOmitField;-import io.onedev.server.model.Issue;-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;+import io.onedev.server.model.Project;import io.onedev.server.util.inputspec.InputSpec;public class IssueField implements Serializable {private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(IssueField.class);private final String name;@@ -67,41 +70,19 @@ public class IssueField implements Serializable {.append(getValues()).toHashCode();}-- public boolean isVisible(Issue issue) {- return isVisible(issue, new HashSet<>());- }-- private boolean isVisible(Issue issue, Set<String> checkedFieldNames) {- if (!checkedFieldNames.contains(getName())) {- checkedFieldNames.add(getName());-- IssueWorkflow workflow = issue.getProject().getIssueWorkflow();- InputSpec fieldSpec = workflow.getFieldSpec(getName());- if (fieldSpec != null) {- if (fieldSpec.getShowCondition() != null) {- IssueField dependentField = issue.getEffectiveFields().get(fieldSpec.getShowCondition().getInputName());- if (dependentField != null) {- if (!dependentField.isVisible(issue, 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;++ @Nullable+ public Object getValue(Project project) {+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);+ if (fieldSpec != null) {+ try {+ if (!getValues().isEmpty())+ return fieldSpec.convertToObject(getValues());+ } catch (Exception e) {+ logger.error("Error converting field values to object: " + name, e);}- } else {- return false;}+ return null;}}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 769b98e0a0..519d0b5ad5 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,7 +2,6 @@ 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;@@ -15,6 +14,7 @@ import javax.annotation.Nullable;import com.google.common.collect.Lists;import io.onedev.server.exception.OneException;+import io.onedev.server.model.Issue;import io.onedev.server.model.support.authorized.ProjectWriters;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQueryLexer;@@ -141,24 +141,44 @@ public class IssueWorkflow implements Serializable {specifiedDefaultValue = new SpecifiedDefaultValue();specifiedDefaultValue.setValue("Fixed");resolution.setDefaultValueProvider(specifiedDefaultValue);++ List<ShowCondition> showConditions = new ArrayList<>();+ ShowCondition showCondition = new ShowCondition();+ showCondition.setInputName("State");+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf.setValues(Lists.newArrayList("Closed"));+ showCondition.setValueMatcher(valueIsOneOf);+ showConditions.add(showCondition);+ resolution.setShowConditions(showConditions);fieldSpecs.add(resolution);IssueChoiceInput duplicateIssue = new IssueChoiceInput();duplicateIssue.setName("Duplicate With");- ShowCondition showCondition = new ShowCondition();++ showConditions = new ArrayList<>();+ showCondition = new ShowCondition();+ showCondition.setInputName("State");+ valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf.setValues(Lists.newArrayList("Closed"));+ showCondition.setValueMatcher(valueIsOneOf);+ showConditions.add(showCondition);++ showCondition = new ShowCondition();showCondition.setInputName("Resolution");- ValueIsOneOf valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf = new ValueIsOneOf();valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));showCondition.setValueMatcher(valueIsOneOf);- duplicateIssue.setShowCondition(showCondition);+ showConditions.add(showCondition);++ duplicateIssue.setShowConditions(showConditions);+fieldSpecs.add(duplicateIssue);StateSpec open = new StateSpec();open.setName("Open");open.setCategory(StateSpec.Category.OPEN);open.setColor("#f0ad4e");- open.setFields(Lists.newArrayList("Type", "Priority", "Assignee"));stateSpecs.add(open);@@ -166,7 +186,6 @@ public class IssueWorkflow implements Serializable {closed.setColor("#5cb85c");closed.setName("Closed");closed.setCategory(StateSpec.Category.CLOSED);- closed.setFields(Lists.newArrayList("Resolution", "Duplicate With"));stateSpecs.add(closed);@@ -287,7 +306,10 @@ public class IssueWorkflow implements Serializable {@Nullablepublic InputSpec getFieldSpec(String fieldName) {- return getFieldSpecMap().get(fieldName);+ if (fieldName.equals(Issue.STATE))+ return getFieldSpecOfState();+ else+ return getFieldSpecMap().get(fieldName);}public int getFieldSpecIndex(String fieldName) {@@ -299,8 +321,6 @@ public class IssueWorkflow implements Serializable {}public void onRenameField(String oldName, String newName) {- for (StateSpec state: getStateSpecs())- state.onFieldRename(oldName, newName);for (TransitionSpec transition: getTransitionSpecs())transition.onFieldRename(oldName, newName);for (InputSpec field: getFieldSpecs())@@ -308,8 +328,6 @@ public class IssueWorkflow implements Serializable {}public void onDeleteField(String fieldName) {- for (StateSpec state: getStateSpecs())- state.onFieldDelete(fieldName);for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {if (it.next().onFieldDelete(fieldName))it.remove();@@ -386,14 +404,21 @@ public class IssueWorkflow implements Serializable {throw new OneException("No any issue state is defined");}- public Collection<String> getApplicableFields(String state) {- int index = getStateSpecIndex(state);- Collection<String> applicableFields = new HashSet<>();- for (int i=0; i<=index; i++)- applicableFields.addAll(getStateSpecs().get(i).getFields());- return applicableFields;+ public InputSpec getFieldSpecOfState() {+ ChoiceInput inputSpec = new ChoiceInput();+ inputSpec.setName(Issue.STATE);+ inputSpec.setAllowEmpty(false);+ SpecifiedChoices choicesProvider = new SpecifiedChoices();+ for (StateSpec stateSpec: getStateSpecs()) {+ Choice choice = new Choice();+ choice.setValue(stateSpec.getName());+ choice.setColor(stateSpec.getColor());+ choicesProvider.getChoices().add(choice);+ }+ inputSpec.setChoiceProvider(choicesProvider);+ return inputSpec;}-+public IssueCriteria getCategoryCriteria(StateSpec.Category category) {List<IssueCriteria> criterias = new ArrayList<>();for (StateSpec state: getStateSpecs()) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.javaindex 06b3fec148..3f69087ee1 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java@@ -1,22 +1,15 @@package io.onedev.server.model.support.issue.workflow;import java.io.Serializable;-import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;-import io.onedev.server.web.util.WicketUtils;@Editablepublic class StateSpec implements Serializable {@@ -33,8 +26,6 @@ public class StateSpec implements Serializable {private String color = "#777777";- private List<String> fields = new ArrayList<>();-@Editable(order=100)@NotEmptypublic String getName() {@@ -77,39 +68,4 @@ public class StateSpec implements Serializable {this.color = color;}- @Editable(order=500, name="Required Fields", description="Select issue fields required by this state. "- + "Required fields will be prompted when issue transits to this state")- @ChoiceProvider("getFieldChoices")- @NameOfEmptyValue("No required fields")- public List<String> getFields() {- return fields;- }-- public void setFields(List<String> fields) {- this.fields = fields;- }-- @SuppressWarnings("unused")- private static List<String> getFieldChoices() {- List<String> fields = new ArrayList<>();- IssueStatesPage page = (IssueStatesPage) WicketUtils.getPage();- for (InputSpec field: page.getWorkflow().getFieldSpecs())- fields.add(field.getName());- return fields;- }-- public void onFieldRename(String oldName, String newName) {- for (int i=0; i<getFields().size(); i++) {- if (getFields().get(i).equals(oldName))- getFields().set(i, newName);- }- }-- public void onFieldDelete(String fieldName) {- for (Iterator<String> it = getFields().iterator(); it.hasNext();) {- if (it.next().equals(fieldName))- it.remove();- }- }-}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.javaindex 5c9aeb16e1..e33c933a2c 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java@@ -173,7 +173,7 @@ public class TransitionSpec implements Serializable {if (getPrerequisite() == null) {return true;} else {- IssueField field = issue.getEffectiveFields().get(getPrerequisite().getInputName());+ IssueField field = issue.getFields().get(getPrerequisite().getInputName());List<String> fieldValues;if (field != null)fieldValues = field.getValues();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 9c40441a9e..d7d0122d84 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -1,7 +1,9 @@package io.onedev.server.util.inputspec;import java.io.Serializable;+import java.util.ArrayList;import java.util.HashMap;+import java.util.Iterator;import java.util.List;import java.util.Map;@@ -19,9 +21,12 @@ import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.validation.annotation.InputName;+import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.page.project.setting.issueworkflow.fields.ShowConditionListWrapper;+import io.onedev.server.web.page.project.setting.issueworkflow.fields.ShowConditionOuterWrapper;@Editablepublic abstract class InputSpec implements Serializable {@@ -58,7 +63,10 @@ public abstract class InputSpec implements Serializable {private String nameOfEmptyValue;- private ShowCondition showCondition;+ private List<ShowCondition> showConditions;++ // Added to edit/view show conditions in a user-friendly way+ private transient ShowConditionListWrapper showConditionListWrapper;@Editable(order=10)@InputName@@ -91,14 +99,22 @@ public abstract class InputSpec implements Serializable {this.allowMultiple = allowMultiple;}+ public List<ShowCondition> getShowConditions() {+ return showConditions;+ }++ public void setShowConditions(List<ShowCondition> showConditions) {+ this.showConditions = showConditions;+ }+@Editable(order=40, name="Show Conditionally", description="resource.input.showCondition")@NameOfEmptyValue("Always")- public ShowCondition getShowCondition() {- return showCondition;+ public ShowConditionListWrapper getShowConditionListWrapper() {+ return showConditionListWrapper;}- public void setShowCondition(ShowCondition showCondition) {- this.showCondition = showCondition;+ public void setShowConditionListWrapper(ShowConditionListWrapper showConditionListWrapper) {+ this.showConditionListWrapper = showConditionListWrapper;}@Editable(order=50, name="Allow Empty Value", description="resource.input.allowEmpty")@@ -138,7 +154,7 @@ public abstract class InputSpec implements Serializable {return escaped;}- public abstract String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue);+ public abstract String getPropertyDef(Map<String, Integer> indexes);protected String getLiteral(byte[] bytes) {StringBuffer buffer = new StringBuffer("[");@@ -166,7 +182,7 @@ public abstract class InputSpec implements Serializable {buffer.append(" @Editable(name=\"" + escape(name) +"\", order=" + index + ")\n");}- if (showCondition != null)+ if (showConditions != null)buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");if (getNameOfEmptyValue() != null)buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");@@ -192,10 +208,14 @@ public abstract class InputSpec implements Serializable {buffer.append(" }\n");buffer.append("\n");- if (showCondition != null) {+ if (showConditions != null) {buffer.append(" private static boolean isInput" + index + "Visible() {\n");- literalBytes = getLiteral(SerializationUtils.serialize(showCondition));- buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");+ literalBytes = getLiteral(SerializationUtils.serialize((Serializable) showConditions));+ buffer.append(" for (condition in SerializationUtils.deserialize(" + literalBytes + ")) {\n");+ buffer.append(" if (!condition.isVisible())\n");+ buffer.append(" return false;\n");+ buffer.append(" }\n");+ buffer.append(" return true;\n");buffer.append(" }\n");buffer.append("\n");}@@ -212,17 +232,52 @@ public abstract class InputSpec implements Serializable {buffer.append("\n");}}++ public void setupShowConditionsForDisplay() {+ if (showConditions != null) {+ showConditionListWrapper = new ShowConditionListWrapper();+ for (ShowCondition condition: showConditions) {+ ShowConditionOuterWrapper outerWrapper = new ShowConditionOuterWrapper();+ outerWrapper.getInnerWrapper().setCondition(condition);+ showConditionListWrapper.getOuterWrappers().add(outerWrapper);+ }+ } else {+ showConditionListWrapper = null;+ }+ }++ public void setupShowConditionsForStorage() {+ if (showConditionListWrapper != null) {+ showConditions = new ArrayList<>();+ for (ShowConditionOuterWrapper outerWrapper: showConditionListWrapper.getOuterWrappers())+ showConditions.add(outerWrapper.getInnerWrapper().getCondition());+ } else {+ showConditions = null;+ }+ }public void onRenameInput(String oldName, String newName) {- if (showCondition != null && oldName.equals(showCondition.getInputName()))- showCondition.setInputName(newName);+ if (showConditions != null) {+ for (ShowCondition condition: showConditions) {+ if (oldName.equals(condition.getInputName()))+ condition.setInputName(newName);+ }+ }}public boolean onDeleteInput(String inputName) {- return showCondition != null && inputName.equals(showCondition.getInputName());+ if (showConditions != null) {+ for (Iterator<ShowCondition> it = showConditions.iterator(); it.hasNext();) {+ if (inputName.equals(it.next().getInputName()))+ it.remove();+ }+ if (showConditions.isEmpty())+ showConditions = null;+ }+ return false;}- public static Class<?> defineClass(String className, List<InputSpec> inputs, boolean setDefaultValue) {+ public static Class<?> defineClass(String className, List<InputSpec> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");buffer.append("import com.google.common.base.Optional;\n");@@ -244,7 +299,7 @@ public abstract class InputSpec implements Serializable {for (InputSpec input: inputs)indexes.put(input.getName(), index++);for (InputSpec input: inputs)- buffer.append(input.getPropertyDef(indexes, setDefaultValue));+ buffer.append(input.getPropertyDef(indexes));buffer.append("}\n");buffer.append("return " + className + ";\n");@@ -286,4 +341,8 @@ public abstract class InputSpec implements Serializable {return -1;}+ public String getType() {+ return EditableUtils.getDisplayName(getClass());+ }+}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javaindex 9f5521d888..3f1f0a90fb 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java@@ -47,14 +47,14 @@ public class BooleanInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "Boolean");appendCommonAnnotations(buffer, index);buffer.append(" @NotNull\n");- appendMethods(buffer, index, "Boolean", null, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "Boolean", null, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javaindex a2ab9050f6..70cb5fc0fd 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java@@ -82,7 +82,7 @@ public class ChoiceInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, isAllowMultiple()? "List<String>": "String");@@ -96,9 +96,9 @@ public class ChoiceInput extends InputSpec {appendChoiceProvider(buffer, index, "@ChoiceProvider");if (isAllowMultiple())- appendMethods(buffer, index, "List<String>", choiceProvider, setDefaultValue?defaultMultiValueProvider:null);+ appendMethods(buffer, index, "List<String>", choiceProvider, defaultMultiValueProvider);else- appendMethods(buffer, index, "String", choiceProvider, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.javaindex 4a19310546..e9c09f7504 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java@@ -8,7 +8,7 @@ import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-@Editable+@Editable(name="Value")public class Choice implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex 47de7ad5ce..ecebc56472 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -25,7 +25,7 @@ public class ScriptingChoices extends ChoiceProvider {@Editable(description="Groovy script to be evaluated. The return value should be a value to color map, "+ "for instance:<br>"+ "<code>return [\"Successful\":\"#00ff00\", \"Failed\":\"#ff0000\"]</code>, "- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ + "Use <tt>null</tt> if the value does not have a color. Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")@NotEmpty@Script@OmitNamediff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javaindex e7d6eac752..21b0a67cc1 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java@@ -32,14 +32,14 @@ public class DateInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "Date");appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotNull\n");- appendMethods(buffer, index, "Date", null, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "Date", null, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javaindex fe03fbabc9..d5336e87a9 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -58,7 +58,7 @@ public class GroupChoiceInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "String");@@ -66,7 +66,7 @@ public class GroupChoiceInput extends InputSpec {if (!isAllowEmpty())buffer.append(" @NotEmpty\n");appendChoiceProvider(buffer, index, "@GroupChoice");- appendMethods(buffer, index, "String", choiceProvider, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.javaindex 7154e6d238..4a1ae154c2 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java@@ -13,7 +13,7 @@ public class IssueChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "Long");diff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javaindex 33464a47d5..4a090b81d8 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java@@ -50,7 +50,7 @@ public class NumberInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "Integer");@@ -66,7 +66,7 @@ public class NumberInput extends InputSpec {} else if (maxValue != null) {buffer.append(" @Range(max=" + maxValue.toString() + "L)\n");}- appendMethods(buffer, index, "Integer", null, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "Integer", null, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.javaindex 28d4e9f1cd..e4d92aee6f 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java@@ -33,7 +33,7 @@ public class PasswordInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "String");@@ -41,7 +41,7 @@ public class PasswordInput extends InputSpec {if (!isAllowEmpty())buffer.append(" @NotEmpty\n");buffer.append(" @Password\n");- appendMethods(buffer, index, "String", null, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "String", null, defaultValueProvider);return buffer.toString();}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 df3cadf6b0..94acc530f8 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@@ -10,6 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.server.exception.OneException;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -27,9 +28,10 @@ public class ShowCondition implements Serializable {private ValueMatcher valueMatcher = new ValueIsOneOf();- @Editable(order=100, name="resource.input.whenInput")+ @Editable(order=100, name="resource.input.input")@ChoiceProvider("getNameChoices")@NotEmpty+ @OmitNamepublic String getInputName() {return inputName;}@@ -65,7 +67,7 @@ public class ShowCondition implements Serializable {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");+ throw new OneException("Show condition should not be based on a multi-value input");} else {return getValueMatcher().matches(null);}diff --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 636d16f0aa..069ed67fdc 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@@ -38,7 +38,7 @@ public class ValueIsOneOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {- // Access on-screen value of ShowCondition.fiedName+ // Access on-screen value of ShowCondition.inputNameString inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");if (inputName != null) {InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.javaindex 546104a6b4..fb91966d98 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java@@ -6,7 +6,7 @@ import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface ValueMatcher extends Serializable {-+boolean matches(String value);}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javaindex b4c56dfac4..2f2dad1a7e 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java@@ -56,7 +56,7 @@ public class TextInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "String");@@ -67,7 +67,7 @@ public class TextInput extends InputSpec {buffer.append(" @Multiline\n");if (getPattern() != null)buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");- appendMethods(buffer, index, "String", null, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "String", null, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 0a64bc8c1a..3ee82c2b45 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -59,7 +59,7 @@ public class UserChoiceInput extends InputSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes, boolean setDefaultValue) {+ public String getPropertyDef(Map<String, Integer> indexes) {int index = indexes.get(getName());StringBuffer buffer = new StringBuffer();appendField(buffer, index, "String");@@ -67,7 +67,7 @@ public class UserChoiceInput extends InputSpec {if (!isAllowEmpty())buffer.append(" @NotEmpty\n");appendChoiceProvider(buffer, index, "@UserChoice");- appendMethods(buffer, index, "String", choiceProvider, setDefaultValue?defaultValueProvider:null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.htmlindex 277402f536..6a0b798348 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.html@@ -10,13 +10,6 @@<label class="control-label">Fields to Change</label><div class="checkboxes clearfix"><div wicket:id="feedback"></div>- <div class="pull-left">- <div class="checkbox">- <label>- <input wicket:id="stateCheck" type="checkbox"> State- </label>- </div>- </div><div class="pull-left"><div class="checkbox"><label>diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex 3d5c41cfa2..eb2ca21f11 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -7,6 +7,8 @@ import java.util.List;import java.util.Map;import java.util.Set;+import javax.annotation.Nullable;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -32,6 +34,7 @@ import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.RunTaskBehavior;@@ -39,7 +42,6 @@ import io.onedev.server.web.component.comment.CommentInput;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.util.IssueFieldBeanUtils;import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;@@ -68,12 +70,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- for (PropertyContext<?> propertyContext: builtInFieldsEditor.getPropertyContexts())- propertyContext.setPropertyExcluded(!selectedFields.contains(propertyContext.getDisplayName()));for (PropertyDescriptor propertyDescriptor: builtInFieldsEditor.getBeanDescriptor().getPropertyDescriptors())propertyDescriptor.setPropertyExcluded(!selectedFields.contains(propertyDescriptor.getDisplayName()));- for (PropertyContext<?> propertyContext: customFieldsEditor.getPropertyContexts())- propertyContext.setPropertyExcluded(!selectedFields.contains(propertyContext.getDisplayName()));for (PropertyDescriptor propertyDescriptor: customFieldsEditor.getBeanDescriptor().getPropertyDescriptors())propertyDescriptor.setPropertyExcluded(!selectedFields.contains(propertyDescriptor.getDisplayName()));target.add(form);@@ -93,27 +91,6 @@ abstract class BatchEditPanel extends Panel implements InputContext {form.add(new NotificationPanel("feedback", form));- form.add(new CheckBox("stateCheck", new IModel<Boolean>() {-- @Override- public void detach() {- }-- @Override- public Boolean getObject() {- return selectedFields.contains(Issue.STATE);- }-- @Override- public void setObject(Boolean object) {- if (object)- selectedFields.add(Issue.STATE);- else- selectedFields.remove(Issue.STATE);- }-- }).add(newOnChangeBehavior(form)));-form.add(new CheckBox("milestoneCheck", new IModel<Boolean>() {@Override@@ -135,7 +112,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {}).add(newOnChangeBehavior(form)));- form.add(new ListView<String>("customFields", getProject().getIssueWorkflow().getFieldNames()) {+ List<String> customFieldNames = Lists.newArrayList(Issue.STATE);+ customFieldNames.addAll(getProject().getIssueWorkflow().getFieldNames());+ form.add(new ListView<String>("customFields", customFieldNames) {@Overrideprotected void populateItem(ListItem<String> item) {@@ -165,15 +144,23 @@ abstract class BatchEditPanel extends Panel implements InputContext {});builtInFieldsBean = new BuiltInFieldsBean();- try {- customFieldsBean = IssueFieldBeanUtils.defineBeanClass(getProject(), false).newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);+ Class<? extends Serializable> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());+ Issue issue = new Issue();+ issue.setProject(getProject());+ if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {+ getIssueQuery().getCriteria().fill(issue);+ builtInFieldsBean.setMilestone(issue.getMilestoneName());+ customFieldsBean = issue.getFieldBean(fieldBeanClass, false);+ } else {+ try {+ customFieldsBean = fieldBeanClass.newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ IssueFieldBeanUtils.clearFields(customFieldsBean);}-+Set<String> excludedProperties = new HashSet<>();- if (!selectedFields.contains(Issue.STATE))- excludedProperties.add(Issue.BUILTIN_FIELDS.get(Issue.STATE));if (!selectedFields.contains(Issue.MILESTONE))excludedProperties.add(Issue.BUILTIN_FIELDS.get(Issue.MILESTONE));@@ -219,20 +206,16 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {- String state;- if (selectedFields.contains(Issue.STATE))- state = builtInFieldsBean.getState();- else- state = null;Optional<Milestone> milestone;if (selectedFields.contains(Issue.MILESTONE))milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));elsemilestone = null;- Set<String> fieldNames = new HashSet<>(selectedFields);- fieldNames.remove(Issue.STATE);- fieldNames.remove(Issue.MILESTONE);- Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(customFieldsBean, fieldNames);+ String state = (String) IssueFieldBeanUtils.getFieldValue(customFieldsBean, Issue.STATE);++ Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(customFieldsBean);+ fieldValues.keySet().retainAll(selectedFields);+OneDev.getInstance(IssueChangeManager.class).batchUpdate(getIssueIterator(), state, milestone, fieldValues, comment);onUpdated(target);@@ -298,6 +281,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {protected abstract Project getProject();+ @Nullable+ protected abstract IssueQuery getIssueQuery();+protected abstract Iterator<? extends Issue> getIssueIterator();protected abstract int getIssueCount();diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.javaindex 1fc6d5bc32..da1c3fa911 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BuiltInFieldsBean.java@@ -4,8 +4,6 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -16,21 +14,8 @@ public class BuiltInFieldsBean implements Serializable {private static final long serialVersionUID = 1L;- private String state;-private String milestone;- @Editable(order=100)- @ChoiceProvider("getStateChoices")- @NotEmpty- public String getState() {- return state;- }-- public void setState(String state) {- this.state = state;- }-@Editable(order=200)@ChoiceProvider("getMilestoneChoices")@NameOfEmptyValue("No milestone")@@ -42,11 +27,6 @@ public class BuiltInFieldsBean implements Serializable {this.milestone = milestone;}- @SuppressWarnings("unused")- private static List<String> getStateChoices() {- return OneContext.get().getProject().getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());- }-@SuppressWarnings("unused")private static List<String> getMilestoneChoices() {return OneContext.get().getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 01585ee6c6..eed23f0d72 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -311,6 +311,11 @@ public abstract class IssueListPanel extends GenericPanel<String> {return selectionColumn.getSelections().size();}+ @Override+ protected IssueQuery getIssueQuery() {+ return parsedQueryModel.getObject();+ }+};}@@ -356,6 +361,11 @@ public abstract class IssueListPanel extends GenericPanel<String> {return (int) issuesTable.getItemCount();}+ @Override+ protected IssueQuery getIssueQuery() {+ return parsedQueryModel.getObject();+ }+};}@@ -570,7 +580,11 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected IssueField getField() {- return rowModel.getObject().getEffectiveFields().get(field);+ Issue issue = rowModel.getObject();+ if (issue.isFieldVisible(field, issue.getState()))+ return issue.getFields().get(field);+ else+ return null;}}.setRenderBodyOnly(true));diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javaindex 4b932057a6..265ae25e2e 100644--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -18,6 +18,8 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.collect.Sets;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.query.IssueCriteria;@@ -51,15 +53,10 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementprotected void onInitialize() {super.onInitialize();- Issue issue = new Issue();- issue.setProject(getProject());-- if (getTemplate() != null)- getTemplate().fill(issue);-- Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject(), true);- Serializable fieldBean = issue.getFieldBean(fieldBeanClass);+ Issue issue = newIssue();+ Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());+ Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);titleInput = new TextField<String>("title", Model.of(""));titleInput.setRequired(true).setLabel(Model.of("Title"));add(titleInput);@@ -102,10 +99,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementmilestoneChoice.setRequired(false);add(milestoneChoice);- Collection<String> excludedFields = issue.getExcludedFields(fieldBean.getClass(),- getProject().getIssueWorkflow().getInitialStateSpec().getName());- add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedFields)- .renderForEdit("fields", Model.of(fieldBean)));+ Collection<String> excludedProperties = IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(Issue.STATE));+ add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedProperties).renderForEdit("fields", Model.of(fieldBean)));}protected abstract Project getProject();@@ -123,7 +118,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement@Overridepublic List<String> getInputNames() {- return getProject().getIssueWorkflow().getFieldNames();+ throw new UnsupportedOperationException();}@Override@@ -142,6 +137,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setSubmitDate(new Date());issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());issue.setSubmitter(SecurityUtils.getUser());+ if (getTemplate() != null)+ getTemplate().fill(issue);return issue;}@@ -152,8 +149,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setTitle(titleInput.getConvertedInput());issue.setDescription(descriptionInput.getConvertedInput());issue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));- issue.setFieldBean(fieldEditor.getConvertedInput(),- getProject().getIssueWorkflow().getInitialStateSpec().getFields());++ issue.setFieldValues(IssueFieldBeanUtils.getFieldValues(fieldEditor.getConvertedInput()));setConvertedInput(issue);} catch (ConversionException e) {error(newValidationError(e));diff --git a/core/src/main/java/io/onedev/server/web/component/select2/Settings.java b/core/src/main/java/io/onedev/server/web/component/select2/Settings.javaindex bfb17aaebb..59e28f7559 100644--- a/core/src/main/java/io/onedev/server/web/component/select2/Settings.java+++ b/core/src/main/java/io/onedev/server/web/component/select2/Settings.java@@ -15,11 +15,11 @@ package io.onedev.server.web.component.select2;import java.io.Serializable;import java.lang.reflect.Method;+import org.apache.wicket.Component;import org.json.JSONException;import org.json.JSONStringer;import io.onedev.server.web.component.select2.json.Json;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.OmitName;@@ -404,11 +404,11 @@ public final class Settings implements Serializable {this.dropdownAutoWidth = dropdownAutoWidth;}- public void configurePlaceholder(PropertyDescriptor propertyDescriptor) {+ public void configurePlaceholder(PropertyDescriptor propertyDescriptor, Component component) {if (propertyDescriptor.isPropertyRequired()) {Method getter = propertyDescriptor.getPropertyGetter();if (getter.getAnnotation(OmitName.class) != null)- setPlaceholder("Select " + EditableUtils.getDisplayName(getter).toLowerCase() + "...");+ setPlaceholder("Select " + propertyDescriptor.getDisplayName(component).toLowerCase() + "...");} else if (propertyDescriptor.getNameOfEmptyValue() != null) {setPlaceholder(propertyDescriptor.getNameOfEmptyValue());}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex a709e297da..e15d7359c1 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -81,7 +81,7 @@ public class BeanEditor extends ValueEditor<Serializable> {if (directDependencies.contains(dependencyPropertyName))return true;for (String directDependency: directDependencies) {- if (hasTransitiveDependency(directDependency, dependencyPropertyName, checkedPropertyNames))+ if (hasTransitiveDependency(directDependency, dependencyPropertyName, new HashSet<>(checkedPropertyNames)))return true;}return false;@@ -229,16 +229,15 @@ public class BeanEditor extends ValueEditor<Serializable> {*/String propertyName = beanDescriptor.getPropertyName(name);propertyContext.getDescriptor().getDependencyPropertyNames().add(propertyName);-+Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {@Overridepublic void component(PropertyEditor<?> object, IVisit<Optional<Object>> visit) {- if (object.getDescriptor().getPropertyName().equals(propertyName)) {+ if (object.getDescriptor().getPropertyName().equals(propertyName))visit.stop(Optional.ofNullable(object.getConvertedInput()));- } else {+ elsevisit.dontGoDeeper();- }}});@@ -251,8 +250,8 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(propertyContext.getDescriptor().isPropertyVisible(new ComponentContext(this), beanDescriptor)- && !propertyContext.getDescriptor().isPropertyExcluded());+ setVisible(!propertyContext.getDescriptor().isPropertyExcluded()+ && propertyContext.getDescriptor().isPropertyVisible(new ComponentContext(this), beanDescriptor));}};@@ -338,16 +337,6 @@ public class BeanEditor extends ValueEditor<Serializable> {return propertyContexts;}- public OneContext getOneContext(String propertyName) {- for (Component item: propertiesView) {- int propertyIndex = (int) item.getDefaultModelObject();- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);- if (propertyContext.getPropertyName().equals(propertyName))- return new ComponentContext(item);- }- throw new RuntimeException("Property not found: " + propertyName);- }-@Overridepublic ErrorContext getErrorContext(PathSegment pathSegment) {final PathSegment.Property property = (Property) pathSegment;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 fe547d0737..56b56054d2 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@@ -124,25 +124,10 @@ public class PropertyDescriptor implements Serializable {}public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor) {- return isPropertyVisible(oneContext, beanDescriptor, new HashSet<>());- }-- private boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {- if (checkedPropertyNames.contains(getPropertyName()))- return false;- checkedPropertyNames.add(getPropertyName());-OneContext.push(oneContext);try {ShowCondition showCondition = getPropertyGetter().getAnnotation(ShowCondition.class);- if (showCondition != null && !(boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value()))- return false;- for (String propertyName: getDependencyPropertyNames()) {- PropertyDescriptor propertyDescriptor = beanDescriptor.getPropertyDescriptor(propertyName);- if (!propertyDescriptor.isPropertyVisible(oneContext, beanDescriptor, checkedPropertyNames))- return false;- }- return true;+ return showCondition == null || (boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value());} finally {OneContext.pop();}diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex a8180520e0..5bf5466e80 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -21,7 +21,7 @@</tbody><tfoot><tr class="add-element">- <td wicket:id="newRow" class="add-element"><a wicket:id="addElement" title="Add new element" class="btn btn-default"><span class="fa fa-plus-circle add"></span> Add Item</a></td>+ <td wicket:id="newRow" class="add-element"><a wicket:id="addElement" class="btn btn-default"><span class="fa fa-plus-circle add"></span> <span wicket:id="label"></span></a></td></tr></tfoot></table>diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 96ce836d6b..6c066b82b4 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -114,7 +114,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {@Overrideprotected void populateItem(ListItem<PropertyContext<Serializable>> item) {item.add(new Label("header", EditableUtils.getDisplayName(item.getModelObject().getPropertyGetter())));- item.add(AttributeAppender.append("class", " " + item.getModelObject().getPropertyName()));+ item.add(AttributeAppender.append("class", "property-" + item.getModelObject().getPropertyName()));String required;if (item.getModelObject().isPropertyRequired() && item.getModelObject().getPropertyClass() != boolean.class)@@ -142,6 +142,12 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {newRow.add(AttributeModifier.append("colspan", propertyContexts.size() + 1));newRow.add(new AjaxButton("addElement") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", "Add " + EditableUtils.getDisplayName(elementClass)));+ }+@SuppressWarnings("deprecation")@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {@@ -217,7 +223,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {for (PropertyContext<Serializable> propertyContext: propertyContexts) {WebMarkupContainer column = new WebMarkupContainer(columns.newChildId());- column.add(AttributeAppender.append("class", " " + propertyContext.getPropertyName()));+ column.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));columns.add(column);Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(element);@@ -228,6 +234,12 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {row.add(new AjaxButton("deleteElement") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.replace("title", "Delete this " + EditableUtils.getDisplayName(elementClass).toLowerCase()));+ }+@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 0e72c6e3b0..288f9021b8 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -53,7 +53,7 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 1418b97030..1bfcd2af1f 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -44,7 +44,7 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex bdbfc76b02..27ec5e584a 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -53,9 +53,8 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {Preconditions.checkNotNull(choiceProvider);Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());if (result instanceof List) {- for (String each: (List<String>)result) {+ for (String each: (List<String>)result)choices.put(each, each);- }} else {choices.putAll(((Map)result));}@@ -80,7 +79,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};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 079965b1d3..31661d4574 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@@ -44,15 +44,15 @@ public class SingleChoiceEditor extends PropertyEditor<String> {OneContext.push(oneContext);try {+ getDescriptor().getDependencyPropertyNames().clear();io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =descriptor.getPropertyGetter().getAnnotation(io.onedev.server.web.editable.annotation.ChoiceProvider.class);Preconditions.checkNotNull(choiceProvider);Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());if (result instanceof List) {- for (String each: (List<String>)result) {+ for (String each: (List<String>)result)choices.put(each, each);- }} else {choices.putAll(((Map)result));}@@ -67,7 +67,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 0bb36226a1..ba4bc580d8 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -56,7 +56,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 05080ebb5b..b90a321668 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -59,7 +59,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex f6c8696b8b..55fc1ab70e 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -76,7 +76,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 31ea32b766..b44473e948 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -76,7 +76,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javaindex 65856f2fb4..3d706789d0 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java@@ -56,7 +56,7 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.htmlindex 67f477234f..5aa12f4ec2 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html@@ -10,7 +10,7 @@</tbody><tfoot><tr class="add-element">- <td colspan="3"><a wicket:id="addElement" title="Add new element" class="btn btn-default"><span class="fa fa-plus-circle add"></span> Add Item</a></td>+ <td colspan="3"><a wicket:id="addElement" class="btn btn-default"><span class="fa fa-plus-circle add"></span> <span wicket:id="label"></span></a></td></tr></tfoot></table>diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex 9ff39e2db4..59ade2d18a 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -17,6 +17,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Fragment;@@ -45,6 +46,8 @@ import io.onedev.utils.ClassUtils;@SuppressWarnings("serial")public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializable>> {+ private final Class<?> baseClass;+private final List<Class<?>> implementations;private final boolean horizontal;@@ -53,7 +56,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializasuper(id, propertyDescriptor, model);implementations = new ArrayList<>();- Class<?> baseClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());+ baseClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());Preconditions.checkNotNull(baseClass);ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);@@ -143,6 +146,12 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializatable.add(new AjaxButton("addElement") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", "Add " + EditableUtils.getDisplayName(baseClass)));+ }+@SuppressWarnings("deprecation")@Overridepublic void onSubmit(AjaxRequestTarget target, Form<?> form) {@@ -229,6 +238,9 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializafor (Class<?> each: implementations)implementationNames.add(getDisplayName(each));+ Component elementEditor = newElementEditor(element);+ row.add(elementEditor);+row.add(new DropDownChoice<String>("elementTypeSelector", new IModel<String>() {@Override@@ -272,13 +284,16 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa}));- Component elementEditor = newElementEditor(element);- row.add(elementEditor);-row.add(new FencedFeedbackPanel("feedback", elementEditor));row.add(new AjaxButton("deleteElement") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.replace("title", "Delete this " + EditableUtils.getDisplayName(baseClass).toLowerCase()));+ }+@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 1c09a41c5c..7c6ee251f1 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -77,7 +77,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 54751cc042..198b5535b7 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -77,7 +77,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected void onInitialize() {super.onInitialize();- getSettings().configurePlaceholder(descriptor);+ getSettings().configurePlaceholder(descriptor, this);}};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 f77c1bf947..ca27692fd7 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@@ -116,7 +116,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {@Overridepublic Object getInputValue(String name) {- IssueField field = getIssue().getEffectiveFields().get(name);+ IssueField field = getIssue().getFields().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());diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.javaindex dc3e008f33..2b8dfb3c71 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java@@ -60,7 +60,7 @@ class BoardCardPanel extends GenericPanel<Issue> {}));RepeatingView avatarsView = new RepeatingView("avatars");- for (IssueField field: getIssue().getEffectiveFields().values()) {+ for (IssueField field: getIssue().getFields().values()) {if (field.getType().equals(InputSpec.USER_CHOICE) && !field.getValues().isEmpty()) {User user = OneDev.getInstance(UserManager.class).findByName(field.getValues().iterator().next());diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex 6b638467e3..a1b44a0ef1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -1,7 +1,9 @@package io.onedev.server.web.page.project.issues.issueboards;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;+import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Objects;@@ -26,7 +28,6 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.exception.OneException;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.UserManager;@@ -43,7 +44,6 @@ import io.onedev.server.model.support.issue.query.IssueQueryLexer;import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.model.support.issue.query.StateCriteria;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.EditContext;@@ -319,6 +319,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();Long issueId = params.getParameterValue("issue").toLong();Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);+ String fieldName = getBoard().getIdentifyField();if (issue.getMilestone() == null && getMilestone() != null) {// move a backlog issue to boardif (!SecurityUtils.canModify(issue))@@ -327,11 +328,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone());markAccepted(target, issue, true);checkMatched(target, issue);- } else if (getBoard().getIdentifyField().equals(Issue.STATE)) {+ } else if (fieldName.equals(Issue.STATE)) {IssueWorkflow workflow = getProject().getIssueWorkflow();boolean canTransiteIssue = false;for (TransitionSpec transition: workflow.getTransitionSpecs()) {- if (transition.canApplyTo(issue)) {+ if (transition.canApplyTo(issue) && transition.getToState().equals(getColumn())) {canTransiteIssue = true;break;}@@ -339,10 +340,14 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (!canTransiteIssue)throw new UnauthorizedException("Permission denied");- StateSpec stateSpec = workflow.getStateSpec(getColumn());- if (stateSpec == null)- throw new OneException("Unable to find state spec: " + getColumn());- if (!issue.getEffectiveFields().keySet().containsAll(stateSpec.getFields())) {+ Collection<String> fieldNames = workflow.getFieldNames();+ for (Iterator<String> it = fieldNames.iterator(); it.hasNext();) {+ String each = it.next();+ if (issue.isFieldVisible(each, issue.getState()) || !issue.isFieldVisible(each, getColumn()))+ it.remove();+ }++ if (!fieldNames.isEmpty()) {new ModalPanel(target) {@Override@@ -384,8 +389,9 @@ abstract class BoardColumnPanel extends Panel implements EditContext {} else {if (!SecurityUtils.canModify(issue))throw new UnauthorizedException("Permission denied");+Map<String, Object> fieldValues = new HashMap<>();- fieldValues.put(getBoard().getIdentifyField(), getColumn());+ fieldValues.put(fieldName, getColumn());OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);markAccepted(target, issue, true);checkMatched(target, issue);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex acec7d75d0..7f316cfc2e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -22,6 +22,7 @@ import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;+import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.avatar.AvatarLink;@@ -52,12 +53,13 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {add(new Label("title", getIssue().getTitle()));+ IssueWorkflow workflow = getIssue().getProject().getIssueWorkflow();List<String> fieldNames = Lists.newArrayList(Issue.STATE);fieldNames.add(Issue.SUBMITTER);fieldNames.add(Issue.SUBMIT_DATE);- for (IssueField field: getIssue().getEffectiveFields().values()) {- if (field.isVisible(getIssue()))- fieldNames.add(field.getName());+ for (String fieldName: workflow.getFieldNames()) {+ if (getIssue().isFieldVisible(fieldName, getIssue().getState()))+ fieldNames.add(fieldName);}fieldNames.add(Issue.MILESTONE);fieldNames.add(Issue.COMMENTS);@@ -130,7 +132,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {@Overrideprotected IssueField getField() {- return getIssue().getEffectiveFields().get(fieldName);+ return getIssue().getFields().get(fieldName);}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.javaindex ddbfc80191..f0fbda7390 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java@@ -13,15 +13,14 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.exception.OneException;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.model.Issue;-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.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.util.IssueFieldBeanUtils;+import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")abstract class StateTransitionPanel extends Panel implements InputContext {@@ -34,9 +33,14 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onInitialize() {super.onInitialize();- Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getIssue().getProject(), true);- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);- Collection<String> excludedFields = getIssue().getExcludedFields(fieldBeanClass, getTargetState());+ Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getIssue().getProject());+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);+ IssueFieldBeanUtils.setState(fieldBean, getTargetState());+ Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ for (String fieldName: getIssue().getProject().getIssueWorkflow().getFieldNames()) {+ if (getIssue().isFieldVisible(fieldName, getIssue().getState()))+ excludedFields.add(fieldName);+ }Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);@@ -44,7 +48,8 @@ abstract class StateTransitionPanel extends Panel implements InputContext {form.add(new Label("state", getTargetState()));- BeanEditor editor = BeanContext.editBean("editor", fieldBean, excludedFields);+ BeanEditor editor = BeanContext.editBean("editor", fieldBean,+ IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, excludedFields));form.add(editor);form.add(new AjaxButton("ok") {@@ -52,10 +57,8 @@ abstract class StateTransitionPanel extends Panel implements InputContext {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- StateSpec toStateSpec = getIssue().getProject().getIssueWorkflow().getStateSpec(getTargetState());- if (toStateSpec == null)- throw new OneException("Unable to find state spec: " + getTargetState());- Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean, toStateSpec.getFields());++ Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean);OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(), getTargetState(), fieldValues, null);onSaved(target);}@@ -90,7 +93,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {- return getIssue().getProject().getIssueWorkflow().getFieldNames();+ throw new UnsupportedOperationException();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.cssindex d629013c74..49b3c6433b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css@@ -147,7 +147,7 @@#issue-boards>.body .card .head>.avatars {margin-right: 0;}-#issue-boards>.body .card .avatrs>.avatar {+#issue-boards>.body .card .avatars>.avatar {margin-right: 4px;}#issue-boards>.body .card .avatars>.avatar:last-child {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 e487c94621..1755ca69b0 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@@ -6,10 +6,8 @@ import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;-import java.util.HashSet;import java.util.List;import java.util.Map;-import java.util.Set;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -49,10 +47,10 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.exception.OneException;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;@@ -68,7 +66,6 @@ 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;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;@@ -92,9 +89,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.userlist.UserListLink;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.PropertyDescriptor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;@@ -259,9 +254,15 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onClick(AjaxRequestTarget target) {Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);- Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject(), true);- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);- Collection<String> excludedFields = getIssue().getExcludedFields(fieldBeanClass, transition.getToState());+ Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);+ IssueFieldBeanUtils.setState(fieldBean, transition.getToState());++ Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ for (String fieldName: getProject().getIssueWorkflow().getFieldNames()) {+ if (getIssue().isFieldVisible(fieldName, getIssue().getState()))+ excludedFields.add(fieldName);+ }Form<?> form = new Form<Void>("form") {@@ -273,7 +274,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex};- BeanEditor editor = BeanContext.editBean("fields", fieldBean, excludedFields);+ BeanEditor editor = BeanContext.editBean("fields", fieldBean,+ IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, excludedFields));form.add(editor);form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {@@ -301,10 +303,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- StateSpec toStateSpec = getProject().getIssueWorkflow().getStateSpec(transition.getToState());- if (toStateSpec == null)- throw new OneException("Unable to find state spec: " + transition.getToState());- Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean, toStateSpec.getFields());+ Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean);getIssueChangeManager().changeState(getIssue(), transition.getToState(), fieldValues, comment);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));@@ -338,7 +337,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexList<String> criterias = new ArrayList<>();if (getIssue().getMilestone() != null)criterias.add(IssueQuery.quote(Issue.MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));- for (Map.Entry<String, IssueField> entry: getIssue().getEffectiveFields().entrySet()) {+ for (Map.Entry<String, IssueField> entry: getIssue().getFields().entrySet()) {List<String> strings = entry.getValue().getValues();if (strings.isEmpty()) {criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");@@ -522,30 +521,31 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}private Component newFieldsContainer() {+ IModel<List<IssueField>> fieldsModel = new LoadableDetachableModel<List<IssueField>>() {++ @Override+ protected List<IssueField> load() {+ List<IssueField> fields = new ArrayList<>();+ for (IssueField field: getIssue().getFields().values()) {+ if (getIssue().isFieldVisible(field.getName(), getIssue().getState()))+ fields.add(field);+ }+ return fields;+ }++ };WebMarkupContainer fieldsContainer = new WebMarkupContainer("fields") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getIssue().getEffectiveFields().isEmpty());+ setVisible(!fieldsModel.getObject().isEmpty());}};fieldsContainer.setOutputMarkupId(true);- fieldsContainer.add(new ListView<IssueField>("fields", new LoadableDetachableModel<List<IssueField>>() {-- @Override- protected List<IssueField> load() {- List<IssueField> fields = new ArrayList<>();- for (IssueField field: getIssue().getEffectiveFields().values()) {- if (field.isVisible(getIssue()))- fields.add(field);- }- return fields;- }-- }) {+ fieldsContainer.add(new ListView<IssueField>("fields", fieldsModel) {@Overrideprotected void populateItem(ListItem<IssueField> item) {@@ -575,28 +575,19 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexFragment fragment = new Fragment(id, "fieldEditFrag", IssueDetailPage.this);Form<?> form = new Form<Void>("form");- Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject(), true);- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);+ Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);- Map<String, PropertyDescriptor> propertyDescriptors =- new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();-- Set<String> excludedFields = new HashSet<>();- for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {- if (!getIssue().getEffectiveFields().containsKey(fieldSpec.getName()))- excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());- }-- form.add(BeanContext.editBean("editor", fieldBean, excludedFields));+ Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ form.add(BeanContext.editBean("editor", fieldBean, IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, excludedFields)));form.add(new AjaxButton("save") {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);-- Collection<String> fieldNames = getIssue().getFieldUnaries().stream().map(it->it.getName()).collect(Collectors.toSet());- Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean, fieldNames);++ Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(fieldBean);OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);modal.close();target.add(fieldsContainer);@@ -1039,7 +1030,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic List<String> getInputNames() {- return getProject().getIssueWorkflow().getFieldNames();+ throw new UnsupportedOperationException();}@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 7c20b42089..518bf40142 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@@ -46,8 +46,10 @@ abstract class FieldEditPanel extends Panel implements InputContext {super.onInitialize();FieldBean bean = new FieldBean();- if (fieldIndex != -1)+ if (fieldIndex != -1) {bean.setField(SerializationUtils.clone(getWorkflow().getFieldSpecs().get(fieldIndex)));+ bean.getField().setupShowConditionsForDisplay();+ }Form<?> form = new Form<Void>("form") {@@ -97,6 +99,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {}if (!editor.hasErrors(true)) {+ bean.getField().setupShowConditionsForStorage();if (fieldIndex != -1) {InputSpec oldField = getWorkflow().getFieldSpecs().get(fieldIndex);if (!field.getName().equals(oldField.getName()))@@ -144,6 +147,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {List<String> inputNames = new ArrayList<>();+ inputNames.add(Issue.STATE);int currentIndex = 0;for (InputSpec field: getWorkflow().getFieldSpecs()) {if (currentIndex != fieldIndex)diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.htmlindex 4002ba5598..4509ef5696 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html@@ -6,9 +6,6 @@</div></div><table wicket:id="issueFields" class="table table-hover"></table>- <div class="help-block">- <b><i class="fa fa-lightbulb-o"></i> Tips:</b> Fields defined here will not take effect unless they are required by specific issue state- </div></div><wicket:fragment wicket:id="nameColumnFrag"><span class="drag-handle fa fa-arrows" title="Drag to reorder fields"></span>diff --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 dfea47f004..12899c1aff 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@@ -179,13 +179,14 @@ public class IssueFieldsPage extends IssueWorkflowPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", "issue-field"));+ add(AttributeAppender.append("class", "field-view"));}@Overrideprotected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldsPage.this);+ getField().setupShowConditionsForDisplay();fragment.add(BeanContext.viewBean("viewer", getField(), Sets.newHashSet("name")));fragment.add(new ModalLink("edit") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.properties b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.propertiesindex a104f35fd1..45b3dddd15 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.properties+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.properties@@ -1,6 +1,5 @@-resource.input.dependOnOtherInput=Depend on other field-resource.input.whenInput=When field+resource.input.input=Fieldresource.input.description=Optionally describes the custom field-resource.input.showCondition=Enable if visibility of this field depends on another field+resource.input.showCondition=Enable if visibility of this field depends on other fieldsresource.input.allowEmpty=Whether or not this field accepts empty valueresource.input.allowMultiple=Whether or not multiple values can be specified for this field\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.javanew file mode 100644index 0000000000..7ba52cc7e3--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionInnerWrapper.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.setting.issueworkflow.fields;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.util.inputspec.showcondition.ShowCondition;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ShowConditionInnerWrapper implements Serializable {++ private static final long serialVersionUID = 1L;++ private ShowCondition condition;++ @Editable(name="And")+ @NotNull+ public ShowCondition getCondition() {+ return condition;+ }++ public void setCondition(ShowCondition condition) {+ this.condition = condition;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.javanew file mode 100644index 0000000000..3d92d2e620--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionListWrapper.java@@ -0,0 +1,30 @@+package io.onedev.server.web.page.project.setting.issueworkflow.fields;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.validation.constraints.Size;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable+public class ShowConditionListWrapper implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<ShowConditionOuterWrapper> outerWrappers = new ArrayList<>();++ @Editable+ @Size(min=1, message="At least one condition needs to be specified")+ @OmitName+ public List<ShowConditionOuterWrapper> getOuterWrappers() {+ return outerWrappers;+ }++ public void setOuterWrappers(List<ShowConditionOuterWrapper> outerWrappers) {+ this.outerWrappers = outerWrappers;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.javanew file mode 100644index 0000000000..5415e33730--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/ShowConditionOuterWrapper.java@@ -0,0 +1,26 @@+package io.onedev.server.web.page.project.setting.issueworkflow.fields;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.web.editable.annotation.Editable;++@Editable(name="Condition")+public class ShowConditionOuterWrapper implements Serializable {++ private static final long serialVersionUID = 1L;++ private ShowConditionInnerWrapper innerWrapper = new ShowConditionInnerWrapper();++ @Editable+ @NotNull+ public ShowConditionInnerWrapper getInnerWrapper() {+ return innerWrapper;+ }++ public void setInnerWrapper(ShowConditionInnerWrapper innerWrapper) {+ this.innerWrapper = innerWrapper;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.cssindex 6a483bf806..5ae17d31f7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css@@ -26,24 +26,57 @@margin-left: 16px;}-.floating.issue-field {+.floating.field-view {width: 600px;}-.floating.issue-field .actions {+.floating.field-view .actions {margin-bottom: 12px;}-.floating.issue-field .property-showCondition .property-inputName td.name,-.floating.issue-field .property-choicesProvider .property-inputName td.name,-.floating.issue-field .property-choicesOfOtherValues td.name,-.floating.issue-field .property-defaultValueProvider .property-inputName td.name,-.floating.issue-field .property-defaultValueOfOtherValues td.name {+.floating.field-view .property-showCondition .property-inputName td.name,+.floating.field-view .property-choicesProvider .property-inputName td.name,+.floating.field-view .property-defaultValueProvider .property-inputName td.name {border-right: none;text-align: left;}-.fieldspec-edit .property-choicesProvider>.value label.name,-.fieldspec-edit .property-choicesProvider>.value .bean.list thead th,+.field-edit .property-choicesProvider>.value label.name,+.field-edit .property-choicesProvider>.value .bean.list thead th,.property-nameOfEmptyValue .control-label {font-weight: normal;}++.property-outerWrappers table>thead,+.field-edit .property-outerWrappers>div>table>tbody>tr:first-child .name,+.field-view .property-outerWrappers>td>div>div>table>tbody>tr:first-child .name,+.field-edit .property-outerWrappers .required,+.field-edit .property-outerWrappers .handle {+ display: none;+}++.field-view .property-outerWrappers table td {+ border: none !important;+ display: block;+ padding-top: 0 !important;+ padding-left: 0 !important;+}+.field-view .property-outerWrappers .property-inputName td {+ padding-bottom: 8px !important;+}+.field-view .property-outerWrappers table td.name {+ text-align: left !important;+ padding: 8px 0 !important;+}+.field-view .property-condition td {+ padding-bottom: 0 !important;+}+.property-innerWrapper .bean.editor {+ border-top: none !important;+ padding-top: 0 !important;+ margin-bottom: 0 !important;+}+.property-innerWrapper .property-condition,+.property-innerWrapper .property-valueMatcher,+.property-innerWrapper .property-values {+ margin-bottom: 0 !important;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.javaindex 8b24aca879..92d89a89ac 100644--- a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java@@ -3,49 +3,89 @@ package io.onedev.server.web.util;import java.io.Serializable;import java.util.Collection;import java.util.HashMap;+import java.util.HashSet;+import java.util.List;import java.util.Map;import javax.annotation.Nullable;+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;import io.onedev.server.manager.ProjectManager;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.utils.StringUtils;public class IssueFieldBeanUtils {private static final String BEAN_PREFIX = "IssueFieldBean";- public static Map<String, Object> getFieldValues(Serializable fieldBean, Collection<String> fieldNames) {- Map<String, Object> fieldValues = new HashMap<>();- for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors()) {- if (fieldNames.contains(property.getDisplayName()))- fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));- }- return fieldValues;+ public static void clearFields(Serializable fieldBean) {+ for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors())+ property.setPropertyValue(fieldBean, null);}@SuppressWarnings("unchecked")- public static Class<? extends Serializable> defineBeanClass(Project project, boolean setDefaultValue) {- String className = BEAN_PREFIX + "_" + setDefaultValue + "_" + project.getId();- return (Class<? extends Serializable>) InputSpec.defineClass(className,- project.getIssueWorkflow().getFieldSpecs(), setDefaultValue);+ public static Class<? extends Serializable> defineBeanClass(Project project) {+ String className = BEAN_PREFIX + project.getId();+ IssueWorkflow workflow = project.getIssueWorkflow();+ List<InputSpec> fieldSpecs = Lists.newArrayList(workflow.getFieldSpecOfState());+ fieldSpecs.addAll(workflow.getFieldSpecs());+ return (Class<? extends Serializable>) InputSpec.defineClass(className, fieldSpecs);}@Nullablepublic static Class<? extends Serializable> loadBeanClass(String className) {if (className.startsWith(BEAN_PREFIX)) {- String tempStr = className.substring(BEAN_PREFIX.length()+1);- boolean setDefaultValue = Boolean.parseBoolean(StringUtils.substringBefore(tempStr, "_"));- Long projectId = Long.parseLong(StringUtils.substringAfter(tempStr, "_"));+ Long projectId = Long.parseLong(className.substring(BEAN_PREFIX.length()));Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- return defineBeanClass(project, setDefaultValue);+ return defineBeanClass(project);} else {return null;}}+ public static void setState(Serializable fieldBean, String state) {+ setFieldValue(fieldBean, Issue.STATE, state);+ }++ @Nullable+ public static Object getFieldValue(Serializable fieldBean, String fieldName) {+ for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors()) {+ if (fieldName.equals(property.getDisplayName()))+ return property.getPropertyValue(fieldBean);+ }+ throw new OneException("Unable to find property for field: " + fieldName);+ }++ public static void setFieldValue(Serializable fieldBean, String fieldName, Object fieldValue) {+ for (PropertyDescriptor property: new BeanDescriptor(fieldBean.getClass()).getPropertyDescriptors()) {+ if (property.getDisplayName().equals(fieldName))+ property.setPropertyValue(fieldBean, fieldValue);+ }+ }++ public static Collection<String> getPropertyNames(Class<?> fieldBeanClass, Collection<String> fieldNames) {+ Collection<String> propertyNames = new HashSet<>();+ for (PropertyDescriptor property: new BeanDescriptor(fieldBeanClass).getPropertyDescriptors()) {+ if (fieldNames.contains(property.getDisplayName()))+ propertyNames.add(property.getPropertyName());+ }+ return propertyNames;+ }++ public static Map<String, Object> getFieldValues(Serializable fieldBean) {+ Map<String, Object> fieldValues = new HashMap<>();+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());+ for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors())+ fieldValues.put(propertyDescriptor.getDisplayName(), propertyDescriptor.getPropertyValue(fieldBean));++ return fieldValues;+ }+}