The Unified and Autonomous Development Platform
chore: Refactoring input param of issues
Robin Shen18a69b8b2595
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.javaindex 8cf956e0c1..450bed3dde 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.java@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.server.buildspec.param.spec.ParamSpec;-import io.onedev.server.util.Input;+import io.onedev.server.buildspecmodel.inputspec.Input;public class ParamCombination implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.javaindex ff920fd809..b52e7529a1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.model.Build;-import io.onedev.server.util.Input;+import io.onedev.server.buildspecmodel.inputspec.Input;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.javaindex 640b64519e..04762bb353 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java@@ -4,17 +4,18 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;+import javax.validation.constraints.NotEmpty;+import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.annotation.ChoiceProvider;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.model.Build;-import io.onedev.server.util.Input;-import io.onedev.server.annotation.ChoiceProvider;-import io.onedev.server.annotation.Editable;@Editable(name="Use value of specified parameter/secret")public class PassthroughValues implements ValuesProvider {diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 79e7cf9665..e984b635b6 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8201,6 +8201,16 @@ public class DataMigrator {autoMergeUserElement.detach();}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueChanges.xml")) {+ try {+ var content = FileUtils.readFileToString(file, UTF_8);+ content = StringUtils.replace(content,+ "io.onedev.server.util.Input",+ "io.onedev.server.buildspecmodel.inputspec.Input");+ FileUtils.writeStringToFile(file, content, UTF_8.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex bfde4a727a..c7c0c10765 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -113,7 +113,7 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;-import io.onedev.server.util.Input;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.concurrent.BatchWorkManager;diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.javaindex cd8210eb41..bb1e53eba0 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java@@ -1,6 +1,13 @@package io.onedev.server.event.project.issue;+import java.util.Collection;+import java.util.HashMap;+import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;+import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;@@ -8,17 +15,10 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.util.CommitAware;-import io.onedev.server.util.Input;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.commenttext.CommentText;import io.onedev.server.util.commenttext.MarkdownText;-import java.util.Collection;-import java.util.HashMap;-import java.util.Map;-import java.util.Set;-import java.util.stream.Collectors;-public class IssueOpened extends IssueEvent implements CommitAware {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 6f94816ac4..ad6948514a 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -76,6 +76,7 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.SecretInput;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.AccessTokenManager;@@ -94,7 +95,6 @@ import io.onedev.server.search.entity.SortField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.FilenameUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.criteria.Criteria;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 cceb0a8a59..900d76fa55 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@@ -71,6 +71,7 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.attachment.AttachmentStorageSupport;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -91,7 +92,6 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.IssueSortField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.Input;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.web.UrlManager;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.javaindex 3b61c3eb99..095423d001 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java@@ -7,7 +7,7 @@ import java.util.stream.Collectors;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Iteration;-import io.onedev.server.util.Input;+import io.onedev.server.buildspecmodel.inputspec.Input;public class IssueBatchUpdateData extends IssueFieldChangeData {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.javaindex ab2f5ef4b8..d9f1ab5390 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,6 +1,5 @@package io.onedev.server.model.support.issue.changedata;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -21,19 +20,15 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.notification.ActivityDetail;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Input;+import io.onedev.server.buildspecmodel.inputspec.Input;public class IssueFieldChangeData extends IssueChangeData {private static final long serialVersionUID = 1L;- protected final Map<String, Serializable> oldFields;+ protected final Map<String, Input> oldFields;- protected final Map<String, Serializable> newFields;-- private transient Map<String, Input> convertedOldFields;-- private transient Map<String, Input> convertedNewFields;+ protected final Map<String, Input> newFields;public IssueFieldChangeData(Map<String, Input> oldFields, Map<String, Input> newFields) {this.oldFields = copyNonEmptyFields(oldFields);@@ -41,33 +36,11 @@ public class IssueFieldChangeData extends IssueChangeData {}public Map<String, Input> getOldFields() {- 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;+ return oldFields;}public Map<String, Input> getNewFields() {- 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;+ return newFields;}private List<String> getDisplayValues(Input input) {@@ -94,20 +67,20 @@ public class IssueFieldChangeData extends IssueChangeData {public Map<String, String> getOldFieldValues() {Map<String, String> oldFieldValues = new LinkedHashMap<>();- for (Map.Entry<String, Input> entry: getOldFields().entrySet())+ for (Map.Entry<String, Input> entry: oldFields.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: getNewFields().entrySet())+ for (Map.Entry<String, Input> entry: newFields.entrySet())newFieldValues.put(entry.getKey(), StringUtils.join(getDisplayValues(entry.getValue())));return newFieldValues;}- private Map<String, Serializable> copyNonEmptyFields(Map<String, Input> fields) {- Map<String, Serializable> copy = new LinkedHashMap<>();+ private Map<String, Input> copyNonEmptyFields(Map<String, Input> fields) {+ Map<String, Input> copy = new LinkedHashMap<>();for (Map.Entry<String, Input> entry: fields.entrySet()) {if (!entry.getValue().getValues().isEmpty())copy.put(entry.getKey(), entry.getValue());@@ -135,8 +108,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: getOldFields().values()) {- Input newField = getNewFields().get(oldField.getName());+ for (Input oldField: oldFields.values()) {+ Input newField = newFields.get(oldField.getName());if (newField != null&& !describe(oldField).equals(describe(newField))&& newField.getType().equals(FieldSpec.USER)) {@@ -150,8 +123,8 @@ public class IssueFieldChangeData extends IssueChangeData {newUsers.put(newField.getName(), newUsersOfField);}}- for (Input newField: getNewFields().values()) {- if (!getOldFields().containsKey(newField.getName())+ for (Input newField: newFields.values()) {+ if (!oldFields.containsKey(newField.getName())&& newField.getType().equals(FieldSpec.USER)) {Set<User> usersOfField = newField.getValues().stream()@@ -169,8 +142,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: getOldFields().values()) {- Input newField = getNewFields().get(oldField.getName());+ for (Input oldField: oldFields.values()) {+ Input newField = newFields.get(oldField.getName());if (newField != null&& !describe(oldField).equals(describe(newField))&& newField.getType().equals(FieldSpec.GROUP)@@ -180,8 +153,8 @@ public class IssueFieldChangeData extends IssueChangeData {newGroups.put(newField.getName(), group);}}- for (Input newField: getNewFields().values()) {- if (!getOldFields().containsKey(newField.getName())+ for (Input newField: newFields.values()) {+ if (!oldFields.containsKey(newField.getName())&& newField.getType().equals(FieldSpec.GROUP)&& !newField.getValues().isEmpty()) {Group group = groupManager.find(newField.getValues().iterator().next());diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.javaindex a0a89a99e8..4d0c5f68d2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.changedata;import java.util.LinkedHashMap;import java.util.Map;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.Input;public class IssueStateChangeData extends IssueFieldChangeData {diff --git a/server-core/src/main/java/io/onedev/server/util/Input.java b/server-core/src/main/java/io/onedev/server/util/Input.javadeleted file mode 100644index 0c194fbfc1..0000000000--- a/server-core/src/main/java/io/onedev/server/util/Input.java+++ /dev/null@@ -1,94 +0,0 @@-package io.onedev.server.util;--import java.io.Serializable;-import java.util.List;--import javax.annotation.Nullable;-import javax.validation.ValidationException;--import org.apache.commons.lang3.builder.EqualsBuilder;-import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.buildspecmodel.inputspec.SecretInput;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;--public class Input implements Serializable {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(Input.class);-- private final String name;-- private final String type;-- private final List<String> values;-- public Input(String name, String type, List<String> values) {- this.name = name;- this.type = type;- this.values = values;- }-- public String getName() {- return name;- }-- public String getType() {- return type;- }-- public List<String> getValues() {- return values;- }-- @Override- public boolean equals(Object other) {- if (this == other) {- return true;- } else if (other instanceof Input) {- Input otherField = (Input) other;- return new EqualsBuilder()- .append(getName(), otherField.getName())- .append(getType(), otherField.getType())- .append(getValues(), otherField.getValues())- .isEquals();- } else {- return false;- }- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37)- .append(getName())- .append(getType())- .append(getValues())- .toHashCode();- }-- @Nullable- public Object getTypedValue(@Nullable InputSpec inputSpec) {- if (inputSpec != null) {- try {- return inputSpec.convertToObject(getValues());- } catch (ValidationException e) {- String displayValue;- if (type.equals(FieldSpec.SECRET))- displayValue = SecretInput.MASK;- else- displayValue = "" + getValues();-- logger.error("Error converting input (name: {}, value: {}, error: {})",- getName(), displayValue, e.getMessage());- return null;- }- } else {- return null;- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.javaindex 9f10088fe4..ca1fd726af 100644--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java@@ -1,29 +1,34 @@package io.onedev.server.util.interpolative;+import static io.onedev.k8shelper.KubernetesHelper.ATTRIBUTES;+import static io.onedev.k8shelper.KubernetesHelper.PAUSE;+import static io.onedev.k8shelper.KubernetesHelper.PLACEHOLDER_PREFIX;+import static io.onedev.k8shelper.KubernetesHelper.PLACEHOLDER_SUFFIX;+import static io.onedev.k8shelper.KubernetesHelper.WORKSPACE;+import static io.onedev.server.web.translation.Translation._T;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Map.Entry;+import java.util.function.Function;++import javax.annotation.Nullable;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.JobVariable;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.model.Build;import io.onedev.server.model.support.build.JobProperty;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.interpolative.Interpolative.Segment;import io.onedev.server.util.interpolative.Interpolative.Segment.Type;import io.onedev.server.web.editable.EditableStringTransformer;-import javax.annotation.Nullable;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.Map.Entry;-import java.util.function.Function;--import static io.onedev.k8shelper.KubernetesHelper.*;-import static io.onedev.server.web.translation.Translation._T;-public class VariableInterpolator {public static final String PREFIX_PARAM = "param:";diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.javaindex 9a26556478..01a41376a3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java@@ -7,9 +7,9 @@ import org.apache.wicket.model.Model;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.SecretInput;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Input;public class ParamValuesLabel extends Label {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 164c7d6e57..846ba3243f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -54,6 +54,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.entitymanager.AuditManager;import io.onedev.server.entitymanager.BuildManager;@@ -77,7 +78,6 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.RunJob;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Input;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.BuildQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 74460d7db1..a41aa70579 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -33,6 +33,7 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.entitymanager.BuildLabelManager;import io.onedev.server.entityreference.EntityReference;import io.onedev.server.git.BlobIdent;@@ -43,7 +44,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.ChangeObserver;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 44e3086838..0ef4326a2f 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@@ -29,6 +29,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.buildspecmodel.inputspec.SecretInput;@@ -57,7 +58,6 @@ import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;-import io.onedev.server.util.Input;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;import io.onedev.server.web.component.MultilineLabel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 0ac7acdb7b..07e92c03ed 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -76,6 +76,7 @@ import com.google.common.collect.Sets;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.entitymanager.AuditManager;import io.onedev.server.entitymanager.IssueLinkManager;@@ -106,7 +107,6 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.timetracking.TimeTrackingManager;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.LinkDescriptor;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.facade.ProjectCache;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 17bf47d89c..a4fca5807e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -46,6 +46,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueVoteManager;import io.onedev.server.entitymanager.IssueWatchManager;@@ -63,7 +64,6 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.Similarities;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 0a36569d0b..d2f3efd2bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -32,6 +32,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.hibernate.Hibernate;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.entitymanager.IssueLinkManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;@@ -40,7 +41,6 @@ import io.onedev.server.model.Iteration;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.util.Input;import io.onedev.server.util.LinkDescriptor;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex b34d549768..e07e34d801 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -37,6 +37,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.entitymanager.IssueLinkManager;import io.onedev.server.entitymanager.IssueManager;@@ -50,7 +51,6 @@ import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.Input;import io.onedev.server.util.LinkDescriptor;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.behavior.ChangeObserver;