opendev/gerrit
Code Issues Proposed changes

Merge "Move ProjectNode to restapi package"

Browse Source
This commit is contained in:
David Pursehouse
2018-01-09 00:43:46 +00:00
committed by Gerrit Code Review
parent 56f5ffd085 6855a7d60b
commit 2d88e095d8
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/config/GerritGlobalModule.java
View File

@@ -166,7 +166,6 @@ import com.google.gerrit.server.project.CommentLinkProvider;
import com.google.gerrit.server.project.PermissionCollection; import com.google.gerrit.server.project.PermissionCollection;
import com.google.gerrit.server.project.ProjectCacheImpl; import com.google.gerrit.server.project.ProjectCacheImpl;
import com.google.gerrit.server.project.ProjectNameLockManager; import com.google.gerrit.server.project.ProjectNameLockManager;
import com.google.gerrit.server.project.ProjectNode;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.SectionSortCache; import com.google.gerrit.server.project.SectionSortCache;
import com.google.gerrit.server.project.SubmitRuleEvaluator; import com.google.gerrit.server.project.SubmitRuleEvaluator;
@@ -264,7 +263,6 @@ public class GerritGlobalModule extends FactoryModule {
factory(MergeUtil.Factory.class); factory(MergeUtil.Factory.class);
factory(PatchScriptFactory.Factory.class); factory(PatchScriptFactory.Factory.class);
factory(PluginUser.Factory.class); factory(PluginUser.Factory.class);
factory(ProjectNode.Factory.class);
factory(ProjectState.Factory.class); factory(ProjectState.Factory.class);
factory(RegisterNewEmailSender.Factory.class); factory(RegisterNewEmailSender.Factory.class);
factory(ReplacePatchSetSender.Factory.class); factory(ReplacePatchSetSender.Factory.class);

1
java/com/google/gerrit/server/restapi/project/ListProjects.java
View File

@@ -47,7 +47,6 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission; import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.permissions.RefPermission; import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectNode;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.restapi.group.GroupsCollection; import com.google.gerrit.server.restapi.group.GroupsCollection;
import com.google.gerrit.server.util.RegexListSearcher; import com.google.gerrit.server.util.RegexListSearcher;

1
java/com/google/gerrit/server/restapi/project/Module.java
View File

@@ -100,5 +100,6 @@ public class Module extends RestApiModule {
put(PROJECT_KIND, "config").to(PutConfig.class); put(PROJECT_KIND, "config").to(PutConfig.class);
factory(DeleteRef.Factory.class); factory(DeleteRef.Factory.class);
factory(ProjectNode.Factory.class);
} }
} }

14
java/com/google/gerrit/server/project/ProjectNode.java → java/com/google/gerrit/server/restapi/project/ProjectNode.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package com.google.gerrit.server.project; package com.google.gerrit.server.restapi.project;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllProjectsName;
@@ -23,8 +23,8 @@ import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
/** Node of a Project in a tree formatted by {@link ListProjects}. */ /** Node of a Project in a tree formatted by {@link ListProjects}. */
public class ProjectNode implements TreeNode, Comparable<ProjectNode> { class ProjectNode implements TreeNode, Comparable<ProjectNode> {
public interface Factory { interface Factory {
ProjectNode create(Project project, boolean isVisible); ProjectNode create(Project project, boolean isVisible);
} }
@@ -49,15 +49,15 @@ public class ProjectNode implements TreeNode, Comparable<ProjectNode> {
* *
* @return Project parent name, {@code null} for the 'All-Projects' root project * @return Project parent name, {@code null} for the 'All-Projects' root project
*/ */
public Project.NameKey getParentName() { Project.NameKey getParentName() {
return project.getParent(allProjectsName); return project.getParent(allProjectsName);
} }
public boolean isAllProjects() { boolean isAllProjects() {
return allProjectsName.equals(project.getNameKey()); return allProjectsName.equals(project.getNameKey());
} }
public Project getProject() { Project getProject() {
return project; return project;
} }
@@ -76,7 +76,7 @@ public class ProjectNode implements TreeNode, Comparable<ProjectNode> {
return children; return children;
} }
public void addChild(ProjectNode child) { void addChild(ProjectNode child) {
children.add(child); children.add(child);
} }