The Unified and Autonomous Development Platform
fix issue #23: Able to specify multiple builds for custom issue type of "Build"
Robin Shen57a16ce6d205
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.javaindex 8f582be0a5..2e08a98d7a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java@@ -16,26 +16,20 @@ public class BuildChoiceParam extends ParamSpec {return BuildChoiceInput.getPropertyDef(this, indexes);}- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-@Overridepublic Object convertToObject(List<String> strings) {- return BuildChoiceInput.convertToObject(strings);+ return BuildChoiceInput.convertToObject(this, strings);}@Overridepublic List<String> convertToStrings(Object value) {- return BuildChoiceInput.convertToStrings(value);+ return BuildChoiceInput.convertToStrings(this, value);}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.javaindex aef63418a6..b7ea9cc21d 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java@@ -94,7 +94,7 @@ public class ChoiceParam extends ParamSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null) {List<String> choices = new ArrayList<>(getChoiceProvider().getChoices(true).keySet());return choices.indexOf(fieldValue);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.javaindex 50a3088918..0d41962c27 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java@@ -1,11 +1,11 @@package io.onedev.server.buildspec.job.paramspec;-import java.util.Date;import java.util.List;import java.util.Map;import javax.validation.Valid;+import io.onedev.server.util.Constants;import io.onedev.server.util.inputspec.dateinput.DateInput;import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -51,9 +51,9 @@ public class DateParam extends ParamSpec {}@Override- public long getOrdinal(Object fieldValue) {- if (fieldValue instanceof Date)- return ((Date)fieldValue).getTime();+ public long getOrdinal(String fieldValue) {+ if (fieldValue != null)+ return Constants.DATE_FORMATTER.parseDateTime(fieldValue).toDate().getTime();elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.javaindex aa50c4fee2..085b2e937f 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java@@ -33,9 +33,9 @@ public class IssueChoiceParam extends ParamSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.javaindex 505651b916..ef66114a38 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java@@ -72,9 +72,9 @@ public class NumberParam extends ParamSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Integer)fieldValue;+ return Integer.parseInt(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.javaindex 210825e813..457f64157a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java@@ -33,9 +33,9 @@ public class PullRequestChoiceParam extends ParamSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.javaindex 695bb675d9..f693935f93 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.java@@ -16,26 +16,20 @@ public class BuildChoiceField extends FieldSpec {return BuildChoiceInput.getPropertyDef(this, indexes);}- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-@Overridepublic Object convertToObject(List<String> strings) {- return BuildChoiceInput.convertToObject(strings);+ return BuildChoiceInput.convertToObject(this, strings);}@Overridepublic List<String> convertToStrings(Object value) {- return BuildChoiceInput.convertToStrings(value);+ return BuildChoiceInput.convertToStrings(this, value);}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.javaindex 4914f998f4..20486c6c78 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.java@@ -94,7 +94,7 @@ public class ChoiceField extends FieldSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null) {List<String> choices = new ArrayList<>(getChoiceProvider().getChoices(true).keySet());return choices.indexOf(fieldValue);diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.javaindex ac946bb72b..447c06d279 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.java@@ -1,11 +1,11 @@package io.onedev.server.issue.fieldspec;-import java.util.Date;import java.util.List;import java.util.Map;import javax.validation.Valid;+import io.onedev.server.util.Constants;import io.onedev.server.util.inputspec.dateinput.DateInput;import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -51,9 +51,9 @@ public class DateField extends FieldSpec {}@Override- public long getOrdinal(Object fieldValue) {- if (fieldValue instanceof Date)- return ((Date)fieldValue).getTime();+ public long getOrdinal(String fieldValue) {+ if (fieldValue != null)+ return Constants.DATE_FORMATTER.parseDateTime(fieldValue).toDate().getTime();elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.javaindex 645817f152..305883997a 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.java@@ -33,9 +33,9 @@ public class IssueChoiceField extends FieldSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.valueOf(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.javaindex 4e6efbf659..40abd5da2c 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.java@@ -72,9 +72,9 @@ public class NumberField extends FieldSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Integer)fieldValue;+ return Integer.parseInt(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.javaindex 774d56b495..f97f21548a 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.java@@ -33,9 +33,9 @@ public class PullRequestChoiceField extends FieldSpec {}@Override- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {if (fieldValue != null)- return (Long) fieldValue;+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 334dcbd4f0..4e4447d60f 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -331,20 +331,26 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStString fieldName = fieldSpec.getName();List<IssueField> fields = fieldMap.get(fieldName);if (fields != null) {+ Collections.sort(fields, new Comparator<IssueField>() {++ @Override+ public int compare(IssueField o1, IssueField o2) {+ long result = o1.getOrdinal() - o2.getOrdinal();+ if (result > 0)+ return 1;+ else if (result < 0)+ return -1;+ else+ return 0;+ }++ });String type = fields.iterator().next().getType();List<String> values = new ArrayList<>();for (IssueField field: fields) {if (field.getValue() != null)values.add(field.getValue());}- Collections.sort(values, new Comparator<String>() {-- @Override- public int compare(String o1, String o2) {- return (int) (fieldSpec.getOrdinal(o1) - fieldSpec.getOrdinal(o2));- }-- });if (!fieldSpec.isAllowMultiple() && values.size() > 1)values = Lists.newArrayList(values.iterator().next());fieldInputs.put(fieldName, new Input(fieldName, type, values));@@ -377,7 +383,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn OneDev.getInstance(SettingManager.class).getIssueSetting();}- public long getFieldOrdinal(String fieldName, Object fieldValue) {+ public long getFieldOrdinal(String fieldName, String fieldValue) {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec != null)@@ -424,15 +430,13 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStFieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec != null) {- long ordinal = getFieldOrdinal(fieldName, fieldValue);-List<String> strings = fieldSpec.convertToStrings(fieldValue);if (!strings.isEmpty()) {for (String string: strings) {IssueField field = new IssueField();field.setIssue(this);field.setName(fieldName);- field.setOrdinal(ordinal);+ field.setOrdinal(getFieldOrdinal(fieldName, string));field.setType(fieldSpec.getType());field.setValue(string);getFields().add(field);@@ -441,7 +445,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStIssueField field = new IssueField();field.setIssue(this);field.setName(fieldName);- field.setOrdinal(ordinal);+ field.setOrdinal(getFieldOrdinal(fieldName, null));field.setType(fieldSpec.getType());getFields().add(field);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 20b20f8624..a293a37670 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -62,9 +62,9 @@ public class ChoiceFieldCriteria extends FieldCriteria {else if (operator == IssueQueryLexer.Is)return Objects.equals(fieldValue, value);else if (operator == IssueQueryLexer.IsGreaterThan)- return issue.getFieldOrdinal(getFieldName(), fieldValue) > ordinal;+ return issue.getFieldOrdinal(getFieldName(), (String)fieldValue) > ordinal;else- return issue.getFieldOrdinal(getFieldName(), fieldValue) < ordinal;+ return issue.getFieldOrdinal(getFieldName(), (String)fieldValue) < ordinal;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.javaindex 13441806c2..bc12b2689d 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java@@ -3,6 +3,7 @@ package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;import java.util.Map;+import java.util.stream.Collectors;import javax.validation.ValidationException;@@ -15,31 +16,38 @@ public class BuildChoiceInput {StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "Long");inputSpec.appendCommonAnnotations(buffer, index);- if (!inputSpec.isAllowEmpty())- buffer.append(" @NotNull\n");+ if (!inputSpec.isAllowEmpty()) {+ if (inputSpec.isAllowMultiple())+ buffer.append(" @Size(min=1, message=\"At least one option needs to be selected\")\n");+ else+ buffer.append(" @NotNull\n");+ }buffer.append(" @BuildChoice\n");- inputSpec.appendMethods(buffer, index, "Long", null, null);+ if (inputSpec.isAllowMultiple())+ inputSpec.appendMethods(buffer, index, "List<Long>", null, null);+ else+ inputSpec.appendMethods(buffer, index, "Long", null, null);return buffer.toString();}- public static Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- String value = strings.iterator().next();- try {- return Long.valueOf(value);- } catch (NumberFormatException e) {- throw new ValidationException("Invalid build number");- }- } else {- throw new ValidationException("Not eligible for multi-value");+ public static Object convertToObject(InputSpec inputSpec, List<String> strings) {+ try {+ if (inputSpec.isAllowMultiple())+ return strings.stream().map(it->Long.valueOf(it)).collect(Collectors.toList());+ else if (strings.size() == 0)+ return null;+ else+ return Long.valueOf(strings.iterator().next());+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid build number");}}- public static List<String> convertToStrings(Object value) {- if (value instanceof Long)+ public static List<String> convertToStrings(InputSpec inputSpec, Object value) {+ if (value instanceof List)+ return ((List<?>)value).stream().map(it->it.toString()).collect(Collectors.toList());+ else if (value instanceof Long)return Lists.newArrayList(value.toString());elsereturn new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex feae0ab328..961ee66d22 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -284,7 +284,7 @@ public abstract class InputSpec implements Serializable {@Nullablepublic abstract Object convertToObject(List<String> strings);- public long getOrdinal(Object fieldValue) {+ public long getOrdinal(String fieldValue) {return -1;}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javaindex f2fc1b4b17..ed5c1deb88 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java@@ -30,12 +30,16 @@ public class DateInput {}public static Object convertToObject(List<String> strings) {- if (strings.size() == 1)- return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();- else if (strings.size() == 0)- return null;- else- throw new ValidationException("Not eligible for multi-value");+ try {+ if (strings.size() == 1)+ return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ else if (strings.size() == 0)+ return null;+ else+ throw new ValidationException("Not eligible for multi-value");+ } catch (IllegalArgumentException e) {+ throw new ValidationException(e.getMessage());+ }}public static List<String> convertToStrings(Object value) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildMultiChoice.javanew file mode 100644index 0000000000..8362aec155--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildMultiChoice.java@@ -0,0 +1,36 @@+package io.onedev.server.web.component.build.choice;++import java.util.Collection;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.Build;+import io.onedev.server.web.component.select2.Select2MultiChoice;++@SuppressWarnings("serial")+public class BuildMultiChoice extends Select2MultiChoice<Build> {++ public BuildMultiChoice(String id, IModel<Collection<Build>> model, BuildChoiceProvider choiceProvider) {+ super(id, model, choiceProvider);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (isRequired())+ getSettings().setPlaceholder("Choose builds ...");+ getSettings().setFormatResult("onedev.server.buildChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.buildChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.buildChoiceFormatter.escapeMarkup");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new BuildChoiceResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.javaindex dfde8bf43f..98b986dbd5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java@@ -1,11 +1,14 @@package io.onedev.server.web.editable.build.choice;import java.lang.reflect.Method;+import java.util.List;+import java.util.stream.Collectors;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -22,7 +25,34 @@ public class BuildChoiceEditSupport implements EditSupport {Method propertyGetter = descriptor.getPropertyGetter();BuildChoice buildChoice = propertyGetter.getAnnotation(BuildChoice.class);if (buildChoice != null) {- if (propertyGetter.getReturnType() == Long.class) {+ if (List.class.isAssignableFrom(propertyGetter.getReturnType())+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == Long.class) {+ return new PropertyContext<List<Long>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Long>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ List<Long> buildIds = model.getObject();+ if (buildIds != null && !buildIds.isEmpty()) {+ return new Label(id, buildIds.stream().map(it->"#"+it).collect(Collectors.joining(", ")));+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Long>> renderForEdit(String componentId, IModel<List<Long>> model) {+ return new BuildMultiChoiceEditor(componentId, descriptor, model);+ }++ };+ } else if (propertyGetter.getReturnType() == Long.class) {return new PropertyContext<Long>(descriptor) {@Override@@ -42,12 +72,12 @@ public class BuildChoiceEditSupport implements EditSupport {@Overridepublic PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {- return new BuildChoiceEditor(componentId, descriptor, model);+ return new BuildSingleChoiceEditor(componentId, descriptor, model);}};} else {- throw new RuntimeException("Annotation 'BuildChoice' should be applied to property with type 'Long'.");+ throw new RuntimeException("Annotation 'BuildChoice' should be applied to property with type 'Long' or 'List<Long>'.");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.javanew file mode 100644index 0000000000..26ac358eb3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java@@ -0,0 +1,116 @@+package io.onedev.server.web.editable.build.choice;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.component.build.choice.BuildChoiceProvider;+import io.onedev.server.web.component.build.choice.BuildMultiChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.BuildChoice;+import io.onedev.server.web.util.ProjectAware;++@SuppressWarnings("serial")+public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {++ private BuildMultiChoice input;++ public BuildMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<List<Long>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Nullable+ private Project getProject() {+ ComponentContext.push(new ComponentContext(this));+ try {+ BuildChoice choice = Preconditions.checkNotNull(descriptor+ .getPropertyGetter().getAnnotation(BuildChoice.class));+ if (choice.project().length() != 0) {+ return (Project) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), choice.project());+ } else {+ return findParent(ProjectAware.class).getProject();+ }+ } finally {+ ComponentContext.pop();+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Build> selections = new ArrayList<>();+ if (getModelObject() != null) {+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ for (Long buildId: getModelObject()) {+ Build build = buildManager.get(buildId);+ if (build != null)+ selections.add(build);+ }+ }++ BuildChoiceProvider choiceProvider = new BuildChoiceProvider(new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return getProject();+ }++ });+ input = new BuildMultiChoice("input", Model.of(selections), choiceProvider) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor);+ }++ };+ input.setConvertEmptyInputStringToNull(true);++ // add this to control allowClear flag of select2+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+ add(input);+ }++ @Override+ protected List<Long> convertInputToValue() throws ConversionException {+ Collection<Build> builds = input.getConvertedInput();+ if (builds != null)+ return builds.stream().map(it->it.getId()).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.htmlnew file mode 100644index 0000000000..3817227265--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden">+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javaindex 627b16f324..ff605a0b33 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java@@ -25,11 +25,11 @@ import io.onedev.server.web.editable.annotation.BuildChoice;import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")-public class BuildChoiceEditor extends PropertyEditor<Long> {+public class BuildSingleChoiceEditor extends PropertyEditor<Long> {private BuildSingleChoice input;- public BuildChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ public BuildSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,IModel<Long> propertyModel) {super(id, propertyDescriptor, propertyModel);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 4c66d52d6f..5b532cd3c8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;import java.util.List;+import java.util.stream.Collectors;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -94,13 +95,11 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {- List<String> userNames = new ArrayList<>();Collection<User> users = input.getConvertedInput();- if (users != null) {- for (User user: users)- userNames.add(user.getName());- }- return userNames;+ if (users != null)+ return users.stream().map(it->it.getName()).collect(Collectors.toList());+ else+ return new ArrayList<>();}}