The Unified and Autonomous Development Platform
fix issue #35: NPE when create new issue with custom build field specified
Robin Shen912a866afe46
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.javaindex ea3a7359cf..2bca7bb143 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java@@ -23,7 +23,7 @@ public class BranchMultiChoice extends Select2MultiChoice<String> {if (isRequired())getSettings().setPlaceholder("Choose branches...");else- getSettings().setPlaceholder("Branches not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.branchChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.branchChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.branchChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.javaindex 7cc1867cb2..03b1a2dac1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java@@ -23,7 +23,7 @@ public class BranchSingleChoice extends Select2Choice<String> {if (isRequired())getSettings().setPlaceholder("Choose branch...");else- getSettings().setPlaceholder("Branch not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.branchChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.branchChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.branchChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex a50950e65c..473df6880c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.List;import org.apache.wicket.model.IModel;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -48,8 +49,12 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {@Overridepublic Collection<Build> toChoices(Collection<String> ids) {List<Build> builds = Lists.newArrayList();- for (String id: ids)- builds.add(OneDev.getInstance(BuildManager.class).load(Long.valueOf(id)));+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ for (String id: ids) {+ Build build = buildManager.load(Long.valueOf(id));+ Hibernate.initialize(build);+ builds.add(build);+ }return builds;}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.javaindex 961bb34187..2d1817fe7e 100644--- 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.java@@ -22,7 +22,7 @@ public class BuildMultiChoice extends Select2MultiChoice<Build> {if (isRequired())getSettings().setPlaceholder("Choose builds...");else- getSettings().setPlaceholder("Builds not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.buildChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.buildChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.buildChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.javaindex b25a5003ae..86edb6bf06 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildSingleChoice.java@@ -20,7 +20,7 @@ public class BuildSingleChoice extends Select2Choice<Build> {if (isRequired())getSettings().setPlaceholder("Choose build...");else- getSettings().setPlaceholder("Build not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.buildChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.buildChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.buildChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.javaindex 9f80fc3a6a..38c0c2d85f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java@@ -3,6 +3,7 @@ package io.onedev.server.web.component.groupchoice;import java.util.Collection;import java.util.List;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -28,8 +29,9 @@ public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<Group>List<Group> groups = Lists.newArrayList();GroupManager groupManager = OneDev.getInstance(GroupManager.class);for (String each : ids) {- Long id = Long.valueOf(each);- groups.add(groupManager.load(id));+ Group group = groupManager.load(Long.valueOf(each));+ Hibernate.initialize(group);+ groups.add(group);}return groups;diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.javaindex cbccb2f547..2d89da292c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java@@ -22,7 +22,7 @@ public class GroupMultiChoice extends Select2MultiChoice<Group> {if (isRequired())getSettings().setPlaceholder("Choose groups...");else- getSettings().setPlaceholder("Groups not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.javaindex dba5428a24..46963e2d3b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java@@ -22,7 +22,7 @@ public class GroupSingleChoice extends Select2Choice<Group> {if (isRequired())getSettings().setPlaceholder("Choose group...");else- getSettings().setPlaceholder("Group not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.javaindex 5c5ba09a7c..a7ff7c4ff0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.List;import org.apache.wicket.model.IModel;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -46,8 +47,12 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {@Overridepublic Collection<Issue> toChoices(Collection<String> ids) {List<Issue> issues = Lists.newArrayList();- for (String id: ids)- issues.add(OneDev.getInstance(IssueManager.class).load(Long.valueOf(id)));+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);+ for (String id: ids) {+ Issue issue = issueManager.load(Long.valueOf(id));+ Hibernate.initialize(issue);+ issues.add(issue);+ }return issues;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.javaindex ef2e172088..7ac692076c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java@@ -20,7 +20,7 @@ public class IssueSingleChoice extends Select2Choice<Issue> {if (isRequired())getSettings().setPlaceholder("Choose issue...");else- getSettings().setPlaceholder("Issue not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.issueChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.issueChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.issueChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.javaindex ca6d738710..381af2c46b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java@@ -22,7 +22,7 @@ public class JobMultiChoice extends Select2MultiChoice<String> {if (isRequired())getSettings().setPlaceholder("Choose jobs...");else- getSettings().setPlaceholder("Jobs not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.javaindex f20074f371..71ab70176d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java@@ -21,7 +21,7 @@ public class JobSingleChoice extends Select2Choice<String> {if (isRequired())getSettings().setPlaceholder("Choose job...");else- getSettings().setPlaceholder("Job not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.javaindex 7e3ede07c7..e3085c6a9e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.List;import org.apache.wicket.model.IModel;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -51,8 +52,9 @@ public class MilestoneChoiceProvider extends ChoiceProvider<Milestone> {List<Milestone> milestones = Lists.newArrayList();MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);for (String each : ids) {- Long id = Long.valueOf(each);- milestones.add(milestoneManager.load(id));+ Milestone milestone = milestoneManager.load(Long.valueOf(each));+ Hibernate.initialize(milestone);+ milestones.add(milestone);}return milestones;diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.javaindex 5323098607..27111f9410 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneSingleChoice.java@@ -22,7 +22,7 @@ public class MilestoneSingleChoice extends Select2Choice<Milestone> {if (isRequired())getSettings().setPlaceholder("Choose milestone...");else- getSettings().setPlaceholder("Milestone not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.milestoneChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.milestoneChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.milestoneChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.javaindex 9e0518dd58..caab3f6bb5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java@@ -3,6 +3,7 @@ package io.onedev.server.web.component.project.choice;import java.util.Collection;import java.util.stream.Collectors;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -25,8 +26,12 @@ public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Proje@Overridepublic Collection<Project> toChoices(Collection<String> ids) {return ids.stream()- .map(it->OneDev.getInstance(ProjectManager.class).load(Long.valueOf(it)))- .collect(Collectors.toList());+ .map(it-> {+ Project project = OneDev.getInstance(ProjectManager.class).load(Long.valueOf(it));+ Hibernate.initialize(project);+ return project;+ }+ ).collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.javaindex 80dffebbd7..39b86b6566 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java@@ -23,7 +23,7 @@ public class ProjectMultiChoice extends Select2MultiChoice<Project> {if (isRequired())getSettings().setPlaceholder("Choose projects...");else- getSettings().setPlaceholder("Projects not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.javaindex ea697906dd..e491901550 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java@@ -20,7 +20,7 @@ public class ProjectSingleChoice extends Select2Choice<Project> {if (isRequired())getSettings().setPlaceholder("Choose a project...");else- getSettings().setPlaceholder("Project not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.javaindex 5bd2e3e9c3..67ba6bd755 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.List;import org.apache.wicket.model.IModel;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -46,8 +47,12 @@ public class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {@Overridepublic Collection<PullRequest> toChoices(Collection<String> ids) {List<PullRequest> requests = Lists.newArrayList();- for (String id: ids)- requests.add(OneDev.getInstance(PullRequestManager.class).load(Long.valueOf(id)));+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);+ for (String id: ids) {+ PullRequest request = pullRequestManager.load(Long.valueOf(id));+ Hibernate.initialize(request);+ requests.add(request);+ }return requests;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.javaindex 1299856dba..90275a639a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestSingleChoice.java@@ -20,7 +20,7 @@ public class PullRequestSingleChoice extends Select2Choice<PullRequest> {if (isRequired())getSettings().setPlaceholder("Choose pull request...");else- getSettings().setPlaceholder("Pull request not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.pullRequestChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.pullRequestChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.pullRequestChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.javaindex 77443b6cbc..79968ee262 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java@@ -3,6 +3,7 @@ package io.onedev.server.web.component.user.choice;import java.util.Collection;import java.util.List;+import org.hibernate.Hibernate;import org.json.JSONException;import org.json.JSONWriter;import org.unbescape.html.HtmlEscape;@@ -31,8 +32,9 @@ public abstract class AbstractUserChoiceProvider extends ChoiceProvider<User> {List<User> users = Lists.newArrayList();UserManager userManager = OneDev.getInstance(UserManager.class);for (String each : ids) {- Long id = Long.valueOf(each);- users.add(userManager.load(id));+ User user = userManager.load(Long.valueOf(each));+ Hibernate.initialize(user);+ users.add(user);}return users;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.javaindex bd317440f0..65b8eedc75 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java@@ -23,7 +23,7 @@ public class UserMultiChoice extends Select2MultiChoice<User> {if (isRequired())getSettings().setPlaceholder("Choose users...");else- getSettings().setPlaceholder("Users not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.javaindex a99e9fb8cb..f6f892a4a9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java@@ -22,7 +22,7 @@ public class UserSingleChoice extends Select2Choice<User> {if (isRequired())getSettings().setPlaceholder("Choose a user...");else- getSettings().setPlaceholder("User not specified");+ getSettings().setPlaceholder("Not specified");getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");