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
This commit is contained in:
Dave Borowitz
2018-01-08 14:10:05 -05:00
parent e9820dc554
commit 6855a7d60b
4 changed files with 8 additions and 10 deletions

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.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);

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.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;

View File

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

View File

@@ -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);
}