Skip to content

The Unified and Autonomous Development Platform

Refactoring review requirement

Robin Shen903052831d75
diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index fbf52ff9da..bfc6dbf438 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
@@ -11,9 +11,7 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.usermatcher.Anyone;
@@ -161,40 +159,25 @@ public class BranchProtection implements Serializable {
public void onRenameGroup(String oldName, String newName) {
submitter = UserMatcher.onRenameGroup(submitter, oldName, newName);
-
- ReviewRequirement reviewRequirement = ReviewRequirement.fromString(this.reviewRequirement);
- for (Group group: reviewRequirement.getGroups().keySet()) {
- if (group.getName().equals(oldName))
- group.setName(newName);
- }
- setReviewRequirement(reviewRequirement.toString());
+ reviewRequirement = ReviewRequirement.onRenameGroup(reviewRequirement, oldName, newName);
for (FileProtection fileProtection: getFileProtections()) {
- reviewRequirement = ReviewRequirement.fromString(fileProtection.getReviewRequirement());
- for (Group group: reviewRequirement.getGroups().keySet()) {
- if (group.getName().equals(oldName))
- group.setName(newName);
- }
- fileProtection.setReviewRequirement(reviewRequirement.toString());
+ fileProtection.setReviewRequirement(ReviewRequirement.onRenameGroup(
+ fileProtection.getReviewRequirement(), oldName, newName));
}
}
public boolean onDeleteGroup(String groupName) {
submitter = UserMatcher.onDeleteGroup(submitter, groupName);
-
- for (Group group: ReviewRequirement.fromString(reviewRequirement).getGroups().keySet()) {
- if (group.getName().equals(groupName))
- return true;
- }
-
+ reviewRequirement = ReviewRequirement.onDeleteGroup(reviewRequirement, groupName);
+
for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
FileProtection protection = it.next();
- for (Group group: ReviewRequirement.fromString(protection.getReviewRequirement()).getGroups().keySet()) {
- if (group.getName().equals(groupName)) {
- it.remove();
- break;
- }
- }
+ String reviewRequirement = ReviewRequirement.onDeleteGroup(protection.getReviewRequirement(), groupName);
+ if (reviewRequirement != null)
+ protection.setReviewRequirement(reviewRequirement);
+ else
+ it.remove();
}
return false;
@@ -212,40 +195,25 @@ public class BranchProtection implements Serializable {
public void onRenameUser(Project project, String oldName, String newName) {
submitter = UserMatcher.onRenameUser(submitter, oldName, newName);
-
- ReviewRequirement reviewRequirement = ReviewRequirement.fromString(this.reviewRequirement);
- for (User user: reviewRequirement.getUsers()) {
- if (user.getName().equals(oldName))
- user.setName(newName);
- }
- setReviewRequirement(reviewRequirement.toString());
+ reviewRequirement = ReviewRequirement.onRenameUser(reviewRequirement, oldName, newName);
for (FileProtection fileProtection: getFileProtections()) {
- reviewRequirement = ReviewRequirement.fromString(fileProtection.getReviewRequirement());
- for (User user: reviewRequirement.getUsers()) {
- if (user.getName().equals(oldName))
- user.setName(newName);
- }
- fileProtection.setReviewRequirement(reviewRequirement.toString());
+ fileProtection.setReviewRequirement(ReviewRequirement.onRenameUser(
+ fileProtection.getReviewRequirement(), oldName, newName));
}
}
public boolean onDeleteUser(Project project, String userName) {
submitter = UserMatcher.onDeleteUser(submitter, userName);
-
- for (User user: ReviewRequirement.fromString(reviewRequirement).getUsers()) {
- if (user.getName().equals(userName))
- return true;
- }
-
+ reviewRequirement = ReviewRequirement.onDeleteUser(reviewRequirement, userName);
+
for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
FileProtection protection = it.next();
- for (User user: ReviewRequirement.fromString(protection.getReviewRequirement()).getUsers()) {
- if (user.getName().equals(userName)) {
- it.remove();
- break;
- }
- }
+ String reviewRequirement = ReviewRequirement.onDeleteUser(protection.getReviewRequirement(), userName);
+ if (reviewRequirement != null)
+ protection.setReviewRequirement(reviewRequirement);
+ else
+ it.remove();
}
return false;
}
diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
index 1e71f92c9f..d452dbffa1 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
@@ -1,20 +1,20 @@
-grammar ReviewRequirement;
-
-requirement: ' '* criteria (' '+ criteria)* ' '* EOF;
-
-criteria: userCriteria | groupCriteria;
-
-userCriteria: USER Value;
-groupCriteria: GROUP Value (':' count)?;
-
-count: 'all' | DIGIT;
-
-DIGIT: [1-9][0-9]*;
-
-USER: 'user';
-GROUP: 'group';
-
-Value: '(' (ESCAPE|~[()\\])+? ')';
-
-fragment
-ESCAPE: '\\'[()\\];
+grammar ReviewRequirement;
+
+requirement: ' '* criteria (' '+ criteria)* ' '* EOF;
+
+criteria: userCriteria | groupCriteria;
+
+userCriteria: USER Value;
+groupCriteria: GROUP Value (':' count)?;
+
+count: 'all' | DIGIT;
+
+DIGIT: [1-9][0-9]*;
+
+USER: 'user';
+GROUP: 'group';
+
+Value: '(' (ESCAPE|~[()\\])+? ')';
+
+fragment
+ESCAPE: '\\'[()\\];
diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index ab77c39045..51dd81816d 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -1,156 +1,195 @@
-package io.onedev.server.util.reviewrequirement;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.exception.OneException;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.User;
-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;
-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;
-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;
-
-public class ReviewRequirement {
-
- private final List<User> users;
-
- private final Map<Group, Integer> groups;
-
- public ReviewRequirement(List<User> users, Map<Group, Integer> groups) {
- this.users = users;
- this.groups = groups;
- }
-
- public static ReviewRequirement fromString(String requirementString) {
- List<User> users = new ArrayList<>();
- Map<Group, Integer> groups = new LinkedHashMap<>();
-
- if (requirementString != null) {
- RequirementContext requirement = parse(requirementString);
-
- for (CriteriaContext criteria: requirement.criteria()) {
- if (criteria.userCriteria() != null) {
- String userName = getBracedValue(criteria.userCriteria().Value());
- User user = OneDev.getInstance(UserManager.class).findByName(userName);
- if (user != null) {
- if (!users.contains(user)) {
- users.add(user);
- } else {
- throw new OneException("User '" + userName + "' is included multiple times");
- }
- } else {
- throw new OneException("Unable to find user '" + userName + "'");
- }
- } else if (criteria.groupCriteria() != null) {
- String groupName = getBracedValue(criteria.groupCriteria().Value());
- Group group = OneDev.getInstance(GroupManager.class).find(groupName);
- if (group != null) {
- if (!groups.containsKey(group)) {
- CountContext count = criteria.groupCriteria().count();
- if (count != null) {
- if (count.DIGIT() != null)
- groups.put(group, Integer.parseInt(count.DIGIT().getText()));
- else
- groups.put(group, 0);
- } else {
- groups.put(group, 1);
- }
- } else {
- throw new OneException("Group '" + groupName + "' is included multiple times");
- }
- } else {
- throw new OneException("Unable to find group '" + groupName + "'");
- }
- }
- }
- }
-
- return new ReviewRequirement(users, groups);
- }
-
- public static RequirementContext parse(String requirementString) {
- CharStream is = CharStreams.fromString(requirementString);
- ReviewRequirementLexer lexer = new ReviewRequirementLexer(is);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new BaseErrorListener() {
-
- @Override
- public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
- int charPositionInLine, String msg, RecognitionException e) {
- throw new OneException("Malformed review requirement");
- }
-
- });
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- ReviewRequirementParser parser = new ReviewRequirementParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- return parser.requirement();
- }
-
- private static String getBracedValue(TerminalNode terminal) {
- String value = terminal.getText().substring(1);
- return value.substring(0, value.length()-1).trim();
- }
-
- public List<User> getUsers() {
- return users;
- }
-
- public Map<Group, Integer> getGroups() {
- return groups;
- }
-
- public boolean satisfied(User user) {
- for (User eachUser: users) {
- if (!eachUser.equals(user))
- return false;
- }
- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
- Group group = entry.getKey();
- int requiredCount = entry.getValue();
- if (requiredCount == 0 || requiredCount > group.getMembers().size())
- requiredCount = group.getMembers().size();
-
- if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))
- return false;
- }
- return true;
- }
-
- @Nullable
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- for (User user: users)
- builder.append("user(").append(user.getName()).append(") ");
- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
- builder.append("group(").append(entry.getKey().getName()).append(")");
- if (entry.getValue() == 0)
- builder.append(":all");
- else if (entry.getValue() != 1)
- builder.append(":").append(entry.getValue());
- builder.append(" ");
- }
- if (builder.length() != 0)
- return builder.toString().trim();
- else
- return null;
- }
-}
+package io.onedev.server.util.reviewrequirement;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;
+
+public class ReviewRequirement {
+
+ private final List<User> users;
+
+ private final Map<Group, Integer> groups;
+
+ public ReviewRequirement(List<User> users, Map<Group, Integer> groups) {
+ this.users = users;
+ this.groups = groups;
+ }
+
+ public static ReviewRequirement fromString(@Nullable String requirementString) {
+ List<User> users = new ArrayList<>();
+ Map<Group, Integer> groups = new LinkedHashMap<>();
+
+ if (requirementString != null) {
+ RequirementContext requirement = parse(requirementString);
+
+ for (CriteriaContext criteria: requirement.criteria()) {
+ if (criteria.userCriteria() != null) {
+ String userName = getBracedValue(criteria.userCriteria().Value());
+ User user = OneDev.getInstance(UserManager.class).findByName(userName);
+ if (user != null) {
+ if (!users.contains(user)) {
+ users.add(user);
+ } else {
+ throw new OneException("User '" + userName + "' is included multiple times");
+ }
+ } else {
+ throw new OneException("Unable to find user '" + userName + "'");
+ }
+ } else if (criteria.groupCriteria() != null) {
+ String groupName = getBracedValue(criteria.groupCriteria().Value());
+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);
+ if (group != null) {
+ if (!groups.containsKey(group)) {
+ CountContext count = criteria.groupCriteria().count();
+ if (count != null) {
+ if (count.DIGIT() != null)
+ groups.put(group, Integer.parseInt(count.DIGIT().getText()));
+ else
+ groups.put(group, 0);
+ } else {
+ groups.put(group, 1);
+ }
+ } else {
+ throw new OneException("Group '" + groupName + "' is included multiple times");
+ }
+ } else {
+ throw new OneException("Unable to find group '" + groupName + "'");
+ }
+ }
+ }
+ }
+
+ return new ReviewRequirement(users, groups);
+ }
+
+ public static RequirementContext parse(String requirementString) {
+ CharStream is = CharStreams.fromString(requirementString);
+ ReviewRequirementLexer lexer = new ReviewRequirementLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed review requirement");
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ ReviewRequirementParser parser = new ReviewRequirementParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ return parser.requirement();
+ }
+
+ private static String getBracedValue(TerminalNode terminal) {
+ String value = terminal.getText().substring(1);
+ return value.substring(0, value.length()-1).trim();
+ }
+
+ public List<User> getUsers() {
+ return users;
+ }
+
+ public Map<Group, Integer> getGroups() {
+ return groups;
+ }
+
+ public boolean satisfied(User user) {
+ for (User eachUser: users) {
+ if (!eachUser.equals(user))
+ return false;
+ }
+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ Group group = entry.getKey();
+ int requiredCount = entry.getValue();
+ if (requiredCount == 0 || requiredCount > group.getMembers().size())
+ requiredCount = group.getMembers().size();
+
+ if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))
+ return false;
+ }
+ return true;
+ }
+
+ @Nullable
+ public static String onRenameGroup(String reviewRequirementString, String oldName, String newName) {
+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
+ for (Group group: reviewRequirement.getGroups().keySet()) {
+ if (group.getName().equals(oldName))
+ group.setName(newName);
+ }
+ return reviewRequirement.toString();
+ }
+
+ @Nullable
+ public static String onDeleteGroup(String reviewRequirementString, String groupName) {
+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
+ for (Iterator<Map.Entry<Group, Integer>> it = reviewRequirement.getGroups().entrySet().iterator(); it.hasNext();) {
+ if (it.next().getKey().getName().equals(groupName))
+ it.remove();
+ }
+ return reviewRequirement.toString();
+ }
+
+ public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {
+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
+ for (User user: reviewRequirement.getUsers()) {
+ if (user.getName().equals(oldName))
+ user.setName(newName);
+ }
+ return reviewRequirement.toString();
+ }
+
+ public static String onDeleteUser(String reviewRequirementString, String userName) {
+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
+ for (Iterator<User> it = reviewRequirement.getUsers().iterator(); it.hasNext();) {
+ if (it.next().getName().equals(userName))
+ it.remove();
+ }
+ return reviewRequirement.toString();
+ }
+
+ @Nullable
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ for (User user: users)
+ builder.append("user(").append(user.getName()).append(") ");
+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ builder.append("group(").append(entry.getKey().getName()).append(")");
+ if (entry.getValue() == 0)
+ builder.append(":all");
+ else if (entry.getValue() != 1)
+ builder.append(":").append(entry.getValue());
+ builder.append(" ");
+ }
+ if (builder.length() != 0)
+ return builder.toString().trim();
+ else
+ return null;
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
index d5fcc423cf..9d42afc23d 100644
--- a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
+++ b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
@@ -6,6 +6,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStream;
@@ -83,7 +85,7 @@ public class UserMatcher implements Serializable {
}
}
- public static UserMatcher fromString(String userMatcherString) {
+ public static UserMatcher fromString(@Nullable String userMatcherString) {
List<UserMatcherCriteria> criterias = new ArrayList<>();
List<UserMatcherCriteria> exceptCriterias = new ArrayList<>();
@@ -163,36 +165,25 @@ public class UserMatcher implements Serializable {
return new Anyone().toString();
}
- public static String onRenameGroup(String userMatcherString, String oldName, String newName) {
- UserMatcher userMatcher = UserMatcher.fromString(userMatcherString);
- for (UserMatcherCriteria criteria: userMatcher.getCriterias()) {
- if (criteria instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
- if (specifiedGroup.getGroupName().equals(oldName))
- specifiedGroup.setGroupName(newName);
- }
- }
- for (UserMatcherCriteria criteria: userMatcher.getExceptCriterias()) {
+ private static void onRenameGroup(List<UserMatcherCriteria> criterias, String oldName, String newName) {
+ for (UserMatcherCriteria criteria: criterias) {
if (criteria instanceof SpecifiedGroup) {
SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
if (specifiedGroup.getGroupName().equals(oldName))
specifiedGroup.setGroupName(newName);
}
}
- return userMatcher.toString();
}
- public static String onDeleteGroup(String userMatcherString, String groupName) {
- UserMatcher userMatcher = UserMatcher.fromString(userMatcherString);
- for (Iterator<UserMatcherCriteria> it = userMatcher.getCriterias().iterator(); it.hasNext();) {
- UserMatcherCriteria criteria = it.next();
- if (criteria instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
- if (specifiedGroup.getGroupName().equals(groupName))
- it.remove();
- }
- }
- for (Iterator<UserMatcherCriteria> it = userMatcher.getExceptCriterias().iterator(); it.hasNext();) {
+ public static String onRenameGroup(String userMatcherString, String oldName, String newName) {
+ UserMatcher userMatcher = fromString(userMatcherString);
+ onRenameGroup(userMatcher.getCriterias(), oldName, newName);
+ onRenameGroup(userMatcher.getExceptCriterias(), oldName, newName);
+ return userMatcher.toString();
+ }
+
+ private static void onDeleteGroup(List<UserMatcherCriteria> criterias, String groupName) {
+ for (Iterator<UserMatcherCriteria> it = criterias.iterator(); it.hasNext();) {
UserMatcherCriteria criteria = it.next();
if (criteria instanceof SpecifiedGroup) {
SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
@@ -200,39 +191,34 @@ public class UserMatcher implements Serializable {
it.remove();
}
}
- return userMatcher.toString();
}
- public static String onRenameUser(String userMatcherString, String oldName, String newName) {
- UserMatcher userMatcher = UserMatcher.fromString(userMatcherString);
- for (UserMatcherCriteria criteria: userMatcher.getCriterias()) {
- if (criteria instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
- if (specifiedUser.getUserName().equals(oldName))
- specifiedUser.setUserName(newName);
- }
- }
- for (UserMatcherCriteria criteria: userMatcher.getExceptCriterias()) {
+ public static String onDeleteGroup(String userMatcherString, String groupName) {
+ UserMatcher userMatcher = fromString(userMatcherString);
+ onDeleteGroup(userMatcher.getCriterias(), groupName);
+ onDeleteGroup(userMatcher.getExceptCriterias(), groupName);
+ return userMatcher.toString();
+ }
+
+ private static void onRenameUser(List<UserMatcherCriteria> criterias, String oldName, String newName) {
+ for (UserMatcherCriteria criteria: criterias) {
if (criteria instanceof SpecifiedUser) {
SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
if (specifiedUser.getUserName().equals(oldName))
specifiedUser.setUserName(newName);
}
}
- return userMatcher.toString();
}
- public static String onDeleteUser(String userMatcherString, String userName) {
- UserMatcher userMatcher = UserMatcher.fromString(userMatcherString);
- for (Iterator<UserMatcherCriteria> it = userMatcher.getCriterias().iterator(); it.hasNext();) {
- UserMatcherCriteria criteria = it.next();
- if (criteria instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
- if (specifiedUser.getUserName().equals(userName))
- it.remove();
- }
- }
- for (Iterator<UserMatcherCriteria> it = userMatcher.getExceptCriterias().iterator(); it.hasNext();) {
+ public static String onRenameUser(String userMatcherString, String oldName, String newName) {
+ UserMatcher userMatcher = fromString(userMatcherString);
+ onRenameUser(userMatcher.getCriterias(), oldName, newName);
+ onRenameUser(userMatcher.getExceptCriterias(), oldName, newName);
+ return userMatcher.toString();
+ }
+
+ private static void onDeleteUser(List<UserMatcherCriteria> criterias, String userName) {
+ for (Iterator<UserMatcherCriteria> it = criterias.iterator(); it.hasNext();) {
UserMatcherCriteria criteria = it.next();
if (criteria instanceof SpecifiedUser) {
SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
@@ -240,6 +226,12 @@ public class UserMatcher implements Serializable {
it.remove();
}
}
+ }
+
+ public static String onDeleteUser(String userMatcherString, String userName) {
+ UserMatcher userMatcher = fromString(userMatcherString);
+ onDeleteUser(userMatcher.getCriterias(), userName);
+ onDeleteUser(userMatcher.getExceptCriterias(), userName);
return userMatcher.toString();
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/editable.css b/core/src/main/java/io/onedev/server/web/editable/editable.css
index 1b533f5d8f..8a4ea3e009 100644
--- a/core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -18,7 +18,7 @@
}
.editable>.group>a:AFTER {
font-family: "FontAwesome";
- margin-left: 12px;
+ margin-left: 12px;
}
.editable>.group>a:AFTER {
content: "\f103";
diff --git a/core/src/main/java/io/onedev/server/web/editable/editable.js b/core/src/main/java/io/onedev/server/web/editable/editable.js
index 78809b6b08..b816992832 100644
--- a/core/src/main/java/io/onedev/server/web/editable/editable.js
+++ b/core/src/main/java/io/onedev/server/web/editable/editable.js
@@ -11,7 +11,7 @@ onedev.server.editable = {
var $container = $("#" + containerId);
var $group = $container.children(".group");
$group.children("a").click(function() {
- $(this).parent().toggleClass("expanded");
+ $(this).parent().toggleClass("expanded");
});
},
onBeanEditorPropertyContainerDomReady: function(containerId) {