The Unified and Autonomous Development Platform
feat: Able to assign multiple roles to project authorization (OD-2336)
Robin Shen0e0eaebed09b
diff --git a/server-core/src/main/java/io/onedev/server/annotation/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/annotation/ChoiceProvider.javaindex fcb2e5bb0c..369adc601b 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ChoiceProvider.java@@ -10,6 +10,10 @@ import java.lang.annotation.Target;public @interface ChoiceProvider {String value();++ String displayNames() default "";++ String descriptions() default "";boolean tagsMode() default false;diff --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 065ba798dc..276fd57cf7 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@@ -41,9 +41,7 @@ public abstract class InputSpec implements Serializable {public static final String INTEGER = "Integer";public static final String FLOAT = "Float";-- public static final String WORKING_PERIOD = "Working Period";-+public static final String COMMIT = "Commit";public static final String ENUMERATION = "Enumeration";diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.javaindex dedde22f51..0b3445e8f3 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java@@ -1,20 +1,17 @@package io.onedev.server.entitymanager;+import java.util.Collection;+import io.onedev.server.model.Project;-import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.dao.EntityManager;-import java.util.Collection;-public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {void syncAuthorizations(User user, Collection<UserAuthorization> authorizations);void syncAuthorizations(Project project, Collection<UserAuthorization> authorizations);-- void authorize(User user, Project project, Role role);void createOrUpdate(UserAuthorization authorization);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenAuthorizationManager.javaindex 1dfddbe9e5..a8ea65204e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenAuthorizationManager.java@@ -27,10 +27,10 @@ public class DefaultAccessTokenAuthorizationManager extends BaseEntityManager<Acvar authorization = it.next();boolean found = false;for (var newAuthorization: authorizations) {- if (newAuthorization.getProject().equals(authorization.getProject())) {+ if (newAuthorization.getProject().equals(authorization.getProject())+ && newAuthorization.getRole().equals(authorization.getRole())) {found = true;- authorization.setRole(newAuthorization.getRole());- dao.persist(authorization);+ break;}}if (!found) {@@ -42,7 +42,8 @@ public class DefaultAccessTokenAuthorizationManager extends BaseEntityManager<Acfor (var newAuthorization: authorizations) {boolean found = false;for (var authorization: token.getAuthorizations()) {- if (authorization.getProject().equals(newAuthorization.getProject())) {+ if (authorization.getProject().equals(newAuthorization.getProject())+ && authorization.getRole().equals(newAuthorization.getRole())) {found = true;break;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javaindex a19a11e524..6861785ba6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java@@ -1,5 +1,11 @@package io.onedev.server.entitymanager.impl;+import java.util.Collection;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;@@ -8,12 +14,6 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.Collection;-import java.util.Iterator;-import java.util.List;-@Singletonpublic class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAuthorization>implements GroupAuthorizationManager {@@ -26,14 +26,14 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut@Transactional@Overridepublic void syncAuthorizations(Group group, Collection<GroupAuthorization> authorizations) {- for (Iterator<GroupAuthorization> it = group.getAuthorizations().iterator(); it.hasNext();) {- GroupAuthorization authorization = it.next();- boolean found = false;- for (GroupAuthorization newAuthorization: authorizations) {- if (newAuthorization.getProject().equals(authorization.getProject())) {+ for (var it = group.getAuthorizations().iterator(); it.hasNext();) {+ var authorization = it.next();+ var found = false;+ for (var newAuthorization: authorizations) {+ if (newAuthorization.getProject().equals(authorization.getProject())+ && newAuthorization.getRole().equals(authorization.getRole())) {found = true;- authorization.setRole(newAuthorization.getRole());- dao.persist(authorization);+ break;}}if (!found) {@@ -42,10 +42,11 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut}}- for (GroupAuthorization newAuthorization: authorizations) {- boolean found = false;- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (authorization.getProject().equals(newAuthorization.getProject())) {+ for (var newAuthorization: authorizations) {+ var found = false;+ for (var authorization: group.getAuthorizations()) {+ if (authorization.getProject().equals(newAuthorization.getProject())+ && authorization.getRole().equals(newAuthorization.getRole())) {found = true;break;}@@ -60,14 +61,14 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut@Transactional@Overridepublic void syncAuthorizations(Project project, Collection<GroupAuthorization> authorizations) {- for (Iterator<GroupAuthorization> it = project.getGroupAuthorizations().iterator(); it.hasNext();) {- GroupAuthorization authorization = it.next();- boolean found = false;- for (GroupAuthorization newAuthorization: authorizations) {- if (newAuthorization.getGroup().equals(authorization.getGroup())) {+ for (var it = project.getGroupAuthorizations().iterator(); it.hasNext();) {+ var authorization = it.next();+ var found = false;+ for (var newAuthorization: authorizations) {+ if (newAuthorization.getGroup().equals(authorization.getGroup())+ && newAuthorization.getRole().equals(authorization.getRole())) {found = true;- authorization.setRole(newAuthorization.getRole());- dao.persist(authorization);+ break;}}if (!found) {@@ -76,10 +77,11 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut}}- for (GroupAuthorization newAuthorization: authorizations) {- boolean found = false;- for (GroupAuthorization authorization: project.getGroupAuthorizations()) {- if (authorization.getGroup().equals(newAuthorization.getGroup())) {+ for (var newAuthorization: authorizations) {+ var found = false;+ for (var authorization: project.getGroupAuthorizations()) {+ if (authorization.getGroup().equals(newAuthorization.getGroup())+ && authorization.getRole().equals(newAuthorization.getRole())) {found = true;break;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.javaindex 8ab4a38299..f29fd6d2bb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java@@ -1,20 +1,19 @@package io.onedev.server.entitymanager.impl;+import java.util.Collection;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.model.Project;-import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.Collection;-import java.util.Iterator;-import java.util.List;-@Singletonpublic class DefaultUserAuthorizationManager extends BaseEntityManager<UserAuthorization>implements UserAuthorizationManager {@@ -27,14 +26,14 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho@Transactional@Overridepublic void syncAuthorizations(User user, Collection<UserAuthorization> authorizations) {- for (Iterator<UserAuthorization> it = user.getProjectAuthorizations().iterator(); it.hasNext();) {- UserAuthorization authorization = it.next();- boolean found = false;- for (UserAuthorization newAuthorization: authorizations) {- if (newAuthorization.getProject().equals(authorization.getProject())) {+ for (var it = user.getProjectAuthorizations().iterator(); it.hasNext();) {+ var authorization = it.next();+ var found = false;+ for (var newAuthorization: authorizations) {+ if (newAuthorization.getProject().equals(authorization.getProject())+ && newAuthorization.getRole().equals(authorization.getRole())) {found = true;- authorization.setRole(newAuthorization.getRole());- dao.persist(authorization);+ break;}}if (!found) {@@ -43,10 +42,11 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho}}- for (UserAuthorization newAuthorization: authorizations) {- boolean found = false;- for (UserAuthorization authorization: user.getProjectAuthorizations()) {- if (authorization.getProject().equals(newAuthorization.getProject())) {+ for (var newAuthorization: authorizations) {+ var found = false;+ for (var authorization: user.getProjectAuthorizations()) {+ if (authorization.getProject().equals(newAuthorization.getProject())+ && authorization.getRole().equals(newAuthorization.getRole())) {found = true;break;}@@ -71,14 +71,14 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho@Transactional@Overridepublic void syncAuthorizations(Project project, Collection<UserAuthorization> authorizations) {- for (Iterator<UserAuthorization> it = project.getUserAuthorizations().iterator(); it.hasNext();) {- UserAuthorization authorization = it.next();- boolean found = false;- for (UserAuthorization newAuthorization: authorizations) {- if (newAuthorization.getUser().equals(authorization.getUser())) {+ for (var it = project.getUserAuthorizations().iterator(); it.hasNext();) {+ var authorization = it.next();+ var found = false;+ for (var newAuthorization: authorizations) {+ if (newAuthorization.getUser().equals(authorization.getUser())+ && newAuthorization.getRole().equals(authorization.getRole())) {found = true;- authorization.setRole(newAuthorization.getRole());- dao.persist(authorization);+ break;}}if (!found) {@@ -87,10 +87,11 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho}}- for (UserAuthorization newAuthorization: authorizations) {- boolean found = false;- for (UserAuthorization authorization: project.getUserAuthorizations()) {- if (authorization.getUser().equals(newAuthorization.getUser())) {+ for (var newAuthorization: authorizations) {+ var found = false;+ for (var authorization: project.getUserAuthorizations()) {+ if (authorization.getUser().equals(newAuthorization.getUser())+ && authorization.getRole().equals(newAuthorization.getRole())) {found = true;break;}@@ -102,19 +103,6 @@ public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAutho}}- @Transactional- @Override- public void authorize(User user, Project project, Role role) {- var authorization = user.getProjectAuthorizations().stream().filter(it->it.getProject().equals(project)).findFirst().orElse(null);- if (authorization == null) {- authorization = new UserAuthorization();- authorization.setUser(user);- authorization.setProject(project);- }- authorization.setRole(role);- dao.persist(authorization);- }-@Transactional@Overridepublic void createOrUpdate(UserAuthorization authorization) {diff --git a/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java b/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.javaindex ea3f1dfe25..4a6670f5d4 100644--- a/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java@@ -8,7 +8,7 @@ import javax.persistence.*;@Entity@Table(indexes={@Index(columnList="o_token_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_token_id", "o_project_id"})+ uniqueConstraints={@UniqueConstraint(columnNames={"o_token_id", "o_project_id", "o_role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class AccessTokenAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.javaindex 4e374688a3..e510684990 100644--- a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java@@ -14,7 +14,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(indexes={@Index(columnList="o_group_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_project_id"})+ uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_project_id", "o_role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class GroupAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex eeac3feecf..6ab0f22f49 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -90,7 +90,11 @@ public class Role extends AbstractEntity implements BasePermission {@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();-++ @OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<AccessTokenAuthorization> accessTokenAuthorizations = new ArrayList<>();+@OneToMany(mappedBy=LinkAuthorization.PROP_ROLE, cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<LinkAuthorization> linkAuthorizations = new ArrayList<>();@@ -256,7 +260,7 @@ public class Role extends AbstractEntity implements BasePermission {@Editable(order=625, placeholder="None", description="Optionally specify issue links allowed to edit")@ShowCondition("isManageIssuesDisabled")- @ChoiceProvider("getIssueLinkChoices")+ @ChoiceProvider(value="getIssueLinkChoices", displayNames = "getIssueLinkDisplayNames")public List<String> getEditableIssueLinks() {return editableIssueLinks;}@@ -265,8 +269,7 @@ public class Role extends AbstractEntity implements BasePermission {this.editableIssueLinks = editableIssueLinks;}- @SuppressWarnings("unused")- private static Map<String, String> getIssueLinkChoices() {+ private static Map<String, String> getIssueLinkDisplayNames() {Map<String, String> choices = new LinkedHashMap<>();for (LinkSpec link: OneDev.getInstance(LinkSpecManager.class).queryAndSort()) {if (link.getOpposite() != null)@@ -277,6 +280,11 @@ public class Role extends AbstractEntity implements BasePermission {return choices;}+ @SuppressWarnings("unused")+ private static List<String> getIssueLinkChoices() {+ return new ArrayList<>(getIssueLinkDisplayNames().keySet());+ }+@Editable(order=650, name="Build Management", description="Build administrative permission for all jobs inside a project, "+ "including batch operations over multiple builds")@ShowCondition("isManageProjectDisabled")diff --git a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.javaindex dade5a26b7..76932f9881 100644--- a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java@@ -14,14 +14,13 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_project_id"})+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_project_id", "o_role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class UserAuthorization extends AbstractEntity {private static final long serialVersionUID = 1L;--+public static String PROP_USER = "user";public static String PROP_ROLE = "role";diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex c0443a4745..9349bfd51e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -111,7 +111,7 @@ public class BoardSpec implements Serializable {@Editable(order=400, name="Board Columns", description="Specify columns of the board. "+ "Each column corresponds to a value of the issue field specified above")@Size(min=2, message="At least two columns need to be defined")- @ChoiceProvider("getColumnChoices")+ @ChoiceProvider(value="getColumnChoices", displayNames="getColumnDisplayNames")public List<String> getEditColumns() {if (editColumns == null)editColumns = new ArrayList<>();@@ -211,8 +211,7 @@ public class BoardSpec implements Serializable {return choices;}- @SuppressWarnings("unused")- private static Map<String, String> getColumnChoices() {+ private static Map<String, String> getColumnDisplayNames() {Map<String, String> choices = new LinkedHashMap<>();String fieldName = (String) EditContext.get().getInputValue("identifyField");if (Issue.NAME_STATE.equals(fieldName)) {@@ -229,6 +228,11 @@ public class BoardSpec implements Serializable {}return choices;}++ @SuppressWarnings("unused")+ private static List<String> getColumnChoices() {+ return new ArrayList<>(getColumnDisplayNames().keySet());+ }private static GlobalIssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.javaindex a022944cb0..01433200ac 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java@@ -1,31 +1,39 @@package io.onedev.server.model.support.issue.transitionspec;-import edu.emory.mathcs.backport.java.util.Collections;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.IssueQuery;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.RoleManager;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.Membership;+import io.onedev.server.model.Project;+import io.onedev.server.model.Role;+import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import javax.annotation.Nullable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;-import java.util.Map;@Editable(order=100, name="Transit manually")public class ManualSpec extends TransitionSpec {@@ -54,7 +62,7 @@ public class ManualSpec extends TransitionSpec {}@Editable(order=200, placeholder = "Any user", description="Optionally specify authorized roles to press this button. If not specified, all users are allowed")- @ChoiceProvider("getRoleChoices")+ @ChoiceProvider(value="getRoleChoices", descriptions="getRoleDescriptions")public List<String> getAuthorizedRoles() {return authorizedRoles;}@@ -63,18 +71,24 @@ public class ManualSpec extends TransitionSpec {this.authorizedRoles = authorizedRoles;}- @SuppressWarnings("unused")- private static List<String> getRoleChoices() {- List<String> choices = new ArrayList<>();+ private static Map<String, String> getRoleDescriptions() {+ Map<String, String> descriptions = new HashMap<>();for (Role role: OneDev.getInstance(RoleManager.class).query())- choices.add(role.getName());- Collections.sort(choices);- choices.add(ROLE_SUBMITTER);+ descriptions.put(role.getName(), role.getDescription());+ descriptions = CollectionUtils.sortByKey(descriptions);+ descriptions.put(ROLE_SUBMITTER, "user opening the issue");for (FieldSpec field: getIssueSetting().getFieldSpecs()) {- if (field instanceof UserChoiceField || field instanceof GroupChoiceField)- choices.add("{" + field.getName()+ "}");+ if (field instanceof UserChoiceField)+ descriptions.put("{" + field.getName()+ "}", "user associated with this field");+ else if (field instanceof GroupChoiceField)+ descriptions.put("{" + field.getName()+ "}", "group associated with this field");}- return choices;+ return descriptions;+ }++ @SuppressWarnings("unused")+ private static List<String> getRoleChoices() {+ return new ArrayList<>(getRoleDescriptions().keySet());}@Editable(order=500, placeholder="No fields to prompt", description="Optionally select fields "diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 0cb042f0ab..ab4e5d5a71 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -696,7 +696,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {var userManager = OneDev.getInstance(UserManager.class);UserCache cacheClone = userManager.cloneCache();- Collection<User> authorizedUsers = Sets.newHashSet(userManager.getRoot());+ Collection<User> authorizedUsers = Set.of(userManager.getRoot());Group defaultLoginGroup = getSettingManager().getSecuritySetting().getDefaultLoginGroup();if (defaultLoginGroup != null && defaultLoginGroup.isAdministrator())diff --git a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.javaindex e207748617..22c5b1b2d1 100644--- a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java@@ -1,8 +1,14 @@package io.onedev.server.util;-import com.google.common.base.Preconditions;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;-import java.util.*;+import com.google.common.base.Preconditions;public class CollectionUtils extends org.apache.commons.collections.CollectionUtils {@@ -35,6 +41,17 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt}return list;}++ public static <K extends Comparable<? super K>, V> Map<K, V> sortByKey(Map<K, V> map) {+ List<Map.Entry<K, V>> list = new ArrayList<>(map.entrySet());+ list.sort(Map.Entry.comparingByKey());++ Map<K, V> sorted = new LinkedHashMap<>();+ for (Map.Entry<K, V> entry : list)+ sorted.put(entry.getKey(), entry.getValue());++ return sorted;+ }public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {List<Map.Entry<K, V>> list = new ArrayList<>(map.entrySet());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 ac0bc9182b..63ad14d899 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@@ -1,7 +1,7 @@package io.onedev.server.web.component.branch.choice;import java.util.Collection;-import java.util.Map;+import java.util.List;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -13,7 +13,7 @@ import io.onedev.server.web.component.stringchoice.StringChoiceProvider;public class BranchMultiChoice extends Select2MultiChoice<String> {public BranchMultiChoice(String id, IModel<Collection<String>> model,- IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ IModel<List<String>> choicesModel, boolean tagsMode) {super(id, model, new StringChoiceProvider(choicesModel, tagsMode));}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 aaad9a4b2d..e498661ffb 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@@ -1,6 +1,6 @@package io.onedev.server.web.component.branch.choice;-import java.util.Map;+import java.util.List;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -12,7 +12,7 @@ import io.onedev.server.web.component.stringchoice.StringChoiceProvider;public class BranchSingleChoice extends Select2Choice<String> {public BranchSingleChoice(String id, IModel<String> model,- IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ IModel<List<String>> choicesModel, boolean tagsMode) {super(id, model, new StringChoiceProvider(choicesModel, tagsMode));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.javaindex e5f710a7fd..7e1074ee26 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java@@ -5,13 +5,12 @@ import static io.onedev.server.search.entity.build.BuildQueryLexer.IsUntil;import static java.util.stream.Collectors.toList;import java.util.ArrayList;+import java.util.Arrays;import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;@@ -102,16 +101,13 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (Build.Status status: Build.Status.values()) {- map.put(status.name(), status.name());- }- return map;+ protected List<String> load() {+ return Arrays.stream(Build.Status.values()).map(it->it.name()).collect(toList());}+}, false);statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -142,17 +138,13 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();+ protected List<String> load() {var jobNames = new ArrayList<>(getBuildManager().getAccessibleJobNames(getProject()));Collections.sort(jobNames);- for (String jobName: jobNames) {- map.put(jobName, jobName);- }- return map;+ return jobNames;}}, false) {@@ -241,17 +233,13 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {+ protected List<String> load() {var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());Collections.sort(names);- var map = new LinkedHashMap<String, String>();- for (String name: names) {- map.put(name, name);- }- return map;+ return names;}}, false);@@ -284,17 +272,13 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();+ protected List<String> load() {var agents = new ArrayList<>(getAgentManager().query());agents.sort(Comparator.comparing(Agent::getName));- for (Agent agent: agents) {- map.put(agent.getName(), agent.getName());- }- return map;+ return agents.stream().map(it->it.getName()).collect(toList());}}, false);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 68f03f6d1d..e6c4bd18ad 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@@ -4,6 +4,7 @@ import static io.onedev.server.model.Build.SORT_FIELDS;import java.util.ArrayList;import java.util.Collection;+import java.util.Collections;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;@@ -737,14 +738,13 @@ public abstract class BuildListPanel extends Panel {listParams = new ArrayList<>(object);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- for (String fieldName: OneDev.getInstance(BuildParamManager.class).getParamNames(getProject()))- choices.put(fieldName, fieldName);- return choices;+ protected List<String> load() {+ var paramNames = new ArrayList<>(OneDev.getInstance(BuildParamManager.class).getParamNames(getProject()));+ Collections.sort(paramNames);+ return paramNames;}}, false));diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.javaindex 4c3f9b69c9..60f657c678 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java@@ -7,9 +7,7 @@ import static java.util.stream.Collectors.toList;import java.util.ArrayList;import java.util.Collection;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;@@ -75,14 +73,11 @@ class CodeCommentFilterPanel extends FilterEditPanel<CodeComment> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- map.put("Unresolved", "Unresolved");- map.put("Resolved", "Resolved");- return map;+ protected List<String> load() {+ return List.of("Unresolved", "Resolved");}}, false);statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.javaindex b9951fe76c..e7a691c625 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java@@ -6,9 +6,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Collections;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -171,15 +169,11 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (var file: OneDev.getInstance(CommitInfoManager.class).getFiles(getProject().getId())) {- map.put(file, file);- }- return map;+ protected List<String> load() {+ return OneDev.getInstance(CommitInfoManager.class).getFiles(getProject().getId());}}, true);fileChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -254,23 +248,15 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();+ protected List<String> load() {if (type == Revision.Type.BRANCH) {- for (var ref: getProject().getBranchRefs()) {- var branch = GitUtils.ref2branch(ref.getName());- map.put(branch, branch);- }+ return getProject().getBranchRefs().stream().map(it->GitUtils.ref2branch(it.getName())).collect(toList());} else {- for (var ref: getProject().getTagRefs()) {- var tag = GitUtils.ref2tag(ref.getName());- map.put(tag, tag);- }+ return getProject().getTagRefs().stream().map(it->GitUtils.ref2tag(it.getName())).collect(toList());}- return map;}}, false);choice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -337,23 +323,19 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> map = new LinkedHashMap<>();- var commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- var users = commitInfoManager.getUsers(getProject().getId());- for (var user: users) {+ protected List<String> load() {+ var users = OneDev.getInstance(CommitInfoManager.class).getUsers(getProject().getId());+ return users.stream().map(it-> {String content;- if (StringUtils.isNotBlank(user.getEmailAddress()))- content = user.getName() + " <" + user.getEmailAddress() + ">";+ if (StringUtils.isNotBlank(it.getEmailAddress()))+ content = it.getName() + " <" + it.getEmailAddress() + ">";else- content = user.getName() + " <>";- content = content.trim();- map.put(content, content);- }- return map;+ content = it.getName() + " <>";+ return content.trim();+ }).collect(toList());}}, false);choice.add(new AjaxFormComponentUpdatingBehavior("change") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.javaindex 3f0ec12ffc..331e1e1b0f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java@@ -8,12 +8,9 @@ import static java.util.stream.Collectors.toList;import java.util.ArrayList;import java.util.Collection;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;-import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -52,7 +49,6 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.search.entity.issue.SubmittedByCriteria;import io.onedev.server.search.entity.issue.SubmittedByUserCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -93,15 +89,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (var stateSpec: issueSetting.getStateSpecs()) {- map.put(stateSpec.getName(), stateSpec.getName());- }- return map;+ protected List<String> load() {+ return issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(toList());}}, false);@@ -142,15 +134,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {-+ }, new LoadableDetachableModel<List<String>>() {+@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (var value: choiceValues) {- map.put(value, value);- }- return map;+ protected List<String> load() {+ return choiceValues;}}, false);@@ -301,13 +289,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- return CollectionUtils.newLinkedHashMap(- String.valueOf(true), String.valueOf(true),- String.valueOf(false), String.valueOf(false));+ protected List<String> load() {+ return List.of(String.valueOf(true), String.valueOf(false));}}, false);@@ -392,15 +378,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (var iteration: getProject().getSortedHierarchyIterations()) {- map.put(iteration.getName(), iteration.getName());- }- return map;+ protected List<String> load() {+ return getProject().getSortedHierarchyIterations().stream().map(it->it.getName()).collect(toList());}}, false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.javaindex c4aa58cd02..d0ca251bca 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java@@ -34,7 +34,7 @@ public class BurndownIndicators {choices.add(ISSUE_COUNT);choices.addAll(getIssueSetting().getFieldSpecs().stream()- .filter(it -> it.getType().equals(InputSpec.INTEGER) || it.getType().equals(InputSpec.WORKING_PERIOD))+ .filter(it -> it.getType().equals(InputSpec.INTEGER)).map(FieldSpec::getName).collect(toList()));return choices;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 ad60b77b58..132c407660 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@@ -1,7 +1,7 @@package io.onedev.server.web.component.job;import java.util.Collection;-import java.util.Map;+import java.util.List;import org.apache.wicket.model.IModel;@@ -12,7 +12,7 @@ public class JobMultiChoice extends Select2MultiChoice<String> {private static final long serialVersionUID = 1L;- public JobMultiChoice(String id, IModel<Collection<String>> model, IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ public JobMultiChoice(String id, IModel<Collection<String>> model, IModel<List<String>> choicesModel, boolean tagsMode) {super(id, model, new StringChoiceProvider(choicesModel, tagsMode));}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 d89ee9674c..54e13c9ba6 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@@ -1,6 +1,6 @@package io.onedev.server.web.component.job;-import java.util.Map;+import java.util.List;import org.apache.wicket.model.IModel;@@ -11,7 +11,7 @@ public class JobSingleChoice extends Select2Choice<String> {private static final long serialVersionUID = 1L;- public JobSingleChoice(String id, IModel<String> model, IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ public JobSingleChoice(String id, IModel<String> model, IModel<List<String>> choicesModel, boolean tagsMode) {super(id, model, new StringChoiceProvider(choicesModel, tagsMode));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.javaindex cb1adb1f85..84334091d3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java@@ -8,9 +8,7 @@ import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;@@ -31,9 +29,9 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pack.LabelCriteria;import io.onedev.server.search.entity.pack.PackQueryLexer;import io.onedev.server.search.entity.pack.PublishDateCriteria;-import io.onedev.server.search.entity.pack.PublishedViaProjectCriteria;-import io.onedev.server.search.entity.pack.PublishedByUserCriteria;import io.onedev.server.search.entity.pack.PublishedByCriteria;+import io.onedev.server.search.entity.pack.PublishedByUserCriteria;+import io.onedev.server.search.entity.pack.PublishedViaProjectCriteria;import io.onedev.server.search.entity.pack.TypeCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;@@ -75,17 +73,13 @@ class PackFilterPanel extends FilterEditPanel<Pack> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- List<PackSupport> packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));+ protected List<String> load() {+ var packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));packSupports.sort(Comparator.comparing(PackSupport::getOrder));- for (var packSupport: packSupports) {- map.put(packSupport.getPackType(), packSupport.getPackType());- }- return map;+ return packSupports.stream().map(it->it.getPackType()).collect(toList());}}, false);typeChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -214,17 +208,13 @@ class PackFilterPanel extends FilterEditPanel<Pack> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {+ protected List<String> load() {var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());Collections.sort(names);- var map = new LinkedHashMap<String, String>();- for (String name: names) {- map.put(name, name);- }- return map;+ return names;}}, false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.javaindex fa9244c6e8..23506b3eb5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java@@ -9,9 +9,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Collections;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;@@ -281,17 +279,13 @@ class ProjectFilterPanel extends FilterEditPanel<Project> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {+ protected List<String> load() {var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());Collections.sort(names);- var map = new LinkedHashMap<String, String>();- for (String name: names) {- map.put(name, name);- }- return map;+ return names;}}, false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.javaindex 2c134b40ff..90b739d8f6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java@@ -6,12 +6,11 @@ import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.Iimport static java.util.stream.Collectors.toList;import java.util.ArrayList;+import java.util.Arrays;import java.util.Collection;import java.util.Collections;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Objects;import java.util.function.Predicate;@@ -83,15 +82,11 @@ class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- for (PullRequest.Status status: PullRequest.Status.values()) {- map.put(status.name(), status.name());- }- return map;+ protected List<String> load() {+ return Arrays.stream(PullRequest.Status.values()).map(it->it.name()).collect(toList());}}, false);statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -221,17 +216,13 @@ class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {+ protected List<String> load() {var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());Collections.sort(names);- var map = new LinkedHashMap<String, String>();- for (String name: names) {- map.put(name, name);- }- return map;+ return names;}}, false) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/rolechoice/role-choice.js b/server-core/src/main/java/io/onedev/server/web/component/rolechoice/role-choice.jsindex d254793b32..3b2cfe8ad0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/rolechoice/role-choice.js+++ b/server-core/src/main/java/io/onedev/server/web/component/rolechoice/role-choice.js@@ -4,7 +4,7 @@ onedev.server.roleChoiceFormatter = {},formatResult: function(role) {- return role.name + (role.description ? " <span class='text-muted font-size-sm'>" + role.description + "</span>" : "");+ return role.name + (role.description ? " <span class='text-muted font-size-sm ml-1'>" + role.description + "</span>" : "");},escapeMarkup: function(m) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.javaindex 4081a2c142..d10af2a0f5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java@@ -2,11 +2,13 @@ package io.onedev.server.web.component.stringchoice;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.List;import java.util.Map;import org.apache.commons.lang.StringUtils;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;import org.json.JSONException;import org.json.JSONWriter;@@ -22,34 +24,60 @@ public class StringChoiceProvider extends ChoiceProvider<String> {public static final String SPECIAL_CHOICE_PREFIX = "<$OneDevSpecialChoice$>";- private final IModel<Map<String, String>> choicesModel;-+ private final IModel<List<String>> choicesModel;++ private final IModel<Map<String, String>> displayNamesModel;++ private final IModel<Map<String, String>> descriptionsModel;+private final boolean tagsMode;- public StringChoiceProvider(IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ public StringChoiceProvider(+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ IModel<Map<String, String>> descriptionsModel,+ boolean tagsMode) {this.choicesModel = choicesModel;+ this.displayNamesModel = displayNamesModel;+ this.descriptionsModel = descriptionsModel;this.tagsMode = tagsMode;}++ public StringChoiceProvider(+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ boolean tagsMode) {+ this(choicesModel, displayNamesModel, Model.ofMap(new HashMap<>()), tagsMode);+ }++ public StringChoiceProvider(IModel<List<String>> choicesModel, boolean tagsMode) {+ this(choicesModel, Model.ofMap(new HashMap<>()), Model.ofMap(new HashMap<>()), tagsMode);+ }@Overridepublic void detach() {choicesModel.detach();+ displayNamesModel.detach();+ descriptionsModel.detach();super.detach();}@Overridepublic void toJson(String choice, JSONWriter writer) throws JSONException {- String name = choicesModel.getObject().get(choice);+ var name = displayNamesModel.getObject().get(choice);if (name == null)name = choice;writer.key("id").value(choice).key("name").value(name);+ var description = descriptionsModel.getObject().get(choice);+ if (description != null)+ writer.key("description").value(description);}@Overridepublic Collection<String> toChoices(Collection<String> ids) {Collection<String> choices = new ArrayList<>(ids);if (!tagsMode)- choices.retainAll(choicesModel.getObject().keySet());+ choices.retainAll(choicesModel.getObject());return choices;}@@ -57,14 +85,14 @@ public class StringChoiceProvider extends ChoiceProvider<String> {public void query(String term, int page, Response<String> response) {List<String> similarities;if (StringUtils.isNotBlank(term)) {- Map<String, String> choices = choicesModel.getObject();- similarities = new Similarities<String>(choices.keySet()) {+ List<String> choices = choicesModel.getObject();+ similarities = new Similarities<String>(choices) {private static final long serialVersionUID = 1L;@Overridepublic double getSimilarScore(String object) {- return Similarities.getSimilarScore(choices.get(object), term);+ return Similarities.getSimilarScore(object, term);}};@@ -72,7 +100,7 @@ public class StringChoiceProvider extends ChoiceProvider<String> {if (tagsMode && !similarities.contains(term))similarities.add(term);} else {- similarities = new ArrayList<>(choicesModel.getObject().keySet());+ similarities = new ArrayList<>(choicesModel.getObject());}new ResponseFiller<String>(response).fill(similarities, page, WebConstants.PAGE_SIZE);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.javaindex 02791ff6d8..6d7715672c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.stringchoice;import java.util.Collection;+import java.util.List;import java.util.Map;import org.apache.wicket.model.IModel;@@ -9,8 +10,30 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;public class StringMultiChoice extends Select2MultiChoice<String> {- public StringMultiChoice(String id, IModel<Collection<String>> selectionsModel,- IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ public StringMultiChoice(+ String id,+ IModel<Collection<String>> selectionsModel,+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ IModel<Map<String, String>> descriptionsModel,+ boolean tagsMode) {+ super(id, selectionsModel, new StringChoiceProvider(choicesModel, displayNamesModel, descriptionsModel, tagsMode));+ }++ public StringMultiChoice(+ String id,+ IModel<Collection<String>> selectionsModel,+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ boolean tagsMode) {+ super(id, selectionsModel, new StringChoiceProvider(choicesModel, displayNamesModel, tagsMode));+ }++ public StringMultiChoice(+ String id,+ IModel<Collection<String>> selectionsModel,+ IModel<List<String>> choicesModel,+ boolean tagsMode) {super(id, selectionsModel, new StringChoiceProvider(choicesModel, tagsMode));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.javaindex d431fe8464..9c19ef657f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java@@ -17,16 +17,20 @@ import java.util.*;public class StringRadioChoice extends FormComponentPanel<String> {- private final IModel<Map<String, String>> choicesModel;+ private final IModel<List<String>> choicesModel;++ private final IModel<Map<String, String>> displayNamesModel;private RadioGroup<String> radioGroup;-+private Collection<Behavior> behaviors = new ArrayList<>();public StringRadioChoice(String id, IModel<String> selectionModel,- IModel<Map<String, String>> choicesModel) {+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel) {super(id, selectionModel);this.choicesModel = choicesModel;+ this.displayNamesModel = displayNamesModel;}@Override@@ -48,18 +52,21 @@ public class StringRadioChoice extends FormComponentPanel<String> {radioGroup.setLabel(getLabel());for (var behavior: behaviors)radioGroup.add(behavior);- radioGroup.add(new ListView<>("options", new LoadableDetachableModel<List<Map.Entry<String, String>>>() {+ radioGroup.add(new ListView<>("options", new LoadableDetachableModel<List<String>>() {@Override- protected List<Map.Entry<String, String>> load() {- return new ArrayList<>(choicesModel.getObject().entrySet());+ protected List<String> load() {+ return choicesModel.getObject();}}) {@Override- protected void populateItem(ListItem<Map.Entry<String, String>> item) {- var entry = item.getModelObject();- item.add(new Radio<>("option", Model.of(entry.getKey())));- item.add(new Label("label", Model.of(entry.getValue())));+ protected void populateItem(ListItem<String> item) {+ var choice = item.getModelObject();+ item.add(new Radio<>("option", Model.of(choice)));+ var displayName = displayNamesModel.getObject().get(choice);+ if (displayName == null)+ displayName = choice;+ item.add(new Label("label", Model.of(displayName)));}});add(radioGroup);@@ -96,6 +103,7 @@ public class StringRadioChoice extends FormComponentPanel<String> {@Overrideprotected void onDetach() {choicesModel.detach();+ displayNamesModel.detach();super.onDetach();}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.javaindex b6e2d36153..7e077b2a83 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.stringchoice;+import java.util.List;import java.util.Map;import org.apache.wicket.model.IModel;@@ -9,7 +10,21 @@ import io.onedev.server.web.component.select2.Select2Choice;public class StringSingleChoice extends Select2Choice<String> {public StringSingleChoice(String id, IModel<String> selectionModel,- IModel<Map<String, String>> choicesModel, boolean tagsMode) {+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ IModel<Map<String, String>> descriptionsModel,+ boolean tagsMode) {+ super(id, selectionModel, new StringChoiceProvider(choicesModel, displayNamesModel, descriptionsModel, tagsMode));+ }++ public StringSingleChoice(String id, IModel<String> selectionModel,+ IModel<List<String>> choicesModel,+ IModel<Map<String, String>> displayNamesModel,+ boolean tagsMode) {+ super(id, selectionModel, new StringChoiceProvider(choicesModel, displayNamesModel, tagsMode));+ }++ public StringSingleChoice(String id, IModel<String> selectionModel, IModel<List<String>> choicesModel, boolean tagsMode) {super(id, selectionModel, new StringChoiceProvider(choicesModel, tagsMode));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AuthorizationBean.javarename to server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.javaindex 0dcf0a0fee..dfa1bfb09a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java@@ -1,5 +1,14 @@package io.onedev.server.web.component.user.accesstoken;+import static java.util.Comparator.comparing;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Size;+import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ProjectChoice;import io.onedev.server.annotation.RoleChoice;@@ -10,21 +19,14 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.web.util.UserAware;import io.onedev.server.web.util.WicketUtils;-import javax.validation.constraints.NotEmpty;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import static java.util.Comparator.comparing;-@Editable-public class AuthorizationBean implements Serializable {+public class AccessTokenAuthorizationBean implements Serializable {private static final long serialVersionUID = 1L;private String projectPath;- private String roleName;+ private List<String> roleNames;@Editable(order=100, name="Project")@ProjectChoice("getManageableProjects")@@ -47,13 +49,13 @@ public class AuthorizationBean implements Serializable {@Editable(order=200, name="Role")@RoleChoice- @NotEmpty- public String getRoleName() {- return roleName;+ @Size(min=1, message = "At least one role must be selected")+ public List<String> getRoleNames() {+ return roleNames;}- public void setRoleName(String roleName) {- this.roleName = roleName;+ public void setRoleNames(List<String> roleNames) {+ this.roleNames = roleNames;}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.javaindex e68c3a53be..3840691f63 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java@@ -1,22 +1,29 @@package io.onedev.server.web.component.user.accesstoken;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Date;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Size;+import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Secret;import io.onedev.server.annotation.ShowCondition;import io.onedev.server.model.AccessToken;+import io.onedev.server.model.AccessTokenAuthorization;+import io.onedev.server.model.Project;+import io.onedev.server.model.Role;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.util.UserAware;import io.onedev.server.web.util.WicketUtils;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Date;-import java.util.List;-@Editablepublic class AccessTokenEditBean implements Serializable {@@ -28,7 +35,7 @@ public class AccessTokenEditBean implements Serializable {private boolean hasOwnerPermissions;- private List<AuthorizationBean> authorizations = new ArrayList<>();+ private List<AccessTokenAuthorizationBean> authorizations = new ArrayList<>();private Date expireDate;@@ -65,11 +72,11 @@ public class AccessTokenEditBean implements Serializable {@Editable(order=300, name="Authorized Projects", description = "Only projects manageable by access token owner can be authorized")@Size(min=1, message = "At least one project should be authorized")@ShowCondition("isHasOwnerPermissionsDisabled")- public List<AuthorizationBean> getAuthorizations() {+ public List<AccessTokenAuthorizationBean> getAuthorizations() {return authorizations;}- public void setAuthorizations(List<AuthorizationBean> authorizations) {+ public void setAuthorizations(List<AccessTokenAuthorizationBean> authorizations) {this.authorizations = authorizations;}@@ -94,12 +101,21 @@ public class AccessTokenEditBean implements Serializable {bean.setHasOwnerPermissions(token.isHasOwnerPermissions());bean.setExpireDate(token.getExpireDate());+ Map<Project, List<Role>> projectRoles = new HashMap<>();+ for (AccessTokenAuthorization authorization : token.getAuthorizations()) {+ Project project = authorization.getProject();+ Role role = authorization.getRole();+ projectRoles.computeIfAbsent(project, k -> new ArrayList<>()).add(role);+ }+var user = WicketUtils.findInnermost(ComponentContext.get().getComponent(), UserAware.class).getUser();- for (var authorization: token.getAuthorizations()) {- if (SecurityUtils.canManageProject(user.asSubject(), authorization.getProject())) {- var authorizationBean = new AuthorizationBean();- authorizationBean.setProjectPath(authorization.getProject().getPath());- authorizationBean.setRoleName(authorization.getRole().getName());+ for (var entry: projectRoles.entrySet()) {+ Project project = entry.getKey();+ List<Role> roles = entry.getValue();+ if (SecurityUtils.canManageProject(user.asSubject(), project)) {+ var authorizationBean = new AccessTokenAuthorizationBean();+ authorizationBean.setProjectPath(project.getPath());+ authorizationBean.setRoleNames(roles.stream().map(it->it.getName()).collect(Collectors.toList()));bean.getAuthorizations().add(authorizationBean);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.javaindex 85cc58dc22..3d8b6c6839 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java@@ -1,6 +1,16 @@package io.onedev.server.web.component.user.accesstoken;+import java.util.ArrayList;+import java.util.HashSet;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.AccessTokenAuthorizationManager;import io.onedev.server.entitymanager.AccessTokenManager;@@ -12,13 +22,6 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;--import java.util.ArrayList;abstract class AccessTokenEditPanel extends Panel {@@ -62,13 +65,23 @@ abstract class AccessTokenEditPanel extends Panel {token.setValue(bean.getValue());token.setHasOwnerPermissions(bean.isHasOwnerPermissions());+ var projectPaths = new HashSet<String>();var authorizations = new ArrayList<AccessTokenAuthorization>();for (var authorizationBean : bean.getAuthorizations()) {- var authorization = new AccessTokenAuthorization();- authorization.setProject(getProjectManager().findByPath(authorizationBean.getProjectPath()));- authorization.setRole(getRoleManager().find(authorizationBean.getRoleName()));- authorization.setToken(token);- authorizations.add(authorization);+ if (!projectPaths.add(authorizationBean.getProjectPath())) {+ editor.error(new Path(new PathNode.Named("authorizations")), "Duplicate authorizations found: " + authorizationBean.getProjectPath());+ target.add(AccessTokenEditPanel.this);+ return;+ } else {+ var project = getProjectManager().findByPath(authorizationBean.getProjectPath());+ authorizationBean.getRoleNames().forEach(it -> {+ var authorization = new AccessTokenAuthorization();+ authorization.setProject(project);+ authorization.setRole(getRoleManager().find(it));+ authorization.setToken(token);+ authorizations.add(authorization);+ });+ }}token.setExpireDate(bean.getExpireDate());diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex c3534b776e..a4a8dd5b7d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -1,9 +1,7 @@package io.onedev.server.web.editable.bool;-import io.onedev.server.web.component.stringchoice.StringSingleChoice;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.util.TextUtils;+import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -11,8 +9,10 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import java.util.LinkedHashMap;-import java.util.Map;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.TextUtils;public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {@@ -32,14 +32,11 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {elseselection = null;- input = new StringSingleChoice("input", Model.of(selection), new LoadableDetachableModel<Map<String, String>>() {+ input = new StringSingleChoice("input", Model.of(selection), new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- choices.put(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(true));- choices.put(TextUtils.getDisplayValue(false), TextUtils.getDisplayValue(false));- return choices;+ protected List<String> load() {+ return List.of(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(false));}}, false) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex ad8bbe0520..8d4fbcb522 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -2,9 +2,7 @@ package io.onedev.server.web.editable.branchchoice;import java.util.ArrayList;import java.util.Collection;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -14,13 +12,13 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.BranchChoice;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.RefFacade;import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.BranchChoice;public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@@ -34,11 +32,10 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- Map<String, String> choices = new LinkedHashMap<>();+ List<String> choices = new ArrayList<>();if (Project.get() != null) {for (RefFacade ref: Project.get().getBranchRefs()) {- String branch = GitUtils.ref2branch(ref.getName());- choices.put(branch, branch);+ choices.add(GitUtils.ref2branch(ref.getName()));}}@@ -46,12 +43,12 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {Collection<String> selections = new ArrayList<>();if (getModelObject() != null) {for (String selection: getModelObject()) {- if (branchChoice.tagsMode() || choices.containsKey(selection))+ if (branchChoice.tagsMode() || choices.contains(selection))selections.add(selection);}}- input = new BranchMultiChoice("input", Model.of(selections), Model.ofMap(choices), branchChoice.tagsMode()) {+ input = new BranchMultiChoice("input", Model.of(selections), Model.ofList(choices), branchChoice.tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex b2ceb1b086..7f3ecf5bc2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -1,7 +1,7 @@package io.onedev.server.web.editable.branchchoice;-import java.util.LinkedHashMap;-import java.util.Map;+import java.util.ArrayList;+import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -11,13 +11,13 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.BranchChoice;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.RefFacade;import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.BranchChoice;public class BranchSingleChoiceEditor extends PropertyEditor<String> {@@ -31,20 +31,19 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- Map<String, String> choices = new LinkedHashMap<>();+ List<String> choices = new ArrayList<>();if (Project.get() != null) {for (RefFacade ref: Project.get().getBranchRefs()) {- String branch = GitUtils.ref2branch(ref.getName());- choices.put(branch, branch);+ choices.add(GitUtils.ref2branch(ref.getName()));}}BranchChoice branchChoice = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(BranchChoice.class));String selection = getModelObject();- if (!branchChoice.tagsMode() && !choices.containsKey(selection))+ if (!branchChoice.tagsMode() && !choices.contains(selection))selection = null;- input = new BranchSingleChoice("input", Model.of(selection), Model.ofMap(choices), branchChoice.tagsMode()) {+ input = new BranchSingleChoice("input", Model.of(selection), Model.ofList(choices), branchChoice.tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.javaindex 5a0471cd32..65778ea9d1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java@@ -2,9 +2,7 @@ package io.onedev.server.web.editable.buildspec.job.choice;import java.util.ArrayList;import java.util.Collection;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -12,11 +10,11 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.JobChoice;import io.onedev.server.model.Project;import io.onedev.server.web.component.job.JobMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.JobChoice;public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {@@ -31,20 +29,20 @@ public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- Map<String, String> choices = new LinkedHashMap<>();+ List<String> choices = new ArrayList<>();for (String jobName: Project.get().getJobNames())- choices.put(jobName, jobName);+ choices.add(jobName);JobChoice jobChoice = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(JobChoice.class));List<String> selections = new ArrayList<>();if (getModelObject() != null) {for (String selection: getModelObject()) {- if (jobChoice.tagsMode() || choices.containsKey(selection))+ if (jobChoice.tagsMode() || choices.contains(selection))selections.add(selection);}}- input = new JobMultiChoice("input", Model.of(selections), Model.ofMap(choices), jobChoice.tagsMode()) {+ input = new JobMultiChoice("input", Model.of(selections), Model.ofList(choices), jobChoice.tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.javaindex d39e2ba1b8..03a25f4d49 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java@@ -1,7 +1,7 @@package io.onedev.server.web.editable.buildspec.job.choice;-import java.util.LinkedHashMap;-import java.util.Map;+import java.util.ArrayList;+import java.util.List;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -9,11 +9,11 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.JobChoice;import io.onedev.server.model.Project;import io.onedev.server.web.component.job.JobSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.JobChoice;public class JobSingleChoiceEditor extends PropertyEditor<String> {@@ -27,17 +27,17 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- Map<String, String> choices = new LinkedHashMap<>();+ List<String> choices = new ArrayList<>();for (String jobName: Project.get().getJobNames())- choices.put(jobName, jobName);+ choices.add(jobName);JobChoice jobChoice = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(JobChoice.class));String selection = getModelObject();- if (!jobChoice.tagsMode() && !choices.containsKey(selection))+ if (!jobChoice.tagsMode() && !choices.contains(selection))selection = null;- input = new JobSingleChoice("input", Model.of(selection), Model.ofMap(choices), jobChoice.tagsMode()) {+ input = new JobSingleChoice("input", Model.of(selection), Model.ofList(choices), jobChoice.tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 7f46ac5665..3be91cee9a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.choice;import java.util.ArrayList;import java.util.Collection;-import java.util.LinkedHashMap;+import java.util.HashMap;import java.util.List;import java.util.Map;@@ -15,13 +15,13 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.ChoiceProvider;public class MultiChoiceEditor extends PropertyEditor<List<String>> {@@ -40,29 +40,55 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {+ IModel<List<String>> choicesModel = new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> choices;-- ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);-+ protected List<String> load() {+ ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);ComponentContext.push(componentContext);try {- Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());- if (result instanceof List) {- choices = new LinkedHashMap<>();- for (String each: (List<String>)result)- choices.put(each, each);- } else {- choices = (Map<String, String>)result;- }+ return (List<String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());} finally {ComponentContext.pop();}-- return choices;+ }++ };++ IModel<Map<String, String>> displayNamesModel = new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);+ ComponentContext.push(componentContext);+ if (getChoiceProvider().displayNames().length() != 0) {+ try {+ return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().displayNames());+ } finally {+ ComponentContext.pop();+ }+ } else {+ return new HashMap<>();+ }+ }++ };++ IModel<Map<String, String>> descriptionsModel = new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);+ ComponentContext.push(componentContext);+ if (getChoiceProvider().descriptions().length() != 0) {+ try {+ return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().descriptions());+ } finally {+ ComponentContext.pop();+ }+ } else {+ return new HashMap<>();+ }}};@@ -82,7 +108,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {*/if (selections == null)selections = new ArrayList<>();- input = new StringMultiChoice("input", Model.of(selections), choicesModel, getChoiceProvider().tagsMode()) {+ input = new StringMultiChoice("input", Model.of(selections), choicesModel, displayNamesModel, descriptionsModel, getChoiceProvider().tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex ef65b0e3a3..3c2af3273a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -1,6 +1,6 @@package io.onedev.server.web.editable.choice;-import java.util.LinkedHashMap;+import java.util.HashMap;import java.util.List;import java.util.Map;@@ -14,12 +14,12 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;+import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.annotation.ChoiceProvider;public class SingleChoiceEditor extends PropertyEditor<String> {@@ -38,32 +38,59 @@ public class SingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {+ IModel<List<String>> choicesModel = new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> choices;-- ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);-+ protected List<String> load() {+ ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);ComponentContext.push(componentContext);try {- Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());- if (result instanceof List) {- choices = new LinkedHashMap<>();- for (String each: (List<String>)result)- choices.put(each, each);- } else {- choices = ((Map<String, String>)result);- }+ return (List<String>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());} finally {ComponentContext.pop();}- return choices;}};+ IModel<Map<String, String>> displayNamesModel = new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);+ ComponentContext.push(componentContext);+ if (getChoiceProvider().displayNames().length() != 0) {+ try {+ return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().displayNames());+ } finally {+ ComponentContext.pop();+ }+ } else {+ return new HashMap<>();+ }+ }++ };++ IModel<Map<String, String>> descriptionsModel = new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);+ ComponentContext.push(componentContext);+ if (getChoiceProvider().descriptions().length() != 0) {+ try {+ return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().descriptions());+ } finally {+ ComponentContext.pop();+ }+ } else {+ return new HashMap<>();+ }+ }++ };+String selection = getModelObject();/*@@ -75,7 +102,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {if (!choicesModel.getObject().containsKey(selection))selection = null;*/- input = new StringSingleChoice("input", Model.of(selection), choicesModel, getChoiceProvider().tagsMode()) {+ input = new StringSingleChoice("input", Model.of(selection), choicesModel, displayNamesModel, descriptionsModel, getChoiceProvider().tagsMode()) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 91b4eb0076..4d63453f64 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -1,11 +1,12 @@package io.onedev.server.web.editable.enumeration;-import io.onedev.server.annotation.RadioChoice;-import io.onedev.server.web.component.stringchoice.StringRadioChoice;-import io.onedev.server.web.component.stringchoice.StringSingleChoice;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.util.TextUtils;+import java.util.ArrayList;+import java.util.EnumSet;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -16,10 +17,12 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import java.util.EnumSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.Map;+import io.onedev.server.annotation.RadioChoice;+import io.onedev.server.web.component.stringchoice.StringRadioChoice;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.TextUtils;@SuppressWarnings({ "unchecked", "rawtypes"})public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {@@ -52,24 +55,36 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {elseselection = null;- var choicesModel = new LoadableDetachableModel<Map<String, String>>() {+ var choicesModel = new LoadableDetachableModel<List<String>>() {++ @Override+ protected List<String> load() {+ List<String> choices = new ArrayList<>();+ for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext(); ) {+ choices.add(((Enum<?>) it.next()).name());+ }+ return choices;+ }++ };+ var displayNamesModel = new LoadableDetachableModel<Map<String, String>>() {@Overrideprotected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();+ Map<String, String> displayNames = new HashMap<>();for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext(); ) {Enum<?> value = (Enum<?>) it.next();- choices.put(value.name(), TextUtils.getDisplayValue(value));+ displayNames.put(value.name(), TextUtils.getDisplayValue(value));}- return choices;+ return displayNames;}};if (radioChoice) {- fragment.add(input = new StringRadioChoice("input", Model.of(selection), choicesModel));+ fragment.add(input = new StringRadioChoice("input", Model.of(selection), choicesModel, displayNamesModel));} else {- fragment.add(input = new StringSingleChoice("input", Model.of(selection), choicesModel, false) {+ fragment.add(input = new StringSingleChoice("input", Model.of(selection), choicesModel, displayNamesModel, false) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 4505b59257..b91b6ce85e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -2,12 +2,11 @@ package io.onedev.server.web.editable.enumlist;import java.util.ArrayList;import java.util.EnumSet;+import java.util.HashMap;import java.util.Iterator;-import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -20,6 +19,7 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.TextUtils;@SuppressWarnings({"unchecked", "rawtypes"})public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {@@ -32,10 +32,6 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {super(id, propertyDescriptor, propertyModel);enumClass = (Class<Enum>) ReflectionUtils.getCollectionElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());}-- private String getDisplayValue(String choice) {- return StringUtils.capitalize(choice.replace('_', ' ').toLowerCase());- }@Overrideprotected void onInitialize() {@@ -47,19 +43,33 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {selections.add(each.name());}- input = new StringMultiChoice("input", Model.of(selections), new LoadableDetachableModel<Map<String, String>>() {+ var choicesModel = new LoadableDetachableModel<List<String>>() {++ @Override+ protected List<String> load() {+ List<String> choices = new ArrayList<>();+ for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext(); ) {+ choices.add(((Enum<?>) it.next()).name());+ }+ return choices;+ }++ };+ var displayNamesModel = new LoadableDetachableModel<Map<String, String>>() {@Overrideprotected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {- Enum<?> value = (Enum<?>) it.next();- choices.put(value.name(), getDisplayValue(value.toString()));- }- return choices;+ Map<String, String> displayNames = new HashMap<>();+ for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext(); ) {+ Enum<?> value = (Enum<?>) it.next();+ displayNames.put(value.name(), TextUtils.getDisplayValue(value));+ }+ return displayNames;}-- }, false) {++ };++ input = new StringMultiChoice("input", Model.of(selections), choicesModel, displayNamesModel, false) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex 6d2a28b5c1..d5a60ec6b4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -1,5 +1,15 @@package io.onedev.server.web.editable.parentchoice;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;@@ -10,17 +20,6 @@ import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import java.util.ArrayList;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;public class ParentChoiceEditor extends PropertyEditor<String> {@@ -35,11 +34,11 @@ public class ParentChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {+ IModel<List<String>> choicesModel = new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- List<String> listOfProjectPath = new ArrayList<>();+ protected List<String> load() {+ List<String> projectPaths = new ArrayList<>();Project currentProject = Project.get();ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);@@ -47,15 +46,11 @@ public class ParentChoiceEditor extends PropertyEditor<String> {for (Project project: SecurityUtils.getAuthorizedProjects(new CreateChildren())) {if (currentProject == null || !cache.isSelfOrAncestorOf(currentProject.getId(), project.getId())) {String projectPath = cache.get(project.getId()).getPath();- listOfProjectPath.add(projectPath);+ projectPaths.add(projectPath);}}- Collections.sort(listOfProjectPath);-- Map<String, String> mapOfProjectPath = new LinkedHashMap<>();- for (String projectPath: listOfProjectPath)- mapOfProjectPath.put(projectPath, projectPath);- return mapOfProjectPath;+ Collections.sort(projectPaths);+ return projectPaths;}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.htmlindex 34db1a76be..3817227265 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden" class="select2"></input>+ <input wicket:id="input" type="hidden"></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 37d6adceff..8c439d3840 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -1,7 +1,7 @@package io.onedev.server.web.editable.scriptchoice;-import java.util.LinkedHashMap;-import java.util.Map;+import java.util.ArrayList;+import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -31,19 +31,18 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {+ IModel<List<String>> choicesModel = new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();+ protected List<String> load() {+ List<String> choices = new ArrayList<>();for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts())- choices.put(script.getName(), script.getName());+ choices.add(script.getName());for (ScriptContribution contribution: OneDev.getExtensions(ScriptContribution.class)) {GroovyScript script = contribution.getScript();- String displayName = GroovyScript.BUILTIN_PREFIX + script.getName();- choices.put(displayName, displayName);+ choices.add(GroovyScript.BUILTIN_PREFIX + script.getName());}return choices;@@ -52,7 +51,7 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {};String selection = getModelObject();- if (!choicesModel.getObject().containsKey(selection))+ if (!choicesModel.getObject().contains(selection))selection = null;input = new StringSingleChoice("input", Model.of(selection), choicesModel, false) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.javaindex 2593472b94..3a6647bd87 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java@@ -1,19 +1,19 @@package io.onedev.server.web.editable.stringlist;-import io.onedev.server.web.component.select2.Select2MultiChoice;-import io.onedev.server.web.component.stringchoice.StringMultiChoice;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.List;+import io.onedev.server.web.component.select2.Select2MultiChoice;+import io.onedev.server.web.component.stringchoice.StringMultiChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;public class StringListEditor extends PropertyEditor<List<String>> {@@ -31,7 +31,7 @@ public class StringListEditor extends PropertyEditor<List<String>> {if (selections == null)selections = new ArrayList<>();- input = new StringMultiChoice("input", Model.of(selections), Model.ofMap(new HashMap<>()), true) {+ input = new StringMultiChoice("input", Model.of(selections), Model.ofList(new ArrayList<>()), true) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.javaindex 3aa5b750f6..58ad093942 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java@@ -6,8 +6,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Collections;import java.util.Date;-import java.util.LinkedHashMap;-import java.util.Map;+import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -75,14 +74,11 @@ class AgentFilterPanel extends FilterEditPanel<Agent> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();- map.put("Online", "Online");- map.put("Offline", "Offline");- return map;+ protected List<String> load() {+ return List.of("Online", "Offline");}}, false);statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -114,17 +110,15 @@ class AgentFilterPanel extends FilterEditPanel<Agent> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();+ protected List<String> load() {var osNames = new ArrayList<>(getAgentManager().getOsNames());Collections.sort(osNames);- for (var os: osNames)- map.put(os, os);- return map;+ return osNames;}+}, false);osChoice.add(new AjaxFormComponentUpdatingBehavior("change") {@@ -155,16 +149,13 @@ class AgentFilterPanel extends FilterEditPanel<Agent> {getModel().setObject(query);}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- var map = new LinkedHashMap<String, String>();+ protected List<String> load() {var osArchs = new ArrayList<>(getAgentManager().getOsArchs());Collections.sort(osArchs);- for (var osArch: osArchs)- map.put(osArch, osArch);- return map;+ return osArchs;}}, false);osArchChoice.add(new AjaxFormComponentUpdatingBehavior("change") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.htmlindex eab808477f..ae4882d3d6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="alert alert-notice alert-light-info mb-4"><wicket:svg href="bulb" class="icon mr-2"></wicket:svg>- When authorize a project, all child projects will also be authorized with the role+ When authorize a project, all child projects will also be authorized with assigned roles</div><form wicket:id="form" class="group-authorizations leave-confirm"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.javaindex 61f1fa8391..b566209940 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/authorization/GroupAuthorizationsPage.java@@ -2,7 +2,9 @@ package io.onedev.server.web.page.admin.groupmanagement.authorization;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Set;import org.apache.wicket.Session;@@ -31,10 +33,16 @@ public class GroupAuthorizationsPage extends GroupPage {super.onInitialize();ProjectAuthorizationsBean authorizationsBean = new ProjectAuthorizationsBean();- for (GroupAuthorization authorization: getGroup().getAuthorizations()) {+ var groupRoles = new HashMap<String, List<String>>();+ for (var authorization: getGroup().getAuthorizations()) {+ String groupName = authorization.getGroup().getName();+ String roleName = authorization.getRole().getName();+ groupRoles.computeIfAbsent(groupName, k -> new ArrayList<>()).add(roleName);+ }+ for (var entry: groupRoles.entrySet()) {ProjectAuthorizationBean authorizationBean = new ProjectAuthorizationBean();- authorizationBean.setProjectPath(authorization.getProject().getPath());- authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationBean.setProjectPath(entry.getKey());+ authorizationBean.setRoleNames(entry.getValue());authorizationsBean.getAuthorizations().add(authorizationBean);}@@ -47,16 +55,18 @@ public class GroupAuthorizationsPage extends GroupPage {Set<String> projectPaths = new HashSet<>();Collection<GroupAuthorization> authorizations = new ArrayList<>();for (ProjectAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {- if (projectPaths.contains(authorizationBean.getProjectPath())) {+ if (!projectPaths.add(authorizationBean.getProjectPath())) {error("Duplicate authorizations found: " + authorizationBean.getProjectPath());return;} else {- projectPaths.add(authorizationBean.getProjectPath());- GroupAuthorization authorization = new GroupAuthorization();- authorization.setGroup(getGroup());- authorization.setProject(OneDev.getInstance(ProjectManager.class).findByPath(authorizationBean.getProjectPath()));- authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));- authorizations.add(authorization);+ var project = getProjectManager().findByPath(authorizationBean.getProjectPath());+ authorizationBean.getRoleNames().stream().forEach(it -> {+ GroupAuthorization authorization = new GroupAuthorization();+ authorization.setGroup(getGroup());+ authorization.setProject(project);+ authorization.setRole(getRoleManager().find(it));+ authorizations.add(authorization);+ });}}@@ -70,4 +80,12 @@ public class GroupAuthorizationsPage extends GroupPage {add(form);}+ private RoleManager getRoleManager() {+ return OneDev.getInstance(RoleManager.class);+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.htmlindex 8726d15f9b..5890430bb7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="alert alert-notice alert-light-info mb-4">- When authorize a project, all child projects will also be authorized with the role+ When authorize a project, all child projects will also be authorized with assigned roles</div><form wicket:id="form" class="user-authorizations leave-confirm"><div wicket:id="feedback" class="mb-4"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.javaindex aba375de9a..aa8d3b8ea5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/authorization/UserAuthorizationsPage.java@@ -2,7 +2,9 @@ package io.onedev.server.web.page.admin.usermanagement.authorization;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Set;import org.apache.wicket.Session;@@ -31,10 +33,16 @@ public class UserAuthorizationsPage extends UserPage {super.onInitialize();ProjectAuthorizationsBean authorizationsBean = new ProjectAuthorizationsBean();- for (UserAuthorization authorization: getUser().getProjectAuthorizations()) {+ var userRoles = new HashMap<String, List<String>>();+ for (var authorization: getUser().getProjectAuthorizations()) {+ String projectPath = authorization.getProject().getPath();+ String roleName = authorization.getRole().getName();+ userRoles.computeIfAbsent(projectPath, k -> new ArrayList<>()).add(roleName);+ }+ for (var entry: userRoles.entrySet()) {ProjectAuthorizationBean authorizationBean = new ProjectAuthorizationBean();- authorizationBean.setProjectPath(authorization.getProject().getPath());- authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationBean.setProjectPath(entry.getKey());+ authorizationBean.setRoleNames(entry.getValue());authorizationsBean.getAuthorizations().add(authorizationBean);}@@ -47,16 +55,18 @@ public class UserAuthorizationsPage extends UserPage {Set<String> projectNames = new HashSet<>();Collection<UserAuthorization> authorizations = new ArrayList<>();for (ProjectAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {- if (projectNames.contains(authorizationBean.getProjectPath())) {+ if (!projectNames.add(authorizationBean.getProjectPath())) {error("Duplicate authorizations found: " + authorizationBean.getProjectPath());return;} else {- projectNames.add(authorizationBean.getProjectPath());- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(getUser());- authorization.setProject(OneDev.getInstance(ProjectManager.class).findByPath(authorizationBean.getProjectPath()));- authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));- authorizations.add(authorization);+ var project = getProjectManager().findByPath(authorizationBean.getProjectPath());+ authorizationBean.getRoleNames().stream().forEach(it -> {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setUser(getUser());+ authorization.setProject(project);+ authorization.setRole(getRoleManager().find(it));+ authorizations.add(authorization);+ });}}@@ -70,4 +80,11 @@ public class UserAuthorizationsPage extends UserPage {add(form);}+ private RoleManager getRoleManager() {+ return OneDev.getInstance(RoleManager.class);+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 7d2c65d230..f5bdbd7e2f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -853,3 +853,6 @@ span.keycap {.modal-dialog.commit-message textarea, .modal-dialog .commit-message textarea {height: 360px;}+.bean-list td.property-roleNames {+ width: 50%;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex cd48ae0f49..8ff9bde60a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -323,6 +323,8 @@ onedev.server = {formatResult: function(choice) {if (choice.id && choice.id.indexOf("<$OneDevSpecialChoice$>") == 0)return "<i>" + choice.name.escapeHtml() + "</i>";+ else if (choice.description)+ return choice.name.escapeHtml() + " <span class='text-muted font-size-sm ml-1'>" + choice.description.escapeHtml() + "</span>";elsereturn choice.name.escapeHtml();},diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex e8ede9b57b..2c9d549a06 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -1,6 +1,60 @@package io.onedev.server.web.page.project.branches;+import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashMap;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.commons.validator.routines.PercentValidator;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.IAjaxIndicatorAware;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.AbstractLink;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;@@ -43,48 +97,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequimport io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.paginghistory.PagingHistorySupport;import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;-import org.apache.commons.validator.routines.PercentValidator;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.IAjaxIndicatorAware;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.AbstractLink;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;--import javax.annotation.Nullable;-import java.io.Serializable;-import java.util.*;--import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;public class ProjectBranchesPage extends ProjectPage {@@ -267,16 +279,13 @@ public class ProjectBranchesPage extends ProjectPage {baseBranch = object;}- }, new LoadableDetachableModel<Map<String, String>>() {+ }, new LoadableDetachableModel<List<String>>() {@Override- protected Map<String, String> load() {- Map<String, String> branches = new LinkedHashMap<>();- for (RefFacade ref: getProject().getBranchRefs()) {- String branch = GitUtils.ref2branch(ref.getName());- branches.put(branch, branch);- }- return branches;+ protected List<String> load() {+ return getProject().getBranchRefs().stream()+ .map(it -> GitUtils.ref2branch(it.getName()))+ .collect(Collectors.toList());}}, false) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.javaindex 401fe51ded..0081f509a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java@@ -1,12 +1,15 @@package io.onedev.server.web.page.project.setting.authorization;+import java.io.Serializable;+import java.util.List;++import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Size;+import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.GroupChoice;import io.onedev.server.annotation.RoleChoice;-import javax.validation.constraints.NotEmpty;-import java.io.Serializable;-@Editablepublic class GroupAuthorizationBean implements Serializable {@@ -14,7 +17,7 @@ public class GroupAuthorizationBean implements Serializable {private String groupName;- private String roleName;+ private List<String> roleNames;@Editable(order=100, name="Group")@GroupChoice@@ -29,13 +32,13 @@ public class GroupAuthorizationBean implements Serializable {@Editable(order=200, name="Role")@RoleChoice- @NotEmpty- public String getRoleName() {- return roleName;+ @Size(min=1, message="At least one role is required")+ public List<String> getRoleNames() {+ return roleNames;}- public void setRoleName(String roleName) {- this.roleName = roleName;+ public void setRoleNames(List<String> roleNames) {+ this.roleNames = roleNames;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.javaindex d68b6e124e..5ae5a9d05e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java@@ -1,5 +1,19 @@package io.onedev.server.web.page.project.setting.authorization;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.entitymanager.GroupManager;@@ -10,17 +24,6 @@ import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Set;public class GroupAuthorizationsPage extends ProjectSettingPage {@@ -33,10 +36,16 @@ public class GroupAuthorizationsPage extends ProjectSettingPage {super.onInitialize();GroupAuthorizationsBean authorizationsBean = new GroupAuthorizationsBean();- for (GroupAuthorization authorization: getProject().getGroupAuthorizations()) {+ var groupRoles = new HashMap<String, List<String>>();+ for (var authorization: getProject().getGroupAuthorizations()) {+ String groupName = authorization.getGroup().getName();+ String roleName = authorization.getRole().getName();+ groupRoles.computeIfAbsent(groupName, k -> new ArrayList<>()).add(roleName);+ }+ for (var entry: groupRoles.entrySet()) {GroupAuthorizationBean authorizationBean = new GroupAuthorizationBean();- authorizationBean.setGroupName(authorization.getGroup().getName());- authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationBean.setGroupName(entry.getKey());+ authorizationBean.setRoleNames(entry.getValue());authorizationsBean.getAuthorizations().add(authorizationBean);}@@ -66,7 +75,7 @@ public class GroupAuthorizationsPage extends ProjectSettingPage {if (!canManageProject) {for (GroupAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {if (user.getGroups().stream().anyMatch(it->it.getName().equals(authorizationBean.getGroupName()))- && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {+ && authorizationBean.getRoleNames().stream().anyMatch(it -> getRoleManager().find(it).isManageProject())) {canManageProject = true;break;}@@ -82,20 +91,22 @@ public class GroupAuthorizationsPage extends ProjectSettingPage {Set<String> groupNames = new HashSet<>();Collection<GroupAuthorization> authorizations = new ArrayList<>();for (GroupAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {- if (groupNames.contains(authorizationBean.getGroupName())) {+ if (!groupNames.add(authorizationBean.getGroupName())) {error("Duplicate authorizations found: " + authorizationBean.getGroupName());return;} else {- groupNames.add(authorizationBean.getGroupName());- GroupAuthorization authorization = new GroupAuthorization();- authorization.setProject(getProject());- authorization.setGroup(OneDev.getInstance(GroupManager.class).find(authorizationBean.getGroupName()));- authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));- authorizations.add(authorization);+ var group = getGroupManager().find(authorizationBean.getGroupName());+ authorizationBean.getRoleNames().stream().forEach(it -> {+ GroupAuthorization authorization = new GroupAuthorization();+ authorization.setProject(getProject());+ authorization.setGroup(group);+ authorization.setRole(getRoleManager().find(it));+ authorizations.add(authorization);+ });}}- OneDev.getInstance(GroupAuthorizationManager.class).syncAuthorizations(getProject(), authorizations);+ getGroupAuthorizationManager().syncAuthorizations(getProject(), authorizations);Session.get().success("Group authorizations updated");}@@ -105,6 +116,18 @@ public class GroupAuthorizationsPage extends ProjectSettingPage {add(form);}+ private RoleManager getRoleManager() {+ return OneDev.getInstance(RoleManager.class);+ }++ private GroupManager getGroupManager() {+ return OneDev.getInstance(GroupManager.class);+ }++ private GroupAuthorizationManager getGroupAuthorizationManager() {+ return OneDev.getInstance(GroupAuthorizationManager.class);+ }+@Overrideprotected Component newProjectTitle(String componentId) {return new Label(componentId, "Group Authorizations");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.javaindex 6d9b2c84ea..7cf18e2364 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java@@ -1,12 +1,15 @@package io.onedev.server.web.page.project.setting.authorization;+import java.io.Serializable;+import java.util.List;++import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Size;+import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.RoleChoice;import io.onedev.server.annotation.UserChoice;-import javax.validation.constraints.NotEmpty;-import java.io.Serializable;-@Editablepublic class UserAuthorizationBean implements Serializable {@@ -14,7 +17,7 @@ public class UserAuthorizationBean implements Serializable {private String userName;- private String roleName;+ private List<String> roleNames;@Editable(order=100, name="User")@UserChoice@@ -29,13 +32,13 @@ public class UserAuthorizationBean implements Serializable {@Editable(order=200, name="Role")@RoleChoice- @NotEmpty- public String getRoleName() {- return roleName;+ @Size(min=1, message="At least one role is required")+ public List<String> getRoleNames() {+ return roleNames;}- public void setRoleName(String roleName) {- this.roleName = roleName;+ public void setRoleNames(List<String> roleNames) {+ this.roleNames = roleNames;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.javaindex 7ec7f60ca5..653f45aa50 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java@@ -2,7 +2,9 @@ package io.onedev.server.web.page.project.setting.authorization;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Set;import org.apache.wicket.Component;@@ -36,10 +38,16 @@ public class UserAuthorizationsPage extends ProjectSettingPage {super.onInitialize();UserAuthorizationsBean authorizationsBean = new UserAuthorizationsBean();- for (UserAuthorization authorization: getProject().getUserAuthorizations()) {+ var userRoles = new HashMap<String, List<String>>();+ for (var authorization: getProject().getUserAuthorizations()) {+ String userName = authorization.getUser().getName();+ String roleName = authorization.getRole().getName();+ userRoles.computeIfAbsent(userName, k -> new ArrayList<>()).add(roleName);+ }+ for (var entry: userRoles.entrySet()) {UserAuthorizationBean authorizationBean = new UserAuthorizationBean();- authorizationBean.setUserName(authorization.getUser().getName());- authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationBean.setUserName(entry.getKey());+ authorizationBean.setRoleNames(entry.getValue());authorizationsBean.getAuthorizations().add(authorizationBean);}@@ -74,7 +82,7 @@ public class UserAuthorizationsPage extends ProjectSettingPage {if (!canManageProject) {for (UserAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {if (authorizationBean.getUserName().equals(user.getName())- && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {+ && authorizationBean.getRoleNames().stream().anyMatch(it -> getRoleManager().find(it).isManageProject())) {canManageProject = true;break;}@@ -89,20 +97,22 @@ public class UserAuthorizationsPage extends ProjectSettingPage {Set<String> userNames = new HashSet<>();Collection<UserAuthorization> authorizations = new ArrayList<>();for (UserAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {- if (userNames.contains(authorizationBean.getUserName())) {+ if (!userNames.add(authorizationBean.getUserName())) {error("Duplicate authorizations found: " + authorizationBean.getUserName());return;} else {- userNames.add(authorizationBean.getUserName());- UserAuthorization authorization = new UserAuthorization();- authorization.setProject(getProject());- authorization.setUser(OneDev.getInstance(UserManager.class).findByName(authorizationBean.getUserName()));- authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));- authorizations.add(authorization);+ var user = getUserManager().findByName(authorizationBean.getUserName());+ authorizationBean.getRoleNames().stream().forEach(it -> {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setProject(getProject());+ authorization.setUser(user);+ authorization.setRole(getRoleManager().find(it));+ authorizations.add(authorization);+ });}}- OneDev.getInstance(UserAuthorizationManager.class).syncAuthorizations(getProject(), authorizations);+ getUserAuthorizationManager().syncAuthorizations(getProject(), authorizations);Session.get().success("User authorizations updated");}@@ -112,6 +122,18 @@ public class UserAuthorizationsPage extends ProjectSettingPage {add(form);}+ private RoleManager getRoleManager() {+ return OneDev.getInstance(RoleManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private UserAuthorizationManager getUserAuthorizationManager() {+ return OneDev.getInstance(UserAuthorizationManager.class);+ }+@Overrideprotected Component newProjectTitle(String componentId) {return new Label(componentId, "User Authorizations");diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.javaindex cb8c940122..ed7e3285e2 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java@@ -1,8 +1,10 @@package io.onedev.server.web.util.editbean;import java.io.Serializable;+import java.util.List;import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Size;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ProjectChoice;@@ -15,7 +17,7 @@ public class ProjectAuthorizationBean implements Serializable {private String projectPath;- private String roleName;+ private List<String> roleNames;@Editable(order=100, name="Project")@ProjectChoice@@ -30,13 +32,13 @@ public class ProjectAuthorizationBean implements Serializable {@Editable(order=200, name="Role")@RoleChoice- @NotEmpty- public String getRoleName() {- return roleName;+ @Size(min=1, message="At least one role is required")+ public List<String> getRoleNames() {+ return roleNames;}- public void setRoleName(String roleName) {- this.roleName = roleName;+ public void setRoleNames(List<String> roleNames) {+ this.roleNames = roleNames;}}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.javaindex 83a6becd88..196782c752 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java@@ -1,6 +1,8 @@package io.onedev.server.plugin.imports.gitlab;import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;import java.util.Map;import io.onedev.server.annotation.ChoiceProvider;@@ -19,7 +21,7 @@ public class ImportGroup implements Serializable {@Editable(order=100, name="GitLab Group", description="Specify group to import from. "+ "Leave empty to import from projects under current account")- @ChoiceProvider("getGroupChoices")+ @ChoiceProvider(value="getGroupChoices", displayNames="getGroupDisplayNames")public String getGroupId() {return groupId;}@@ -28,11 +30,15 @@ public class ImportGroup implements Serializable {this.groupId = groupId;}- @SuppressWarnings("unused")- private static Map<String, String> getGroupChoices() {+ private static Map<String, String> getGroupDisplayNames() {BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);ImportGroup setting = (ImportGroup) editor.getModelObject();return setting.server.listGroups();}+ @SuppressWarnings("unused")+ private static List<String> getGroupChoices() {+ return new ArrayList<>(getGroupDisplayNames().keySet());+ }+}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex c76e51f1aa..09c318f39d 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -77,6 +77,8 @@ public class ImportServer implements Serializable, Validatable {private String apiUrl;private String accessToken;++ private transient Map<String, String> groups;@Editable(order=10, name="GitLab API URL", description="Specify GitLab API url, for instance <tt>https://gitlab.example.com/api/v4</tt>")@NotEmpty@@ -102,28 +104,29 @@ public class ImportServer implements Serializable, Validatable {}Map<String, String> listGroups() {- Map<String, String> groups = new HashMap<>();- Client client = newClient();- try {- String apiEndpoint = getApiEndpoint("/groups?owned=true&top_level_only=true");- for (JsonNode groupNode: list(client, apiEndpoint, new TaskLogger() {+ if (groups == null) {+ groups = new HashMap<>();+ Client client = newClient();+ try {+ String apiEndpoint = getApiEndpoint("/groups?owned=true&top_level_only=true");+ for (JsonNode groupNode: list(client, apiEndpoint, new TaskLogger() {- @Override- public void log(String message, String sessionId) {- logger.info(message);- }-- })) {- groups.put(groupNode.get("id").asText(), groupNode.get("full_path").asText());- }-- } catch (Exception e) {- logger.error("Error listing groups", e);- } finally {- client.close();+ @Override+ public void log(String message, String sessionId) {+ logger.info(message);+ }++ })) {+ groups.put(groupNode.get("id").asText(), groupNode.get("full_path").asText());+ }+ } catch (Exception e) {+ logger.error("Error listing groups", e);+ } finally {+ client.close();+ }+ groups = CollectionUtils.sortByValue(groups);}-- return CollectionUtils.sortByValue(groups);+ return groups;}List<String> listProjects(@Nullable String groupId, boolean includeForks) {@@ -383,7 +386,6 @@ public class ImportServer implements Serializable, Validatable {iterationMappings.put(iteration.getName(), iteration);String initialIssueState = getIssueSetting().getInitialStateSpec().getName();- var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();List<Issue> issues = new ArrayList<>();Map<Long, Long> issueNumberMappings = new HashMap<>();@@ -544,8 +546,8 @@ public class ImportServer implements Serializable, Validatable {IssueField issueField = new IssueField();issueField.setIssue(issue);issueField.setName(option.getEstimatedTimeIssueField());- issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(timeTrackingSetting.formatWorkingPeriod(value/60));+ issueField.setType(InputSpec.INTEGER);+ issueField.setValue(String.valueOf(value));issue.getFields().add(issueField);}}@@ -555,8 +557,8 @@ public class ImportServer implements Serializable, Validatable {IssueField issueField = new IssueField();issueField.setIssue(issue);issueField.setName(option.getSpentTimeIssueField());- issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(timeTrackingSetting.formatWorkingPeriod(value/60));+ issueField.setType(InputSpec.INTEGER);+ issueField.setValue(String.valueOf(value));issue.getFields().add(issueField);}}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.javaindex fe4d78b84e..a2821eb9ef 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java@@ -101,7 +101,7 @@ public class IssueImportOption implements Serializable {@Editable(order=370, description="Optionally specify a working period field to hold estimated time infomration.<br>"+ "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")- @ChoiceProvider("getWorkingPeriodIssueFieldChoices")+ @ChoiceProvider("getIntegerIssueFieldChoices")public String getEstimatedTimeIssueField() {return estimatedTimeIssueField;}@@ -112,7 +112,7 @@ public class IssueImportOption implements Serializable {@Editable(order=380, description="Optionally specify a working period field to hold spent time infomration.<br>"+ "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")- @ChoiceProvider("getWorkingPeriodIssueFieldChoices")+ @ChoiceProvider("getIntegerIssueFieldChoices")public String getSpentTimeIssueField() {return spentTimeIssueField;}@@ -122,10 +122,10 @@ public class IssueImportOption implements Serializable {}@SuppressWarnings("unused")- private static List<String> getWorkingPeriodIssueFieldChoices() {+ private static List<String> getIntegerIssueFieldChoices() {List<String> choices = new ArrayList<>();for (FieldSpec field: getIssueSetting().getFieldSpecs()) {- if (field.getType().equals(InputSpec.WORKING_PERIOD))+ if (field.getType().equals(InputSpec.INTEGER))choices.add(field.getName());}return choices;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.javaindex 74ed36d8c1..38c44b7d15 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java@@ -82,7 +82,7 @@ public class ImportOption implements Serializable {@Editable(order=370, description="Optionally specify a working period field to hold time spent infomration.<br>"+ "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")- @ChoiceProvider("getWorkingPeriodIssueFieldChoices")+ @ChoiceProvider("getIntegerIssueFieldChoices")public String getTimeSpentIssueField() {return timeSpentIssueField;}@@ -93,7 +93,7 @@ public class ImportOption implements Serializable {@Editable(order=380, description="Optionally specify a working period field to hold time estimate infomration.<br>"+ "<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here")- @ChoiceProvider("getWorkingPeriodIssueFieldChoices")+ @ChoiceProvider("getIntegerIssueFieldChoices")public String getTimeEstimateIssueField() {return timeEstimateIssueField;}@@ -103,10 +103,10 @@ public class ImportOption implements Serializable {}@SuppressWarnings("unused")- private static List<String> getWorkingPeriodIssueFieldChoices() {+ private static List<String> getIntegerIssueFieldChoices() {List<String> choices = new ArrayList<>();for (FieldSpec field: getIssueSetting().getFieldSpecs()) {- if (field.getType().equals(InputSpec.WORKING_PERIOD))+ if (field.getType().equals(InputSpec.INTEGER))choices.add(field.getName());}return choices;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex 02bbe7e63b..fcb240f601 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -1,8 +1,51 @@package io.onedev.server.plugin.imports.jiracloud;+import java.io.IOException;+import java.io.InputStream;+import java.io.Serializable;+import java.io.UnsupportedEncodingException;+import java.net.URI;+import java.net.URISyntaxException;+import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.concurrent.atomic.AtomicInteger;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;++import org.apache.http.client.utils.URIBuilder;+import org.apache.shiro.authz.UnauthorizedException;+import org.glassfish.jersey.client.ClientProperties;+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;+import org.joda.time.format.ISODateTimeFormat;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import com.fasterxml.jackson.databind.JsonNode;import com.google.common.base.Joiner;import com.google.common.base.Splitter;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -19,7 +62,12 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.issue.IssuesImported;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -33,35 +81,6 @@ import io.onedev.server.util.Pair;import io.onedev.server.validation.Validatable;import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.taskbutton.TaskResult.HtmlMessgae;-import org.apache.http.client.utils.URIBuilder;-import org.apache.shiro.authz.UnauthorizedException;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.joda.time.format.ISODateTimeFormat;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import java.io.IOException;-import java.io.InputStream;-import java.io.Serializable;-import java.io.UnsupportedEncodingException;-import java.net.URI;-import java.net.URISyntaxException;-import java.net.URLEncoder;-import java.nio.charset.StandardCharsets;-import java.util.*;-import java.util.concurrent.atomic.AtomicInteger;@Editable@ClassValidating@@ -453,8 +472,6 @@ public class ImportServer implements Serializable, Validatable {apiEndpoint = getApiEndpoint("/issuetype/project?projectId=" + jiraProject.get("id").asText());for (JsonNode typeNode: list(client, apiEndpoint, logger))untranslatedTypeNames.put(typeNode.get("id").asText(), typeNode.get("untranslatedName").asText());-- var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();AtomicInteger numOfImportedIssues = new AtomicInteger(0);PageDataConsumer pageDataConsumer = new PageDataConsumer() {@@ -655,8 +672,8 @@ public class ImportServer implements Serializable, Validatable {IssueField issueField = new IssueField();issueField.setIssue(issue);issueField.setName(option.getTimeEstimateIssueField());- issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(timeTrackingSetting.formatWorkingPeriod(Integer.valueOf(timeEstimate)/60));+ issueField.setType(InputSpec.INTEGER);+ issueField.setValue(String.valueOf(timeEstimate));issue.getFields().add(issueField);}}@@ -666,8 +683,8 @@ public class ImportServer implements Serializable, Validatable {IssueField issueField = new IssueField();issueField.setIssue(issue);issueField.setName(option.getTimeSpentIssueField());- issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(timeTrackingSetting.formatWorkingPeriod(Integer.valueOf(timeSpent)/60));+ issueField.setType(InputSpec.INTEGER);+ issueField.setValue(String.valueOf(timeSpent));issue.getFields().add(issueField);}}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex fe1c7153c3..b0179e0906 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -807,14 +807,14 @@ public class ImportServer implements Serializable, Validatable {if (mapped == null) {unmappedIssueFields.add(fieldName);extraIssueInfo.put(fieldName, fieldValue);- } else if (!(mapped.getLeft() instanceof IntegerField)) {+ } else if (!(mapped.getLeft() instanceof TextField)) {mismatchedIssueFields.put(fieldName, "Should be mapped to a text field");extraIssueInfo.put(fieldName, fieldValue);} else {IssueField issueField = new IssueField();issueField.setIssue(issue);issueField.setName(mapped.getLeft().getName());- issueField.setType(InputSpec.INTEGER);+ issueField.setType(InputSpec.TEXT);issueField.setValue(fieldValue);issue.getFields().add(issueField);}