The Unified and Autonomous Development Platform
chore: Refactoring issue field population
Robin Shen8bc1f455e28a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 993fced271..3075362e28 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -107,11 +107,8 @@ public class CreateIssueAction extends PostBuildAction {issue.setDescription(getIssueDescription());issue.setConfidential(isIssueConfidential());- for (FieldInstance instance: getIssueFields()) {- Object fieldValue = issueSetting.getFieldSpec(instance.getName())- .convertToObject(instance.getValueProvider().getValue());- issue.setFieldValue(instance.getName(), fieldValue);- }+ for (var entry: FieldUtils.getFieldValues(build.getProject(), getIssueFields()).entrySet())+ issue.setFieldValue(entry.getKey(), entry.getValue());OneDev.getInstance(IssueService.class).open(issue);});diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.javaindex aaf2c1e498..51445d4f00 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java@@ -170,7 +170,7 @@ public class ParamUtils {paramSpecClone.setDescription(description);paramSpecsCopy.add(paramSpecClone);}- return (Class<? extends Serializable>) ParamSpec.defineClass(className, "Parameters", paramSpecsCopy);+ return (Class<? extends Serializable>) ParamSpec.defineClass(className, "Parameters", paramSpecsCopy, true);}@SuppressWarnings("unchecked")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.javaindex 4e9ca63418..32eb4e8391 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java@@ -47,8 +47,8 @@ public class BooleanParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return BooleanInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return BooleanInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.javaindex 54a9dc7f3e..c44ea72ee5 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java@@ -12,7 +12,7 @@ public class BuildChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return BuildChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.javaindex b64580407e..04162b47b1 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java@@ -12,7 +12,7 @@ public class CommitParam extends ParamSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return CommitInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javaindex 5ba7d46244..27525443aa 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java@@ -27,8 +27,8 @@ public class DateParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return DateInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return DateInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.javaindex 6aa0e7cb77..d7a849cf2b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java@@ -27,8 +27,8 @@ public class DateTimeParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return DateTimeInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return DateTimeInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.javaindex c03df5457e..4c32adbaa9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java@@ -27,8 +27,8 @@ public class FloatParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return FloatInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return FloatInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.javaindex 60db980e2b..ec366c36b2 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java@@ -48,8 +48,8 @@ public class GroupChoiceParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, withDefaultValue?defaultValueProvider:null);}@Editablediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.javaindex 63b42084ad..bd181c5dfa 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java@@ -49,8 +49,8 @@ public class IntegerParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return IntegerInput.getPropertyDef(this, indexes, minValue, maxValue, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return IntegerInput.getPropertyDef(this, indexes, minValue, maxValue, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.javaindex 49cf0da9a5..5aff11a942 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java@@ -12,7 +12,7 @@ public class IssueChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return IssueChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IterationChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IterationChoiceParam.javaindex 605f31c159..135ca8f3fa 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IterationChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IterationChoiceParam.java@@ -12,7 +12,7 @@ public class IterationChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return IterationChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.javaindex cfa4aebe5c..2ed1174c86 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java@@ -12,7 +12,7 @@ public class PullRequestChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return PullRequestChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.javaindex 3a5d4dfb62..ec3c284021 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java@@ -24,7 +24,7 @@ public class SecretParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return SecretInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.javaindex a4d3f40350..734e56febd 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java@@ -56,8 +56,8 @@ public class TextParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return TextInput.getPropertyDef(this, indexes, pattern, multiline, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return TextInput.getPropertyDef(this, indexes, pattern, multiline, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.javaindex a93965b7fe..39a005f825 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java@@ -66,8 +66,11 @@ public class ChoiceParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ if (withDefaultValue)+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ else+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, null, null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.javaindex 0def616369..b91fc4738a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java@@ -65,8 +65,11 @@ public class UserChoiceParam extends ParamSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ if (withDefaultValue)+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ else+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, null, null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.javaindex 2f4be06678..f0850b7c32 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java@@ -122,7 +122,7 @@ public abstract class InputSpec implements Serializable {return escaped;}- public abstract String getPropertyDef(Map<String, Integer> indexes);+ public abstract String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue);protected String getLiteral(byte[] bytes) {StringBuffer buffer = new StringBuffer("[");@@ -229,7 +229,7 @@ public abstract class InputSpec implements Serializable {}}- public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs) {+ public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs, boolean withDefaultValue) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");buffer.append("import com.google.common.base.Optional;\n");@@ -251,7 +251,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));+ buffer.append(input.getPropertyDef(indexes, withDefaultValue));buffer.append("}\n");buffer.append("return " + className + ";\n");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.javaindex b1f0358562..0e24c2b875 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java@@ -5,6 +5,8 @@ import java.util.Map;import javax.validation.ValidationException;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;@@ -18,7 +20,7 @@ public class BooleanInput {}public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- DefaultValueProvider defaultValueProvider) {+ @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.javaindex 8fc3d06e11..dcfdfd9480 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java@@ -7,6 +7,8 @@ import java.util.Map;import javax.validation.ValidationException;import javax.validation.Validator;+import org.jspecify.annotations.Nullable;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;@@ -21,9 +23,10 @@ public class ChoiceInput {return possibleValues;}- public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,- DefaultMultiValueProvider defaultMultiValueProvider) {+ public static String getPropertyDef(InputSpec inputSpec,+ Map<String, Integer> indexes, ChoiceProvider choiceProvider,+ @Nullable DefaultValueProvider defaultValueProvider,+ @Nullable DefaultMultiValueProvider defaultMultiValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.javaindex 564831e11a..3a0ef89625 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java@@ -7,6 +7,8 @@ import java.util.Map;import javax.validation.ValidationException;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.InputSpec;@@ -15,7 +17,7 @@ import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.public class DateInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- DefaultValueProvider defaultValueProvider) {+ @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "Date");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.javaindex b43000876f..ec9cdd09de 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java@@ -7,6 +7,8 @@ import java.util.Map;import javax.validation.ValidationException;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.InputSpec;@@ -15,7 +17,7 @@ import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovipublic class DateTimeInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- DefaultValueProvider defaultValueProvider) {+ @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "Date");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.javaindex 54ba53e947..926010a268 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java@@ -6,6 +6,8 @@ import java.util.Map;import javax.validation.ValidationException;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;@@ -14,7 +16,7 @@ import io.onedev.server.buildspecmodel.inputspec.InputSpec;public class FloatInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- DefaultValueProvider defaultValueProvider) {+ @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "Float");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 4f3906bb97..1cadb19cf3 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -7,6 +7,8 @@ import java.util.Map;import javax.validation.ValidationException;import javax.validation.Validator;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -27,7 +29,7 @@ public class GroupChoiceInput {}public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider) {+ ChoiceProvider choiceProvider, @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "String");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.javaindex 7b3070ef3f..3378673e5c 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java@@ -6,6 +6,8 @@ import java.util.Map;import javax.validation.ValidationException;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;@@ -14,7 +16,7 @@ import io.onedev.server.buildspecmodel.inputspec.InputSpec;public class IntegerInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- Integer minValue, Integer maxValue, DefaultValueProvider defaultValueProvider) {+ Integer minValue, Integer maxValue, @Nullable DefaultValueProvider defaultValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "Integer");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.javaindex 0c6e1e30c8..61e6888866 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java@@ -19,7 +19,7 @@ public class TextInput {public static final int MAX_LEN = 500;public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- @Nullable String pattern, boolean multiline, DefaultValueProvider defaultValueProvider) {+ @Nullable String pattern, boolean multiline, @Nullable DefaultValueProvider defaultValueProvider) {if (pattern != null)pattern = InputSpec.escape(pattern);int index = indexes.get(inputSpec.getName());diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.javaindex 1597e31a79..60538e74ab 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java@@ -5,6 +5,8 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;+import org.jspecify.annotations.Nullable;+import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -21,9 +23,10 @@ public class UserChoiceInput {.collect(Collectors.toList());}- public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,- DefaultMultiValueProvider defaultMultiValueProvider) {+ public static String getPropertyDef(InputSpec inputSpec,+ Map<String, Integer> indexes, ChoiceProvider choiceProvider,+ @Nullable DefaultValueProvider defaultValueProvider,+ @Nullable DefaultMultiValueProvider defaultMultiValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.javaindex 4857fa3e1e..233d80c495 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java@@ -108,7 +108,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.administration.IssueCreationSetting;import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;-import io.onedev.server.model.support.issue.field.instance.FieldInstance;+import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.persistence.TransactionService;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -733,11 +733,8 @@ public class DefaultMailService implements MailService, Serializable {IssueCreationSetting issueCreationSetting = settingService.getServiceDeskSetting().getIssueCreationSetting(project);issue.setConfidential(issueCreationSetting.isConfidential());- for (FieldInstance instance: issueCreationSetting.getIssueFields()) {- Object fieldValue = issueSetting.getFieldSpec(instance.getName())- .convertToObject(instance.getValueProvider().getValue());- issue.setFieldValue(instance.getName(), fieldValue);- }+ for (Map.Entry<String, Object> entry: FieldUtils.getFieldValues(project, issueCreationSetting.getIssueFields()).entrySet())+ issue.setFieldValue(entry.getKey(), entry.getValue());var notifyEmailAddresses = receiverInternetAddresses.stream().map(InternetAddress::getAddress).collect(toSet());notifyEmailAddresses.add(submitterInternetAddress.getAddress());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 9b729ba97a..444d638e5f 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@@ -1029,7 +1029,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportreturn -1;}- public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {+ public Serializable getFieldBean(Class<?> fieldBeanClass) {BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();@@ -1039,8 +1039,6 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportif (input != null) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());property.setPropertyValue(fieldBean, input.getTypedValue(fieldSpec));- } else if (!withDefaultValue) {- property.setPropertyValue(fieldBean, null);}}}@@ -1100,8 +1098,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportif (existingFieldNames.containsAll(fieldNames))return;- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- var fieldBean = getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ var fieldBean = getFieldBean(fieldBeanClass);var fieldValues = FieldUtils.getFieldValues(getProject(), fieldBean, fieldNames);for (var entry: fieldValues.entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex ab66959237..5509b04935 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.buildspecmodel.inputspec.InputSpec;@@ -50,8 +51,17 @@ public class FieldUtils {private static final long serialVersionUID = 1L;};-++ private static final MetaDataKey<Class<? extends Serializable>> FIELD_BEAN_CLASS_WITH_DEFAULT_VALUE_KEY =+ new MetaDataKey<>() {++ private static final long serialVersionUID = 1L;++ };+public static final String FIELD_BEAN_CLASS_NAME = "IssueFieldBean";++ public static final String FIELD_BEAN_CLASS_NAME_WITH_DEFAULT_VALUE = "IssueFieldBeanWithDefaultValue";public static void clearFields(Serializable fieldBean) {for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {@@ -60,25 +70,26 @@ public class FieldUtils {}}- public static Class<? extends Serializable> getFieldBeanClass() {+ public static Class<? extends Serializable> getFieldBeanClass(boolean withDefaultValue) {RequestCycle requestCycle = RequestCycle.get();if (requestCycle != null) {- Class<? extends Serializable> fieldBeanClass = requestCycle.getMetaData(FIELD_BEAN_CLASS_KEY);+ var key = withDefaultValue ? FIELD_BEAN_CLASS_WITH_DEFAULT_VALUE_KEY : FIELD_BEAN_CLASS_KEY;+ Class<? extends Serializable> fieldBeanClass = requestCycle.getMetaData(key);if (fieldBeanClass == null) {- fieldBeanClass = defineFieldBeanClass();- requestCycle.setMetaData(FIELD_BEAN_CLASS_KEY, fieldBeanClass);+ fieldBeanClass = defineFieldBeanClass(withDefaultValue);+ requestCycle.setMetaData(key, fieldBeanClass);}return fieldBeanClass;} else {- return defineFieldBeanClass();+ return defineFieldBeanClass(withDefaultValue);}}@SuppressWarnings("unchecked")- private static Class<? extends Serializable> defineFieldBeanClass() {+ private static Class<? extends Serializable> defineFieldBeanClass(boolean withDefaultValue) {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingService.class).getIssueSetting();- return (Class<? extends Serializable>) FieldSpec.defineClass(FIELD_BEAN_CLASS_NAME,- "Issue Fields", issueSetting.getFieldSpecs());+ var className = withDefaultValue ? FIELD_BEAN_CLASS_NAME_WITH_DEFAULT_VALUE : FIELD_BEAN_CLASS_NAME;+ return (Class<? extends Serializable>) FieldSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs(), withDefaultValue);}public static Collection<String> getEditablePropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {@@ -124,6 +135,36 @@ public class FieldUtils {HierarchicalContext.pop();}}++ public static Map<String, Object> getFieldValues(Project project, List<FieldInstance> fieldInstances) {+ Map<String, Object> fieldValues = new HashMap<>();+ Serializable fieldBean;+ try {+ fieldBean = getFieldBeanClass(false).getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | java.lang.reflect.InvocationTargetException | NoSuchMethodException | SecurityException e) {+ throw new RuntimeException(e);+ }+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingService.class).getIssueSetting();+ for (FieldInstance fieldInstance : fieldInstances) {+ FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldInstance.getName());+ if (fieldSpec == null)+ throw new ExplicitException("Undefined field: " + fieldInstance.getName());+ // EditContext for scripting values that read sibling fields via getInputValue(...)+ HierarchicalContext.push(newHierarchicalContext(project, beanDescriptor, fieldBean));+ try {+ Object fieldValue = fieldSpec.convertToObject(fieldInstance.getValueProvider().getValue());+ fieldValues.put(fieldInstance.getName(), fieldValue);+ String propertyName = getPropertyName(beanDescriptor, fieldInstance.getName());+ if (propertyName != null)+ beanDescriptor.getProperty(propertyName).setPropertyValue(fieldBean, fieldValue);+ } finally {+ HierarchicalContext.pop();+ }+ }+ return fieldValues;+ }private static void validateFieldValue(FieldSpec fieldSpec, String fieldName, List<String> fieldValue) {try {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.javaindex 817489025a..3e01e74ebb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java@@ -47,8 +47,8 @@ public class BooleanField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return BooleanInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return BooleanInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.javaindex c9880f36b9..73b8039e04 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java@@ -12,7 +12,7 @@ public class BuildChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return BuildChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.javaindex 3f9921ff24..7bbe0e111b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java@@ -12,7 +12,7 @@ public class CommitField extends FieldSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return CommitInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.javaindex 909c3d6302..a07d07f017 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java@@ -27,8 +27,8 @@ public class DateField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return DateInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return DateInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.javaindex 65027654cc..8729804cfb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java@@ -27,8 +27,8 @@ public class DateTimeField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return DateTimeInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return DateTimeInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.javaindex fe7d194a88..4558021f94 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java@@ -27,8 +27,8 @@ public class FloatField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return FloatInput.getPropertyDef(this, indexes, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return FloatInput.getPropertyDef(this, indexes, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.javaindex 7180121438..758389dd52 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java@@ -71,8 +71,11 @@ public class GroupChoiceField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ if (withDefaultValue)+ return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);+ else+ return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, null);}@Editablediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.javaindex e851edea5e..241aa17ac9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java@@ -49,8 +49,8 @@ public class IntegerField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return IntegerInput.getPropertyDef(this, indexes, minValue, maxValue, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return IntegerInput.getPropertyDef(this, indexes, minValue, maxValue, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.javaindex 8929ecccec..272fde5783 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java@@ -12,7 +12,7 @@ public class IssueChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return IssueChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IterationChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IterationChoiceField.javaindex 2f5d707e8b..055dc2a732 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IterationChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IterationChoiceField.java@@ -12,7 +12,7 @@ public class IterationChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return IterationChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.javaindex 8c1e133339..09b2714666 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java@@ -12,7 +12,7 @@ public class PullRequestChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return PullRequestChoiceInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.javaindex b2507bc595..49eaafd028 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java@@ -24,7 +24,7 @@ public class SecretField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {return SecretInput.getPropertyDef(this, indexes);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.javaindex add6363152..24e864ed2d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java@@ -56,8 +56,8 @@ public class TextField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return TextInput.getPropertyDef(this, indexes, pattern, multiline, defaultValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ return TextInput.getPropertyDef(this, indexes, pattern, multiline, withDefaultValue?defaultValueProvider:null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.javaindex 6b2ff104c9..58f026727f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java@@ -67,8 +67,11 @@ public class ChoiceField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ if (withDefaultValue)+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ else+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, null, null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.javaindex 7dbf3e8a43..605a826ec5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java@@ -68,8 +68,11 @@ public class UserChoiceField extends FieldSpec {}@Override- public String getPropertyDef(Map<String, Integer> indexes) {- return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ public String getPropertyDef(Map<String, Integer> indexes, boolean withDefaultValue) {+ if (withDefaultValue)+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ else+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, null, null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.javaindex 896226ec3b..cfc240da53 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java@@ -6,7 +6,6 @@ import java.util.HashSet;import java.util.List;import java.util.Map;-import org.jspecify.annotations.Nullable;import javax.inject.Inject;import javax.inject.Singleton;@@ -14,8 +13,10 @@ import org.hibernate.ReplicationMode;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;+import org.jspecify.annotations.Nullable;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.cp.IAtomicLong;@@ -161,6 +162,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleScodeWriter.setScheduleIssues(true);codeWriter.setAccessConfidentialIssues(true);codeWriter.setEditableIssueFields(new AllIssueFields());+ codeWriter.setEditableIssueLinks(Lists.newArrayList("Sub Issues", "Related"));codeWriter.setCanEditFieldsOfOtherIssues(true);JobPrivilege jobPrivilege = new JobPrivilege();@@ -181,6 +183,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSallfieldsExcept.getExcludeFields().add("Assignees");codeReader.setEditableIssueFields(allfieldsExcept);}+ codeReader.setEditableIssueLinks(Lists.newArrayList("Related"));jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -200,6 +203,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSallfieldsExcept.getExcludeFields().add("Assignees");workspaceCreator.setEditableIssueFields(allfieldsExcept);}+ workspaceCreator.setEditableIssueLinks(Lists.newArrayList("Sub Issues", "Related"));jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -214,6 +218,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSpackWriter.setScheduleIssues(true);packWriter.setAccessConfidentialIssues(true);packWriter.setEditableIssueFields(new AllIssueFields());+ packWriter.setEditableIssueLinks(Lists.newArrayList("Sub Issues", "Related"));jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -232,6 +237,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSallfieldsExcept.getExcludeFields().add("Assignees");packReader.setEditableIssueFields(allfieldsExcept);}+ packReader.setEditableIssueLinks(Lists.newArrayList("Related"));jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -261,6 +267,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSallfieldsExcept.getExcludeFields().add("Assignees");issueReporter.setEditableIssueFields(allfieldsExcept);}+ issueReporter.setEditableIssueLinks(Lists.newArrayList("Related"));jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex ba7b6e9348..85e672f00a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -103,8 +103,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementsuper.onInitialize();Issue issue = newIssue();- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ Serializable fieldBean = issue.getFieldBean(fieldBeanClass);var fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen(getProject());issue.setFieldValues(FieldUtils.getFieldValues(getProject(), fieldBean,diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex cced89e456..11e58b02e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -203,14 +203,14 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro@Overrideprotected String getPropertyName() {- BeanDescriptor descriptor = new BeanDescriptor(FieldUtils.getFieldBeanClass());+ BeanDescriptor descriptor = new BeanDescriptor(FieldUtils.getFieldBeanClass(false));return FieldUtils.getPropertyName(descriptor, getField().getName());}@Overrideprotected Serializable getBean() {- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- return getIssue().getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ return getIssue().getFieldBean(fieldBeanClass);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex a23b77ee4e..3f90019013 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -213,14 +213,14 @@ abstract class BatchEditPanel extends Panel implements InputContext {});builtInFieldsBean = new BuiltInFieldsBean();- Class<? extends Serializable> fieldBeanClass = FieldUtils.getFieldBeanClass();+ Class<? extends Serializable> fieldBeanClass = FieldUtils.getFieldBeanClass(false);Issue issue = new Issue();issue.setProject(getProject());if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {getIssueQuery().getCriteria().fill(issue);builtInFieldsBean.setIterations(issue.getIterations().stream().map(it->it.getName()).collect(Collectors.toList()));- customFieldsBean = issue.getFieldBean(fieldBeanClass, false);+ customFieldsBean = issue.getFieldBean(fieldBeanClass);} else {try {customFieldsBean = fieldBeanClass.getDeclaredConstructor().newInstance();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex b79333e329..4f0b6f4f9c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -51,8 +51,8 @@ public abstract class TransitionOptionPanel extends Panel implements InputContexprotected void onInitialize() {super.onInitialize();- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.javaindex 9161489a99..908204d701 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java@@ -28,24 +28,24 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.service.SettingService;+import io.onedev.server.annotation.FieldNamesProvider;+import io.onedev.server.annotation.Password;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.FieldUtils;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.SecretField;import io.onedev.server.model.support.issue.field.instance.FieldInstance;import io.onedev.server.model.support.issue.field.instance.IgnoreValue;import io.onedev.server.model.support.issue.field.instance.ScriptingValue;import io.onedev.server.model.support.issue.field.instance.SpecifiedValue;import io.onedev.server.model.support.issue.field.instance.ValueProvider;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.SecretField;+import io.onedev.server.service.SettingService;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.JobSecretEditBean;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.FieldNamesProvider;-import io.onedev.server.annotation.Password;class FieldListEditPanel extends PropertyEditor<List<Serializable>> {@@ -55,7 +55,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {private final Map<String, FieldInstance> fields = new HashMap<>();- private transient Serializable defaultFieldBean;+ private transient Serializable fieldBean;private transient Map<String, FieldSpec> fieldSpecs;@@ -87,17 +87,17 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {return OneDev.getInstance(SettingService.class).getIssueSetting();}- private Serializable getDefaultFieldBean() {- if (defaultFieldBean == null) {- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();+ private Serializable getFieldBean() {+ if (fieldBean == null) {+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(false);try {- defaultFieldBean = (Serializable) fieldBeanClass.getDeclaredConstructor().newInstance();+ fieldBean = (Serializable) fieldBeanClass.getDeclaredConstructor().newInstance();} catch (InstantiationException | IllegalAccessException | IllegalArgumentException| InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}- return defaultFieldBean;+ return fieldBean;}private Component newFieldsView(Class<?> fieldBeanClass) {@@ -113,7 +113,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {container.add(newValueEditor("value", property, field.getValueProvider()));container.setDefaultModel(Model.of(field.getValueProvider().getClass()));} else {- container.add(newValueEditor("value", property, newSpecifiedValueProvider(property)));+ container.add(newValueEditor("value", property, new SpecifiedValue()));container.setDefaultModel(Model.of(SpecifiedValue.class));}@@ -163,7 +163,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {public void setObject(String object) {ValueProvider valueProvider;if (object.equals(SpecifiedValue.DISPLAY_NAME) || object.equals(SpecifiedValue.SECRET_DISPLAY_NAME))- valueProvider = newSpecifiedValueProvider(property);+ valueProvider = new SpecifiedValue();else if (object.equals(ScriptingValue.DISPLAY_NAME) || object.equals(ScriptingValue.SECRET_DISPLAY_NAME))valueProvider = new ScriptingValue();else@@ -202,8 +202,8 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {protected void onBeforeRender() {Component fieldsView = get("fields");String fieldBeanClassName = (String) fieldsView.getDefaultModelObject();- if (!fieldBeanClassName.equals(getDefaultFieldBean().getClass().getName()))- replace(newFieldsView(getDefaultFieldBean().getClass()));+ if (!fieldBeanClassName.equals(getFieldBean().getClass().getName()))+ replace(newFieldsView(getFieldBean().getClass()));super.onBeforeRender();}@@ -211,20 +211,11 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {protected void onInitialize() {super.onInitialize();- add(newFieldsView(getDefaultFieldBean().getClass()));+ add(newFieldsView(getFieldBean().getClass()));setOutputMarkupId(true);}-- private SpecifiedValue newSpecifiedValueProvider(PropertyDescriptor property) {- SpecifiedValue specifiedValue = new SpecifiedValue();- Object typedValue = property.getPropertyValue(getDefaultFieldBean());- FieldSpec fieldSpec = getFieldSpecs().get(property.getDisplayName());- Preconditions.checkNotNull(fieldSpec);- specifiedValue.setValue(fieldSpec.convertToStrings(typedValue));- return specifiedValue;- }-+private Component newValueEditor(String componentId, PropertyDescriptor property, ValueProvider valueProvider) {if (valueProvider instanceof SpecifiedValue) {SpecifiedValue specifiedValue = (SpecifiedValue) valueProvider;@@ -233,7 +224,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {Serializable fieldBean;try {- fieldBean = getDefaultFieldBean().getClass().getDeclaredConstructor().newInstance();+ fieldBean = getFieldBean().getClass().getDeclaredConstructor().newInstance();} catch (InstantiationException | IllegalAccessException | IllegalArgumentException| InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex df3c4e33dd..7615eb9a24 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -396,8 +396,8 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {for (String promptField : transition.getPromptFields()) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);if (fieldSpec != null && SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName())) {- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ Serializable fieldBean = issue.getFieldBean(fieldBeanClass);if (FieldUtils.isFieldVisible(getProject(), new BeanDescriptor(fieldBeanClass), fieldBean, promptField)) {hasPromptFields = true;break;@@ -453,7 +453,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {if (fieldSpec == null)throw new ExplicitException(_T("Undefined custom field: ") + fieldName);- Serializable fieldBean = issue.getFieldBean(FieldUtils.getFieldBeanClass(), true);+ Serializable fieldBean = issue.getFieldBean(FieldUtils.getFieldBeanClass(true));BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());beanDescriptor.getProperty(fieldName).setPropertyValue(fieldBean, getColumn());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 7d99c24718..992725fa74 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -34,8 +34,8 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onInitialize() {super.onInitialize();- Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass(true);+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);diff --git a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex 5c08583c4b..bc3a57e253 100644--- a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -60,7 +60,9 @@ public abstract class AbstractClassResolver implements IClassResolverpublic final Class<?> resolveClass(final String className) throws ClassNotFoundException{if (className.equals(FieldUtils.FIELD_BEAN_CLASS_NAME))- return FieldUtils.getFieldBeanClass();+ return FieldUtils.getFieldBeanClass(false);+ else if (className.equals(FieldUtils.FIELD_BEAN_CLASS_NAME_WITH_DEFAULT_VALUE))+ return FieldUtils.getFieldBeanClass(true);Class<?> clazz = ParamUtils.loadBeanClass(className);diff --git a/server-ee b/server-eeindex 3775c88ca6..0d6ae6aa68 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 3775c88ca686242e67d1258160979c6cf1443d35+Subproject commit 0d6ae6aa6864710cb98fbb2e937e486eea5b5be3