Merge "Move ProjectNode to restapi package"

java/com/google/gerrit/server/config/GerritGlobalModule.java

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

java/com/google/gerrit/server/restapi/project/ListProjects.java

@@ -47,7 +47,6 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.gerrit.server.permissions.ProjectPermission;
 import com.google.gerrit.server.permissions.RefPermission;
 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.restapi.group.GroupsCollection;
 import com.google.gerrit.server.util.RegexListSearcher;

java/com/google/gerrit/server/restapi/project/Module.java

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

java/com/google/gerrit/server/restapi/project/ProjectNode.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // 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.server.config.AllProjectsName;
@@ -23,8 +23,8 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 /** Node of a Project in a tree formatted by {@link ListProjects}. */
-public class ProjectNode implements TreeNode, Comparable<ProjectNode> {
-  public interface Factory {
+class ProjectNode implements TreeNode, Comparable<ProjectNode> {
+  interface Factory {
     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
    */
-  public Project.NameKey getParentName() {
+  Project.NameKey getParentName() {
     return project.getParent(allProjectsName);
   }
 
-  public boolean isAllProjects() {
+  boolean isAllProjects() {
     return allProjectsName.equals(project.getNameKey());
   }
 
-  public Project getProject() {
+  Project getProject() {
     return project;
   }
 
@@ -76,7 +76,7 @@ public class ProjectNode implements TreeNode, Comparable<ProjectNode> {
     return children;
   }
 
-  public void addChild(ProjectNode child) {
+  void addChild(ProjectNode child) {
     children.add(child);
   }