Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring various ancestor/descendants methods of project

Robin Shen50347fbebaa1
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index a3613ad553..da04047612 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -383,7 +383,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
}
Set<Project> projects = Sets.newHashSet(project);
- projects.addAll(project.getForkParents());
+ projects.addAll(project.getForkAncestors());
List<Criterion> projectCriterions = new ArrayList<>();
for (Project each: projects) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index c5d4d16884..0dfc296bb5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -828,7 +828,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
projectPredicates.add(buildAuthorizationPredicate(criteriaQuery, builder, root, project));
}
- for (Project forkParent: project.getForkParents()) {
+ for (Project forkParent: project.getForkAncestors()) {
if (SecurityUtils.canAccessConfidentialIssues(forkParent)) {
projectPredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), forkParent));
} else if (SecurityUtils.canAccessProject(forkParent)) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 1fdde69ed5..466aa94358 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -374,7 +374,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
usage.checkInUse("Project '" + project.getPath() + "'");
for (Project fork : project.getForks()) {
- Collection<Project> forkChildren = fork.getForkChildren();
+ Collection<Project> forkChildren = fork.getForkDescendants();
forkChildren.add(fork);
for (Project forkChild : forkChildren) {
Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 192fcc5b91..16a27b6a65 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -951,7 +951,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
}
Set<Project> projects = Sets.newHashSet(project);
- projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canReadCode(it)).collect(Collectors.toSet()));
+ projects.addAll(project.getForkAncestors().stream().filter(it->SecurityUtils.canReadCode(it)).collect(Collectors.toSet()));
criteria.add(Restrictions.in(PullRequest.PROP_TARGET_PROJECT, projects));
if (fuzzyQuery.startsWith("#"))
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 0930f50f37..b2b60febf5 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -550,14 +550,14 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
this.children = children;
}
- public Collection<Project> getDescendants() {
- Collection<Project> descendants = new ArrayList<>(getChildren());
+ public List<Project> getDescendants() {
+ List<Project> descendants = new ArrayList<>(getChildren());
for (Project child: getChildren())
descendants.addAll(child.getDescendants());
return descendants;
}
- public Collection<Project> getAncestors() {
+ public List<Project> getAncestors() {
List<Project> ancestors = new ArrayList<>();
if (getParent() != null) {
ancestors.add(getParent());
@@ -615,23 +615,23 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
* @return
* all descendant projects forking from current project
*/
- public List<Project> getForkChildren() {
- List<Project> children = new ArrayList<>();
+ public List<Project> getForkDescendants() {
+ List<Project> forkDescendants = new ArrayList<>();
for (Project fork: getForks()) {
- children.add(fork);
- children.addAll(fork.getForkChildren());
+ forkDescendants.add(fork);
+ forkDescendants.addAll(fork.getForkDescendants());
}
- return children;
+ return forkDescendants;
}
- public List<Project> getForkParents() {
- List<Project> forkParents = new ArrayList<>();
+ public List<Project> getForkAncestors() {
+ List<Project> forkAncestors = new ArrayList<>();
if (getForkedFrom() != null) {
- forkParents.add(getForkedFrom());
- forkParents.addAll(getForkedFrom().getForkParents());
+ forkAncestors.add(getForkedFrom());
+ forkAncestors.addAll(getForkedFrom().getForkAncestors());
}
- return forkParents;
+ return forkAncestors;
}
private ProjectManager getProjectManager() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
index ec3ecb4d51..d44a21f750 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
@@ -66,7 +66,7 @@ public abstract class AffinalBranchPicker extends Panel {
@Override
protected List<Project> load() {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
- List<Project> affinals = project.getForkRoot().getForkChildren();
+ List<Project> affinals = project.getForkRoot().getForkDescendants();
affinals.add(0, project.getForkRoot());
affinals.retainAll(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new ReadCode()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
index a16ca15049..c07ab5d726 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
@@ -66,7 +66,7 @@ public abstract class AffinalRevisionPicker extends Panel {
@Override
protected List<Project> load() {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
- List<Project> affinals = project.getForkRoot().getForkChildren();
+ List<Project> affinals = project.getForkRoot().getForkDescendants();
affinals.add(0, project.getForkRoot());
affinals.retainAll(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new ReadCode()));