The Unified and Autonomous Development Platform
Fix issue #1257 - NPE when specify default value of custom issue field of group type
Robin Shenc5395099c8fd
diff --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 1b97bfc257..cb27a04e98 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@@ -70,7 +70,8 @@ public class GroupChoiceField extends FieldSpec {return GroupChoiceInput.convertToStrings(value);}- public void onRenameGroup(DefaultValueProvider defaultValueProvider, String oldName, String newName) {+ @Override+ public void onRenameGroup(String oldName, String newName) {if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(oldName))@@ -78,13 +79,15 @@ public class GroupChoiceField extends FieldSpec {}}- public Usage onDeleteGroup(DefaultValueProvider defaultValueProvider, String groupName) {+ @Override+ public Usage onDeleteGroup(String groupName) {+ Usage usage = new Usage();if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(groupName))- defaultValueProvider = null;+ usage.add("default value");}- return new Usage();+ return usage.prefix("custom fields: " + getName());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex a66a581587..882661381a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -5,6 +5,7 @@ import java.util.Collection;import java.util.Comparator;import java.util.List;+import io.onedev.server.util.ComponentContext;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -38,14 +39,20 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {List<Group> choices = new ArrayList<>();- GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);- Preconditions.checkNotNull(groupChoice);- if (groupChoice.value().length() != 0) {- choices.addAll((List<Group>)ReflectionUtils- .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));- } else {- choices.addAll(OneDev.getInstance(GroupManager.class).query());- choices.sort(Comparator.comparing(Group::getName));+ ComponentContext componentContext = new ComponentContext(this);+ ComponentContext.push(componentContext);+ try {+ GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);+ Preconditions.checkNotNull(groupChoice);+ if (groupChoice.value().length() != 0) {+ choices.addAll((List<Group>) ReflectionUtils+ .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(GroupManager.class).query());+ choices.sort(Comparator.comparing(Group::getName));+ }+ } finally {+ ComponentContext.pop();}List<Group> selections = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 74c2d84570..42a827b801 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;+import io.onedev.server.util.ComponentContext;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -36,17 +37,22 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {super.onInitialize();List<Group> choices = new ArrayList<>();-- GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);- Preconditions.checkNotNull(groupChoice);- if (groupChoice.value().length() != 0) {- choices.addAll((List<Group>)ReflectionUtils- .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));- } else {- choices.addAll(OneDev.getInstance(GroupManager.class).query());- choices.sort(Comparator.comparing(Group::getName));++ ComponentContext componentContext = new ComponentContext(this);+ ComponentContext.push(componentContext);+ try {+ GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);+ Preconditions.checkNotNull(groupChoice);+ if (groupChoice.value().length() != 0) {+ choices.addAll((List<Group>) ReflectionUtils+ .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(GroupManager.class).query());+ choices.sort(Comparator.comparing(Group::getName));+ }+ } finally {+ ComponentContext.pop();}-Group group;if (getModelObject() != null)group = OneDev.getInstance(GroupManager.class).find(getModelObject());