The Unified and Autonomous Development Platform
Handle group/user/branch/field/state rename/deletion event to sync other places using these objects
robin shen19b6a2cd0cd2
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 35e10329c2..1e0e898d70 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -76,6 +76,7 @@ import io.onedev.server.command.DBDialectCommand;import io.onedev.server.command.ResetAdminPasswordCommand;import io.onedev.server.command.RestoreDBCommand;import io.onedev.server.command.UpgradeCommand;+import io.onedev.server.exception.OneException;import io.onedev.server.git.config.GitConfig;import io.onedev.server.git.jackson.GitObjectMapperConfigurator;import io.onedev.server.manager.AttachmentManager;@@ -186,7 +187,6 @@ import io.onedev.server.security.OnePasswordService;import io.onedev.server.security.OneRememberMeManager;import io.onedev.server.security.OneWebSecurityManager;import io.onedev.server.security.authenticator.Authenticator;-import io.onedev.server.util.OneException;import io.onedev.server.util.jackson.ObjectMapperConfigurator;import io.onedev.server.util.jackson.ObjectMapperProvider;import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;diff --git a/core/src/main/java/io/onedev/server/exception/InUseException.java b/core/src/main/java/io/onedev/server/exception/InUseException.javanew file mode 100644index 0000000000..52507eb392--- /dev/null+++ b/core/src/main/java/io/onedev/server/exception/InUseException.java@@ -0,0 +1,40 @@+package io.onedev.server.exception;++import java.util.List;++import org.apache.wicket.model.Model;+import org.unbescape.html.HtmlEscape;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationMessage;+import io.onedev.server.util.UsageUtils;+import io.onedev.utils.StringUtils;++public class InUseException extends OneException {++ private static final long serialVersionUID = 1L;++ private final String objectName;++ private final List<String> usages;++ public InUseException(String objectName, List<String> usages) {+ super(UsageUtils.getMessage(objectName, usages));++ this.objectName = objectName;+ this.usages = usages;+ }++ public String getObjectName() {+ return objectName;+ }++ public List<String> getUsages() {+ return usages;+ }++ public NotificationMessage getNotificationMessage() {+ String message = HtmlEscape.escapeHtml5(getMessage());+ message = StringUtils.replace(message, "\n", "<br>");+ return new NotificationMessage(Model.of(message)).escapeModelStrings(false);+ }+}diff --git a/core/src/main/java/io/onedev/server/util/OneException.java b/core/src/main/java/io/onedev/server/exception/OneException.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/util/OneException.javarename to core/src/main/java/io/onedev/server/exception/OneException.javaindex eb30f8dd20..116573fc44 100644--- a/core/src/main/java/io/onedev/server/util/OneException.java+++ b/core/src/main/java/io/onedev/server/exception/OneException.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.exception;public class OneException extends RuntimeException {diff --git a/core/src/main/java/io/onedev/server/util/ScriptException.java b/core/src/main/java/io/onedev/server/exception/ScriptException.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/util/ScriptException.javarename to core/src/main/java/io/onedev/server/exception/ScriptException.javaindex 7e159c30fb..2fa19c7ba8 100644--- a/core/src/main/java/io/onedev/server/util/ScriptException.java+++ b/core/src/main/java/io/onedev/server/exception/ScriptException.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.exception;public class ScriptException extends OneException {diff --git a/core/src/main/java/io/onedev/server/git/exception/GitException.java b/core/src/main/java/io/onedev/server/git/exception/GitException.javaindex c0b5a83ab0..34f4dda94a 100644--- a/core/src/main/java/io/onedev/server/git/exception/GitException.java+++ b/core/src/main/java/io/onedev/server/git/exception/GitException.java@@ -1,6 +1,6 @@package io.onedev.server.git.exception;-import io.onedev.server.util.OneException;+import io.onedev.server.exception.OneException;public class GitException extends OneException {diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldManager.javaindex 52a959deda..f8d088e541 100644--- a/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java@@ -23,4 +23,7 @@ public interface IssueFieldManager extends EntityManager<IssueField> {Set<String> getExcludedFields(Project project, String state);+ void onRenameUser(String oldName, String newName);++ void onRenameGroup(String oldName, String newName);}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.javaindex 03be0c8dac..2fede21bba 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java@@ -1,13 +1,16 @@package io.onedev.server.manager.impl;-import java.util.Iterator;+import java.util.ArrayList;+import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Group;import io.onedev.server.model.Project;@@ -18,6 +21,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.authenticator.Authenticator;+import io.onedev.server.util.UsageUtils;@Singletonpublic class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {@@ -28,13 +32,16 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsprivate final CacheManager cacheManager;+ private final IssueFieldManager issueFieldManager;+@Injectpublic DefaultGroupManager(Dao dao, ProjectManager projectManager, ConfigManager configManager,- CacheManager cacheManager) {+ CacheManager cacheManager, IssueFieldManager issueFieldManager) {super(dao);this.projectManager = projectManager;this.configManager = configManager;this.cacheManager = cacheManager;+ this.issueFieldManager = issueFieldManager;}@Transactional@@ -43,16 +50,19 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsif (oldName != null && !oldName.equals(group.getName())) {for (Project project: projectManager.findAll()) {for (BranchProtection protection: project.getBranchProtections())- protection.onGroupRename(oldName, group.getName());+ protection.onRenameGroup(oldName, group.getName());for (TagProtection protection: project.getTagProtections())- protection.onGroupRename(oldName, group.getName());+ protection.onRenameGroup(oldName, group.getName());+ project.getIssueWorkflow().onRenameGroup(oldName, group.getName());}Authenticator authenticator = configManager.getAuthenticator();if (authenticator != null) {- if (authenticator.onGroupRename(oldName, group.getName()))- configManager.saveAuthenticator(authenticator);+ authenticator.onRenameGroup(oldName, group.getName());+ configManager.saveAuthenticator(authenticator);}++ issueFieldManager.onRenameGroup(oldName, group.getName());}dao.persist(group);}@@ -60,23 +70,24 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements@Transactional@Overridepublic void delete(Group group) {+ List<String> usages = new ArrayList<>();for (Project project: projectManager.findAll()) {- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onGroupDelete(group.getName()))- it.remove();- }- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {- if (it.next().onGroupDelete(group.getName()))- it.remove();- }+ for (BranchProtection protection: project.getBranchProtections())+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName() + "' / Setting / Branch Protection", protection.onDeleteGroup(group.getName())));+ for (TagProtection protection: project.getTagProtections())+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName() + "' / Setting / Tag Protection", protection.onDeleteGroup(group.getName())));+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName() + "' / Setting", project.getIssueWorkflow().onDeleteGroup(group.getName())));}Authenticator authenticator = configManager.getAuthenticator();- if (authenticator != null) {- if (authenticator.onGroupDelete(group.getName()))- configManager.saveAuthenticator(authenticator);+ if (authenticator != null) {+ usages.addAll(UsageUtils.prependCategory("Administration / External Authentication", authenticator.onDeleteGroup(group.getName())));+ configManager.saveAuthenticator(authenticator);}dao.remove(group);++ if (!usages.isEmpty())+ throw new InUseException("Group '" + group.getName() + "'", usages);}@Sessionaldiff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.javaindex 773cfc5f24..958a888c1c 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java@@ -129,4 +129,26 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>return excludedFields;}+ @Transactional+ @Override+ public void onRenameGroup(String oldName, String newName) {+ Query query = getSession().createQuery("update IssueField set value=:newName where (type=:groupChoice or type=:groupMultiChoice) and value=:oldName");+ query.setParameter("groupChoice", InputSpec.GROUP_CHOICE);+ query.setParameter("groupMultiChoice", InputSpec.GROUP_MULTI_CHOICE);+ query.setParameter("oldName", oldName);+ query.setParameter("newName", newName);+ query.executeUpdate();+ }++ @Transactional+ @Override+ public void onRenameUser(String oldName, String newName) {+ Query query = getSession().createQuery("update IssueField set value=:newName where (type=:userChoice or type=:userMultiChoice) and value=:oldName");+ query.setParameter("userChoice", InputSpec.USER_CHOICE);+ query.setParameter("userMultiChoice", InputSpec.USER_MULTI_CHOICE);+ query.setParameter("oldName", oldName);+ query.setParameter("newName", newName);+ query.executeUpdate();+ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.javaindex 7616b1abe7..3020e1f067 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java@@ -28,6 +28,9 @@ import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;+import io.onedev.launcher.loader.Listen;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.ProjectRenamed;@@ -61,9 +64,6 @@ import io.onedev.server.util.facade.UserAuthorizationFacade;import io.onedev.utils.FileUtils;import io.onedev.utils.StringUtils;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;-@Singletonpublic class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {@@ -268,14 +268,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemString branch = GitUtils.ref2branch(event.getRefName());if (branch != null) {for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onBranchDelete(branch))+ if (it.next().onBranchDeleted(branch))it.remove();}}String tag = GitUtils.ref2tag(event.getRefName());if (tag != null) {for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {- if (it.next().onTagDelete(tag))+ if (it.next().onTagDeleted(tag))it.remove();}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.javaindex 2e7ffb3130..f7b86bd53d 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java@@ -1,6 +1,7 @@package io.onedev.server.manager.impl;-import java.util.Iterator;+import java.util.ArrayList;+import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;@@ -13,7 +14,10 @@ import org.hibernate.query.Query;import io.onedev.launcher.loader.Listen;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.lifecycle.SystemStarted;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.CacheManager;+import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -24,6 +28,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityPersisted;+import io.onedev.server.util.UsageUtils;import io.onedev.utils.StringUtils;@Singleton@@ -31,15 +36,23 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final PasswordService passwordService;+ private final ProjectManager projectManager;++ private final IssueFieldManager issueFieldManager;+private final CacheManager cacheManager;private final ListenerRegistry listenerRegistry;@Inject- public DefaultUserManager(Dao dao, CacheManager cacheManager, PasswordService passwordService, ListenerRegistry listenerRegistry) {+ public DefaultUserManager(Dao dao, ProjectManager projectManager,+ IssueFieldManager issueFieldManager, CacheManager cacheManager,+ PasswordService passwordService, ListenerRegistry listenerRegistry) {super(dao);this.passwordService = passwordService;+ this.projectManager = projectManager;+ this.issueFieldManager = issueFieldManager;this.cacheManager = cacheManager;this.listenerRegistry = listenerRegistry;}@@ -55,12 +68,15 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U}if (oldName != null && !oldName.equals(user.getName())) {- for (Project project: dao.findAll(Project.class)) {+ for (Project project: projectManager.findAll()) {for (BranchProtection protection: project.getBranchProtections())- protection.onUserRename(oldName, user.getName());+ protection.onRenameUser(oldName, user.getName());for (TagProtection protection: project.getTagProtections())- protection.onUserRename(oldName, user.getName());+ protection.onRenameUser(oldName, user.getName());+ project.getIssueWorkflow().onRenameUser(oldName, user.getName());}++ issueFieldManager.onRenameUser(oldName, user.getName());}}@@ -134,17 +150,18 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery.executeUpdate();dao.remove(user);-- for (Project project: dao.findAll(Project.class)) {- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onUserDelete(user.getName()))- it.remove();- }- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {- if (it.next().onUserDelete(user.getName()))- it.remove();- }++ List<String> usages = new ArrayList<>();+ for (Project project: projectManager.findAll()) {+ for (BranchProtection protection: project.getBranchProtections())+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName() + "' / Branch Protection", protection.onDeleteUser(user.getName())));+ for (TagProtection protection: project.getTagProtections())+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName() + "' / Tag Protection", protection.onDeleteUser(user.getName())));+ usages.addAll(UsageUtils.prependCategory("Project '" + project.getName(), project.getIssueWorkflow().onDeleteUser(user.getName())));}++ if (!usages.isEmpty())+ throw new InUseException("User '" + user.getName() + "'", usages);}@Sessionaldiff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 91959e2c9f..7bb8a95042 100644--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -2,9 +2,7 @@ package io.onedev.server.model.support;import java.io.Serializable;import java.util.ArrayList;-import java.util.Iterator;import java.util.List;-import java.util.Map;import java.util.Optional;import javax.annotation.Nullable;@@ -12,12 +10,14 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;+import com.google.common.base.Preconditions;+import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.model.support.ifsubmittedby.Anyone;+import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;import io.onedev.server.model.support.ifsubmittedby.SpecifiedGroup;import io.onedev.server.model.support.ifsubmittedby.SpecifiedUser;-import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;import io.onedev.server.util.editable.annotation.BranchPattern;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.ReviewRequirementSpec;@@ -176,7 +176,7 @@ public class BranchProtection implements Serializable {return reviewRequirementOpt.orElse(null);}- public void onGroupRename(String oldName, String newName) {+ public void onRenameGroup(String oldName, String newName) {if (getSubmitter() instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();if (specifiedGroup.getGroupName().equals(oldName))@@ -192,63 +192,46 @@ public class BranchProtection implements Serializable {setReviewRequirementSpec(reviewRequirement.toSpec());}- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {- FileProtection fileProtection = it.next();+ for (FileProtection fileProtection: getFileProtections()) {reviewRequirement = fileProtection.getReviewRequirement();- if (reviewRequirement != null) {- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(oldName))- group.setName(newName);- }- fileProtection.setReviewRequirementSpec(reviewRequirement.toSpec());- } else {- it.remove();+ for (Group group: reviewRequirement.getGroups().keySet()) {+ if (group.getName().equals(oldName))+ group.setName(newName);}+ String spec = reviewRequirement.toSpec();+ Preconditions.checkState(spec != null);+ fileProtection.setReviewRequirementSpec(spec);}}- public boolean onGroupDelete(String groupName) {+ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = new ArrayList<>();if (getSubmitter() instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();if (specifiedGroup.getGroupName().equals(groupName))- return true;+ usages.add("If Submitted By");}ReviewRequirement reviewRequirement = getReviewRequirement();if (reviewRequirement != null) {- for (Iterator<Map.Entry<Group, Integer>> it = reviewRequirement.getGroups().entrySet().iterator();- it.hasNext();) {- Group group = it.next().getKey();+ for (Group group: reviewRequirement.getGroups().keySet()) {if (group.getName().equals(groupName))- it.remove();+ usages.add("Review Requirement");}- setReviewRequirementSpec(reviewRequirement.toSpec());}- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {- FileProtection fileProtection = it.next();+ for (FileProtection fileProtection: getFileProtections()) {reviewRequirement = fileProtection.getReviewRequirement();- if (reviewRequirement != null) {- for (Iterator<Map.Entry<Group, Integer>> itGroup = reviewRequirement.getGroups().entrySet().iterator();- itGroup.hasNext();) {- Group group = itGroup.next().getKey();- if (group.getName().equals(groupName))- itGroup.remove();- }- String reviewRequirementSpec = reviewRequirement.toSpec();- if (reviewRequirementSpec != null)- fileProtection.setReviewRequirementSpec(reviewRequirementSpec);- else- it.remove();- } else {- it.remove();+ for (Group group: reviewRequirement.getGroups().keySet()) {+ if (group.getName().equals(groupName))+ usages.add("File protection '" + fileProtection.getPath() + "': Review Requirement");}}- return false;+ return usages;}- public void onUserRename(String oldName, String newName) {+ public void onRenameUser(String oldName, String newName) {if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(oldName))@@ -264,60 +247,45 @@ public class BranchProtection implements Serializable {setReviewRequirementSpec(reviewRequirement.toSpec());}- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {- FileProtection fileProtection = it.next();+ for (FileProtection fileProtection: getFileProtections()) {reviewRequirement = fileProtection.getReviewRequirement();- if (reviewRequirement != null) {- for (User user: reviewRequirement.getUsers()) {- if (user.getName().equals(oldName))- user.setName(newName);- }- fileProtection.setReviewRequirementSpec(reviewRequirement.toSpec());- } else {- it.remove();+ for (User user: reviewRequirement.getUsers()) {+ if (user.getName().equals(oldName))+ user.setName(newName);}+ String spec = reviewRequirement.toSpec();+ Preconditions.checkState(spec != null);+ fileProtection.setReviewRequirementSpec(spec);}}- public boolean onUserDelete(String userName) {+ public List<String> onDeleteUser(String userName) {+ List<String> usages = new ArrayList<>();if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(userName))- return true;+ usages.add("If Submitted By");}ReviewRequirement reviewRequirement = getReviewRequirement();if (reviewRequirement != null) {- for (Iterator<User> it = reviewRequirement.getUsers().iterator(); it.hasNext();) {- User user = it.next();+ for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(userName))- it.remove();+ usages.add("Required Reviewers");}- setReviewRequirementSpec(reviewRequirement.toSpec());}- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {- FileProtection fileProtection = it.next();+ for (FileProtection fileProtection: getFileProtections()) {reviewRequirement = fileProtection.getReviewRequirement();- if (reviewRequirement != null) {- for (Iterator<User> itUser = reviewRequirement.getUsers().iterator(); itUser.hasNext();) {- User user = itUser.next();- if (user.getName().equals(userName))- itUser.remove();- }- String reviewRequirementSpec = reviewRequirement.toSpec();- if (reviewRequirementSpec != null)- fileProtection.setReviewRequirementSpec(reviewRequirementSpec);- else- it.remove();- } else {- it.remove();+ for (User user: reviewRequirement.getUsers()) {+ if (user.getName().equals(userName))+ usages.add("File protection '" + fileProtection.getPath() + "': Review Requirement");}}- return false;+ return usages;}- public boolean onBranchDelete(String branchName) {+ public boolean onBranchDeleted(String branchName) {return branchName.equals(getBranch());}diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex 7087495d1e..57d7e7e761 100644--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -1,15 +1,19 @@package io.onedev.server.model.support;import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;+import com.google.common.collect.Lists;+import io.onedev.server.model.support.ifsubmittedby.Anyone;+import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;import io.onedev.server.model.support.ifsubmittedby.SpecifiedGroup;import io.onedev.server.model.support.ifsubmittedby.SpecifiedUser;-import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.TagPattern;@@ -87,7 +91,7 @@ public class TagProtection implements Serializable {this.noCreation = noCreation;}- public void onGroupRename(String oldName, String newName) {+ public void onRenameGroup(String oldName, String newName) {if (getSubmitter() instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();if (specifiedGroup.getGroupName().equals(oldName))@@ -95,16 +99,16 @@ public class TagProtection implements Serializable {}}- public boolean onGroupDelete(String groupName) {+ public List<String> onDeleteGroup(String groupName) {if (getSubmitter() instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();if (specifiedGroup.getGroupName().equals(groupName))- return true;+ return Lists.newArrayList("If Performed By");}- return false;+ return new ArrayList<>();}- public void onUserRename(String oldName, String newName) {+ public void onRenameUser(String oldName, String newName) {if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(oldName))@@ -112,16 +116,16 @@ public class TagProtection implements Serializable {}}- public boolean onUserDelete(String userName) {+ public List<String> onDeleteUser(String userName) {if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(userName))- return true;+ return Lists.newArrayList("If Performed By");}- return false;+ return new ArrayList<>();}- public boolean onTagDelete(String tagName) {+ public boolean onTagDeleted(String tagName) {return tagName.equals(getTag());}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.javaindex bba9953115..03bb31a0eb 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java@@ -9,7 +9,8 @@ import java.util.Map;import javax.annotation.Nullable;-import io.onedev.server.util.OneException;+import io.onedev.server.exception.OneException;+import io.onedev.server.util.UsageUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;@@ -82,13 +83,14 @@ public class IssueWorkflow implements Serializable, InputContext {return field;}- public void onStateDelete(String stateName) {+ public List<String> onDeleteState(String stateName) {for (Iterator<StateTransition> it = getStateTransitions().iterator(); it.hasNext();) {StateTransition transition = it.next();transition.getFromStates().remove(stateName);if (transition.getFromStates().isEmpty() || transition.getToState().equals(stateName))it.remove();}+ return new ArrayList<>();}public void onStateRename(String oldName, String newName) {@@ -138,24 +140,53 @@ public class IssueWorkflow implements Serializable, InputContext {public void onFieldRename(String oldName, String newName) {for (StateSpec state: getStates())state.onFieldRename(oldName, newName);- for (StateTransition transition: getStateTransitions()) {- if (transition.getPrerequisite() != null && transition.getPrerequisite().getFieldName().equals(oldName))- transition.getPrerequisite().setFieldName(newName);- }+ for (StateTransition transition: getStateTransitions())+ transition.onFieldRename(oldName, newName);for (InputSpec field: getFields())field.onInputRename(oldName, newName);}- public void onFieldDelete(String fieldName) {- for (StateSpec state: getStates())- state.onFieldDelete(fieldName);+ public List<String> onFieldDelete(String fieldName) {+ List<String> usages = new ArrayList<>();+ for (StateSpec state: getStates())+ usages.addAll(UsageUtils.prependCategory("Issue state '" + state.getName() + "'", state.onFieldDelete(fieldName)));+ for (StateTransition transition: getStateTransitions())+ usages.addAll(UsageUtils.prependCategory("Issue state transition '" + transition + "'", transition.onFieldDelete(fieldName)));for (InputSpec field: getFields())- field.onInputDelete(fieldName);- for (Iterator<StateTransition> it = getStateTransitions().iterator(); it.hasNext();) {- StateTransition transition = it.next();- if (transition.getPrerequisite() != null && transition.getPrerequisite().getFieldName().equals(fieldName))- it.remove();- }+ usages.addAll(UsageUtils.prependCategory("Issue field '" + field.getName() + "'", field.onInputDelete(fieldName)));+ return usages;+ }++ public void onRenameUser(String oldName, String newName) {+ for (StateTransition transition: getStateTransitions())+ transition.onRenameUser(oldName, newName);+ for (InputSpec field: getFields())+ field.onRenameUser(oldName, newName);+ }++ public List<String> onDeleteUser(String userName) {+ List<String> usages = new ArrayList<>();+ for (InputSpec field: getFields())+ usages.addAll(UsageUtils.prependCategory("Issue field '" + field.getName() + "'" , field.onDeleteUser(userName)));+ for (StateTransition transition: getStateTransitions())+ usages.addAll(UsageUtils.prependCategory("Issue state transition '" + transition + "'", transition.onDeleteUser(userName)));+ return usages;+ }++ public void onRenameGroup(String oldName, String newName) {+ for (StateTransition transition: getStateTransitions())+ transition.onRenameGroup(oldName, newName);+ for (InputSpec field: getFields())+ field.onRenameGroup(oldName, newName);+ }++ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = new ArrayList<>();+ for (InputSpec field: getFields())+ usages.addAll(UsageUtils.prependCategory("Issue field '" + field.getName() + "'", field.onDeleteGroup(groupName)));+ for (StateTransition transition: getStateTransitions())+ usages.addAll(UsageUtils.prependCategory("Issue state transition '" + transition + "'", transition.onDeleteGroup(groupName)));+ return usages;}public StateSpec getInitialState() {diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.javaindex f74a90d6ae..64a1e90830 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java@@ -86,11 +86,12 @@ public class StateSpec implements Serializable {}}- public void onFieldDelete(String fieldName) {+ public List<String> onFieldDelete(String fieldName) {for (Iterator<String> it = getFields().iterator(); it.hasNext();) {if (it.next().equals(fieldName))it.remove();}+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.javaindex 13bf30f402..d7a98c2b17 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java@@ -9,12 +9,16 @@ import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.model.support.authorized.SpecifiedGroup;+import io.onedev.server.model.support.authorized.SpecifiedUser;import io.onedev.server.model.support.issueworkflow.action.IssueAction;+import io.onedev.server.model.support.issueworkflow.action.PressButton;import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;import io.onedev.server.web.util.WicketUtils;+import io.onedev.utils.StringUtils;@Editablepublic class StateTransition implements Serializable {@@ -71,7 +75,71 @@ public class StateTransition implements Serializable {public void setOnAction(IssueAction onAction) {this.onAction = onAction;}-++ public void onRenameUser(String oldName, String newName) {+ IssueAction onAction = getOnAction();+ if (onAction instanceof PressButton) {+ PressButton pressButton = (PressButton) onAction;+ if (pressButton.getAuthorized() instanceof SpecifiedUser) {+ SpecifiedUser specifiedUser = (SpecifiedUser) pressButton.getAuthorized();+ if (specifiedUser.getUserName().equals(oldName))+ specifiedUser.setUserName(newName);+ }+ }+ }++ public List<String> onDeleteUser(String userName) {+ List<String> usages = new ArrayList<>();+ IssueAction onAction = getOnAction();+ if (onAction instanceof PressButton) {+ PressButton pressButton = (PressButton) onAction;+ if (pressButton.getAuthorized() instanceof SpecifiedUser) {+ SpecifiedUser specifiedUser = (SpecifiedUser) pressButton.getAuthorized();+ if (specifiedUser.getUserName().equals(userName))+ usages.add("On Action");+ }+ }+ return usages;+ }++ public void onRenameGroup(String oldName, String newName) {+ IssueAction onAction = getOnAction();+ if (onAction instanceof PressButton) {+ PressButton pressButton = (PressButton) onAction;+ if (pressButton.getAuthorized() instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();+ if (specifiedGroup.getGroupName().equals(oldName))+ specifiedGroup.setGroupName(newName);+ }+ }+ }++ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = new ArrayList<>();+ IssueAction onAction = getOnAction();+ if (onAction instanceof PressButton) {+ PressButton pressButton = (PressButton) onAction;+ if (pressButton.getAuthorized() instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();+ if (specifiedGroup.getGroupName().equals(groupName))+ usages.add("On Action");+ }+ }+ return usages;+ }++ public void onFieldRename(String oldName, String newName) {+ if (getPrerequisite() != null && getPrerequisite().getFieldName().equals(oldName))+ getPrerequisite().setFieldName(newName);+ }++ public List<String> onFieldDelete(String fieldName) {+ List<String> usages = new ArrayList<>();+ if (getPrerequisite() != null && getPrerequisite().getFieldName().equals(fieldName))+ usages.add("Prerequisite");+ return usages;+ }+@SuppressWarnings("unused")private static List<String> getStateChoices() {IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();@@ -81,4 +149,9 @@ public class StateTransition implements Serializable {return stateNames;}+ @Override+ public String toString() {+ return StringUtils.join(getFromStates()) + "-->" + getToState();+ }+}diff --git a/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.javaindex 3bd8b0ccd6..1e43c6b145 100644--- a/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java+++ b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java@@ -1,7 +1,7 @@package io.onedev.server.security.authenticator;import java.io.Serializable;-import java.util.Iterator;+import java.util.ArrayList;import java.util.List;import org.apache.shiro.authc.AuthenticationException;@@ -9,6 +9,7 @@ import org.apache.shiro.authc.UsernamePasswordToken;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.GroupChoice;+import jersey.repackaged.com.google.common.collect.Lists;@Editablepublic abstract class Authenticator implements Serializable {@@ -39,24 +40,17 @@ public abstract class Authenticator implements Serializable {this.defaultGroupNames = defaultGroupNames;}- public boolean onGroupRename(String oldName, String newName) {- if (defaultGroupNames.contains(oldName)) {- defaultGroupNames.remove(oldName);- defaultGroupNames.add(newName);- return true;- } else {- return false;- }+ public void onRenameGroup(String oldName, String newName) {+ int index = defaultGroupNames.indexOf(oldName);+ if (index != -1)+ defaultGroupNames.set(index, newName);}- public boolean onGroupDelete(String groupName) {- for (Iterator<String> it = defaultGroupNames.iterator(); it.hasNext();) {- if (it.next().equals(groupName)) {- it.remove();- return true;- }- }- return false;+ public List<String> onDeleteGroup(String groupName) {+ if (defaultGroupNames.contains(groupName))+ return Lists.newArrayList("Default Group Names");+ else+ return new ArrayList<>();}public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;diff --git a/core/src/main/java/io/onedev/server/util/GroovyUtils.java b/core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 71aaaf7977..de11dddf73 100644--- a/core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -10,6 +10,7 @@ import com.google.common.collect.MapMaker;import groovy.lang.Binding;import groovy.lang.GroovyClassLoader;import groovy.lang.Script;+import io.onedev.server.exception.ScriptException;public class GroovyUtils {diff --git a/core/src/main/java/io/onedev/server/util/UsageUtils.java b/core/src/main/java/io/onedev/server/util/UsageUtils.javanew file mode 100644index 0000000000..ef009d44ca--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/UsageUtils.java@@ -0,0 +1,39 @@+package io.onedev.server.util;++import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.model.Model;+import org.unbescape.html.HtmlEscape;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationMessage;+import io.onedev.utils.StringUtils;++public class UsageUtils {++ public static String getMessage(String objectName, List<String> usages) {+ return objectName + " is still being used by:\n" + StringUtils.join(usages, "\n");+ }++ @Nullable+ public static NotificationMessage getNotificationMessage(String objectName, List<String> usages) {+ if (!usages.isEmpty()) {+ String message = getMessage(objectName, usages);+ message = HtmlEscape.escapeHtml5(message);+ message = StringUtils.replace(message, "\n", "<br>");+ return new NotificationMessage(Model.of(message)).escapeModelStrings(false);+ } else {+ return null;+ }+ }++ public static List<String> prependCategory(String category, List<String> usages) {+ List<String> prependedUsages = new ArrayList<>();+ for (String usage: usages)+ prependedUsages.add(category + " / " + usage);+ return prependedUsages;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 69fd68a21a..40be3da014 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -1,6 +1,7 @@package io.onedev.server.util.inputspec;import java.io.Serializable;+import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -202,16 +203,18 @@ public abstract class InputSpec implements Serializable {}}- public void onInputDelete(String inputName) {- if (showCondition != null && inputName.equals(showCondition.getInputName()))- showCondition = null;- }-public void onInputRename(String oldName, String newName) {if (showCondition != null && oldName.equals(showCondition.getInputName()))showCondition.setInputName(newName);}+ public List<String> onInputDelete(String inputName) {+ if (showCondition != null && inputName.equals(showCondition.getInputName()))+ return Lists.newArrayList("Show Condition");+ else+ return new ArrayList<>();+ }+public static Class<?> defineClass(String className, List<InputSpec> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");@@ -243,6 +246,22 @@ public abstract class InputSpec implements Serializable {return (Class<?>) GroovyUtils.evalScript(buffer.toString(), new HashMap<>());}+ public void onRenameUser(String oldName, String newName) {++ }++ public void onRenameGroup(String oldName, String newName) {++ }++ public List<String> onDeleteUser(String userName) {+ return new ArrayList<>();+ }++ public List<String> onDeleteGroup(String groupName) {+ return new ArrayList<>();+ }+public abstract List<String> convertToStrings(Object object);/**diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 213397887d..830c29fcde 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -13,6 +13,7 @@ import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.inputspec.groupchoiceprovider.AllGroups;import io.onedev.server.util.inputspec.groupchoiceprovider.ChoiceProvider;import jersey.repackaged.com.google.common.collect.Lists;@@ -77,4 +78,24 @@ public class GroupChoiceInput extends InputSpec {return Lists.newArrayList((String) value);}+ @Override+ public void onRenameGroup(String oldName, String newName) {+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().equals(oldName))+ specifiedDefaultValue.setValue(newName);+ }+ }++ @Override+ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = super.onDeleteGroup(groupName);+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().equals(groupName))+ usages.add("Default Value");+ }+ return usages;+ }+}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.javaindex c32d404d6e..0e6e9ad3a3 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java@@ -11,6 +11,7 @@ import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.groupchoiceprovider.AllGroups;import io.onedev.server.util.inputspec.groupchoiceprovider.ChoiceProvider;import io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider.SpecifiedDefaultValue;@Editable(order=161, name=InputSpec.GROUP_MULTI_CHOICE)public class GroupMultiChoiceInput extends InputSpec {@@ -52,6 +53,27 @@ public class GroupMultiChoiceInput extends InputSpec {return buffer.toString();}+ @Override+ public void onRenameGroup(String oldName, String newName) {+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ int index = specifiedDefaultValue.getValue().indexOf(oldName);+ if (index != -1)+ specifiedDefaultValue.getValue().set(index, newName);+ }+ }++ @Override+ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = super.onDeleteGroup(groupName);+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().contains(groupName))+ usages.add("Default Value");+ }+ return usages;+ }+@Overridepublic Object convertToObject(List<String> strings) {return strings;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex b4eff8ee16..b36eac80ba 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -13,7 +13,9 @@ import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.inputspec.userchoiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceprovider.GroupUsers;import io.onedev.server.util.inputspec.userchoiceprovider.ProjectReaders;import jersey.repackaged.com.google.common.collect.Lists;@@ -67,6 +69,46 @@ public class UserChoiceInput extends InputSpec {return buffer.toString();}+ @Override+ public void onRenameUser(String oldName, String newName) {+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().equals(oldName))+ specifiedDefaultValue.setValue(newName);+ }+ }++ @Override+ public List<String> onDeleteUser(String userName) {+ List<String> usages = super.onDeleteUser(userName);+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().equals(userName))+ usages.add("Default Value");+ }+ return usages;+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ if (choiceProvider instanceof GroupUsers) {+ GroupUsers groupUsers = (GroupUsers) choiceProvider;+ if (groupUsers.getGroupName().equals(oldName))+ groupUsers.setGroupName(newName);+ }+ }++ @Override+ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = super.onDeleteGroup(groupName);+ if (choiceProvider instanceof GroupUsers) {+ GroupUsers groupUsers = (GroupUsers) choiceProvider;+ if (groupUsers.getGroupName().equals(groupName))+ usages.add("Available Choices");+ }+ return usages;+ }+@Overridepublic Object convertToObject(List<String> strings) {return strings.iterator().next();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.javaindex 001aaebda9..4479b7d463 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java@@ -9,8 +9,10 @@ import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceprovider.GroupUsers;import io.onedev.server.util.inputspec.userchoiceprovider.ProjectReaders;import io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider.SpecifiedDefaultValue;@Editable(order=151, name=InputSpec.USER_MULTI_CHOICE)public class UserMultiChoiceInput extends InputSpec {@@ -52,6 +54,47 @@ public class UserMultiChoiceInput extends InputSpec {return buffer.toString();}+ @Override+ public void onRenameUser(String oldName, String newName) {+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ int index = specifiedDefaultValue.getValue().indexOf(oldName);+ if (index != -1)+ specifiedDefaultValue.getValue().set(index, newName);+ }+ }++ @Override+ public List<String> onDeleteUser(String userName) {+ List<String> usages = super.onDeleteUser(userName);+ if (defaultValueProvider instanceof SpecifiedDefaultValue) {+ SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;+ if (specifiedDefaultValue.getValue().contains(userName))+ usages.add("Default Value");+ }+ return usages;+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ if (choiceProvider instanceof GroupUsers) {+ GroupUsers groupUsers = (GroupUsers) choiceProvider;+ if (groupUsers.getGroupName().equals(oldName))+ groupUsers.setGroupName(newName);+ }+ }++ @Override+ public List<String> onDeleteGroup(String groupName) {+ List<String> usages = super.onDeleteGroup(groupName);+ if (choiceProvider instanceof GroupUsers) {+ GroupUsers groupUsers = (GroupUsers) choiceProvider;+ if (groupUsers.getGroupName().equals(groupName))+ usages.add("Available Choices");+ }+ return usages;+ }+@Overridepublic Object convertToObject(List<String> strings) {return strings;diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.javaindex 655343f194..40d13ecef6 100644--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java@@ -1,6 +1,6 @@package io.onedev.server.util.reviewrequirement;-import io.onedev.server.util.OneException;+import io.onedev.server.exception.OneException;public class InvalidReviewRuleException extends OneException {diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 88d4117761..36c1a3b13e 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -10,7 +10,7 @@ import java.util.Set;import com.google.common.collect.Sets;-import io.onedev.server.util.OneException;+import io.onedev.server.exception.OneException;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.utils.BeanUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.htmlindex d1b59450df..4d1dd7c671 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html@@ -9,6 +9,7 @@</div></div><div class="body">+ <div wicket:id="feedback"></div><table wicket:id="groups" class="groups table table-hover"></table></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.javaindex 99cf19c80c..c2028ce822 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.java@@ -27,7 +27,9 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.persistence.dao.EntityCriteria;@@ -150,8 +152,12 @@ public class GroupListPage extends LayoutPage {@Overridepublic void onClick() {- OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());- setResponsePage(GroupListPage.class);+ try {+ OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());+ setResponsePage(GroupListPage.class);+ } catch (InUseException exception) {+ groupsTable.error(exception.getNotificationMessage());+ }}@Override@@ -213,6 +219,8 @@ public class GroupListPage extends LayoutPage {add(groupsTable = new HistoryAwareDataTable<>("groups", columns, dataProvider,WebConstants.PAGE_SIZE, pagingHistorySupport));++ add(new NotificationPanel("feedback", groupsTable));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.htmlindex d7fcd6b547..f7b34f8032 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html@@ -2,6 +2,7 @@<div wicket:id="content" class="profile"></div><wicket:fragment wicket:id="editFrag"><form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="checkbox"><label>diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.javaindex 2a0429e029..b2228affb5 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java@@ -15,7 +15,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;@@ -92,6 +94,7 @@ public class GroupProfilePage extends GroupPage {}};+ form.add(new NotificationPanel("feedback", form));form.add(editor);administratorInput = new CheckBox("administrator", Model.of(getGroup().isAdministrator()));@@ -130,8 +133,12 @@ public class GroupProfilePage extends GroupPage {@Overridepublic void onClick() {- OneDev.getInstance(GroupManager.class).delete(getGroup());- setResponsePage(GroupListPage.class);+ try {+ OneDev.getInstance(GroupManager.class).delete(getGroup());+ setResponsePage(GroupListPage.class);+ } catch (InUseException exception) {+ form.error(exception.getNotificationMessage());+ }}}.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.javaindex 830547fafe..cd596b353d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java@@ -30,6 +30,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.support.issueworkflow.IssueWorkflow;+import io.onedev.server.util.UsageUtils;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.sortable.SortBehavior;@@ -230,12 +231,17 @@ public class IssueFieldsPage extends IssueWorkflowPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getWorkflow().onFieldDelete(getField().getName());- getWorkflow().getFields().remove(index);- getProject().setIssueWorkflow(getWorkflow());- OneDev.getInstance(ProjectManager.class).save(getProject());- target.add(fieldsTable);- close();+ List<String> usages = getWorkflow().onFieldDelete(getField().getName());+ if (!usages.isEmpty()) {+ fragment.error(UsageUtils.getNotificationMessage("Field '" + getField().getName() + "'", usages));+ target.add(fragment);+ } else {+ getWorkflow().getFields().remove(index);+ getProject().setIssueWorkflow(getWorkflow());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(fieldsTable);+ close();+ }}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.javaindex e70f2c7586..8f903ff26d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java@@ -32,6 +32,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.support.issueworkflow.IssueWorkflow;import io.onedev.server.model.support.issueworkflow.StateSpec;+import io.onedev.server.util.UsageUtils;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;@@ -233,12 +234,17 @@ public class IssueStatesPage extends IssueWorkflowPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getWorkflow().onStateDelete(getState().getName());- getWorkflow().getStates().remove(index);- getProject().setIssueWorkflow(getWorkflow());- OneDev.getInstance(ProjectManager.class).save(getProject());- target.add(statesTable);- close();+ List<String> usages = getWorkflow().onDeleteState(getState().getName());+ if (!usages.isEmpty()) {+ fragment.error(UsageUtils.getNotificationMessage("State '" + getState().getName() + "'", usages));+ target.add(fragment);+ } else {+ getWorkflow().getStates().remove(index);+ getProject().setIssueWorkflow(getWorkflow());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(statesTable);+ close();+ }}});diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.htmlindex 9bf7ec3f8c..fe96eef19a 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html@@ -9,6 +9,7 @@</div></div><div class="body">+ <div wicket:id="feedback"></div><table wicket:id="users" class="users table table-hover"></table></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.javaindex 270b2379d1..aabfa6b9cf 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java@@ -27,7 +27,9 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;@@ -145,7 +147,12 @@ public class UserListPage extends LayoutPage {@Overridepublic void onClick() {- OneDev.getInstance(UserManager.class).delete(rowModel.getObject());+ try {+ OneDev.getInstance(UserManager.class).delete(rowModel.getObject());+ setResponsePage(UserListPage.class);+ } catch (InUseException e) {+ usersTable.error(e.getNotificationMessage() );+ }}@Override@@ -207,6 +214,7 @@ public class UserListPage extends LayoutPage {add(usersTable = new HistoryAwareDataTable<User, Void>("users", columns, dataProvider,WebConstants.PAGE_SIZE, pagingHistorySupport));+ add(new NotificationPanel("feedback", usersTable));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.htmlindex e0dc33a953..44a69af157 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html@@ -2,6 +2,7 @@<div wicket:id="content" class="profile"></div><wicket:fragment wicket:id="editFrag"><form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.javaindex 74e7f16ab6..a66605f4d0 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java@@ -11,7 +11,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.exception.InUseException;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;@@ -84,6 +86,7 @@ public class UserProfilePage extends UserPage {}};+ form.add(new NotificationPanel("feedback", form));form.add(editor);form.add(new Link<Void>("delete") {@@ -97,8 +100,12 @@ public class UserProfilePage extends UserPage {@Overridepublic void onClick() {- OneDev.getInstance(UserManager.class).delete(getUser());- setResponsePage(UserListPage.class);+ try {+ OneDev.getInstance(UserManager.class).delete(getUser());+ setResponsePage(UserListPage.class);+ } catch (InUseException e) {+ form.error(e.getNotificationMessage());+ }}}.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));