Skip to content

The Unified and Autonomous Development Platform

fix: Exception when opening issues (OD-2533)

Robin Shenccda03e51749
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index e290c0ecc8..ab2f5ef4b8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -26,9 +27,13 @@ public class IssueFieldChangeData extends IssueChangeData {
private static final long serialVersionUID = 1L;
- protected final Map<String, Input> oldFields;
+ protected final Map<String, Serializable> oldFields;
- protected final Map<String, Input> newFields;
+ protected final Map<String, Serializable> newFields;
+
+ private transient Map<String, Input> convertedOldFields;
+
+ private transient Map<String, Input> convertedNewFields;
public IssueFieldChangeData(Map<String, Input> oldFields, Map<String, Input> newFields) {
this.oldFields = copyNonEmptyFields(oldFields);
@@ -36,11 +41,33 @@ public class IssueFieldChangeData extends IssueChangeData {
}
public Map<String, Input> getOldFields() {
- return oldFields;
+ if (convertedOldFields == null) {
+ convertedOldFields = new LinkedHashMap<>();
+ for (Map.Entry<String, Serializable> entry: oldFields.entrySet()) {
+ if (entry.getValue() instanceof Input) {
+ convertedOldFields.put(entry.getKey(), (Input) entry.getValue());
+ } else {
+ io.onedev.server.buildspecmodel.inputspec.Input input = (io.onedev.server.buildspecmodel.inputspec.Input) entry.getValue();
+ convertedOldFields.put(entry.getKey(), new Input(input.getName(), input.getType(), input.getValues()));
+ }
+ }
+ }
+ return convertedOldFields;
}
public Map<String, Input> getNewFields() {
- return newFields;
+ if (convertedNewFields == null) {
+ convertedNewFields = new LinkedHashMap<>();
+ for (Map.Entry<String, Serializable> entry: newFields.entrySet()) {
+ if (entry.getValue() instanceof Input) {
+ convertedNewFields.put(entry.getKey(), (Input) entry.getValue());
+ } else {
+ io.onedev.server.buildspecmodel.inputspec.Input input = (io.onedev.server.buildspecmodel.inputspec.Input) entry.getValue();
+ convertedNewFields.put(entry.getKey(), new Input(input.getName(), input.getType(), input.getValues()));
+ }
+ }
+ }
+ return convertedNewFields;
}
private List<String> getDisplayValues(Input input) {
@@ -67,20 +94,20 @@ public class IssueFieldChangeData extends IssueChangeData {
public Map<String, String> getOldFieldValues() {
Map<String, String> oldFieldValues = new LinkedHashMap<>();
- for (Map.Entry<String, Input> entry: oldFields.entrySet())
+ for (Map.Entry<String, Input> entry: getOldFields().entrySet())
oldFieldValues.put(entry.getKey(), StringUtils.join(getDisplayValues(entry.getValue())));
return oldFieldValues;
}
public Map<String, String> getNewFieldValues() {
Map<String, String> newFieldValues = new LinkedHashMap<>();
- for (Map.Entry<String, Input> entry: newFields.entrySet())
+ for (Map.Entry<String, Input> entry: getNewFields().entrySet())
newFieldValues.put(entry.getKey(), StringUtils.join(getDisplayValues(entry.getValue())));
return newFieldValues;
}
- private Map<String, Input> copyNonEmptyFields(Map<String, Input> fields) {
- Map<String, Input> copy = new LinkedHashMap<>();
+ private Map<String, Serializable> copyNonEmptyFields(Map<String, Input> fields) {
+ Map<String, Serializable> copy = new LinkedHashMap<>();
for (Map.Entry<String, Input> entry: fields.entrySet()) {
if (!entry.getValue().getValues().isEmpty())
copy.put(entry.getKey(), entry.getValue());
@@ -108,8 +135,8 @@ public class IssueFieldChangeData extends IssueChangeData {
public Map<String, Collection<User>> getNewUsers() {
UserManager userManager = OneDev.getInstance(UserManager.class);
Map<String, Collection<User>> newUsers = new HashMap<>();
- for (Input oldField: oldFields.values()) {
- Input newField = newFields.get(oldField.getName());
+ for (Input oldField: getOldFields().values()) {
+ Input newField = getNewFields().get(oldField.getName());
if (newField != null
&& !describe(oldField).equals(describe(newField))
&& newField.getType().equals(FieldSpec.USER)) {
@@ -123,8 +150,8 @@ public class IssueFieldChangeData extends IssueChangeData {
newUsers.put(newField.getName(), newUsersOfField);
}
}
- for (Input newField: newFields.values()) {
- if (!oldFields.containsKey(newField.getName())
+ for (Input newField: getNewFields().values()) {
+ if (!getOldFields().containsKey(newField.getName())
&& newField.getType().equals(FieldSpec.USER)) {
Set<User> usersOfField = newField.getValues()
.stream()
@@ -142,8 +169,8 @@ public class IssueFieldChangeData extends IssueChangeData {
public Map<String, Group> getNewGroups() {
Map<String, Group> newGroups = new HashMap<>();
GroupManager groupManager = OneDev.getInstance(GroupManager.class);
- for (Input oldField: oldFields.values()) {
- Input newField = newFields.get(oldField.getName());
+ for (Input oldField: getOldFields().values()) {
+ Input newField = getNewFields().get(oldField.getName());
if (newField != null
&& !describe(oldField).equals(describe(newField))
&& newField.getType().equals(FieldSpec.GROUP)
@@ -153,8 +180,8 @@ public class IssueFieldChangeData extends IssueChangeData {
newGroups.put(newField.getName(), group);
}
}
- for (Input newField: newFields.values()) {
- if (!oldFields.containsKey(newField.getName())
+ for (Input newField: getNewFields().values()) {
+ if (!getOldFields().containsKey(newField.getName())
&& newField.getType().equals(FieldSpec.GROUP)
&& !newField.getValues().isEmpty()) {
Group group = groupManager.find(newField.getValues().iterator().next());