From 6855a7d60b05ba3c07d8d07118df21fe86298a3b Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Mon, 8 Jan 2018 14:10:05 -0500
Subject: [PATCH] Move ProjectNode to restapi package

I noticed that ProjectNode had a broken javadoc @link to ListProjects
following Id0d9030a, but investigation revealed that the only user of
this class is ListProjects itself. As this class is an implementation
detail of the REST API handler code, move it nearby and make it
package-private.

Change-Id: Ia0cd366716daff5631bdef4cb73003ba16b0a891
---
 .../gerrit/server/config/GerritGlobalModule.java   |  2 --
 .../server/restapi/project/ListProjects.java       |  1 -
 .../gerrit/server/restapi/project/Module.java      |  1 +
 .../server/{ => restapi}/project/ProjectNode.java  | 14 +++++++-------
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename java/com/google/gerrit/server/{ => restapi}/project/ProjectNode.java (88%)

diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 1dda0e5715..108f89ca4a 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/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);
diff --git a/java/com/google/gerrit/server/restapi/project/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java
index d2aeccae76..766a3bd0c8 100644
--- a/java/com/google/gerrit/server/restapi/project/ListProjects.java
+++ b/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;
diff --git a/java/com/google/gerrit/server/restapi/project/Module.java b/java/com/google/gerrit/server/restapi/project/Module.java
index b74b6407cd..67380dca7c 100644
--- a/java/com/google/gerrit/server/restapi/project/Module.java
+++ b/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);
   }
 }
diff --git a/java/com/google/gerrit/server/project/ProjectNode.java b/java/com/google/gerrit/server/restapi/project/ProjectNode.java
similarity index 88%
rename from java/com/google/gerrit/server/project/ProjectNode.java
rename to java/com/google/gerrit/server/restapi/project/ProjectNode.java
index e1ba692cb0..54f75747bd 100644
--- a/java/com/google/gerrit/server/project/ProjectNode.java
+++ b/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);
   }