From d6a48f020109977a006f374d1e0984080e72af14 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 20 Feb 2015 10:29:57 +0100 Subject: [PATCH] Make all REST resources public so that they can be used from plugins Make the RestResource classes and their constructors public so that they can be used from plugins. Most RestResource classes were already public, so this makes it consistent across all RestResources. Change-Id: I49b7dc9b3bd7e9b0734d5933392df60b006e5745 Signed-off-by: Edwin Kempin --- .../com/google/gerrit/server/account/AccountResource.java | 4 ++-- .../java/com/google/gerrit/server/change/ChangeResource.java | 2 +- .../java/com/google/gerrit/server/change/CommentResource.java | 2 +- .../com/google/gerrit/server/change/DraftCommentResource.java | 2 +- .../java/com/google/gerrit/server/change/FileResource.java | 2 +- .../com/google/gerrit/server/group/IncludedGroupResource.java | 3 ++- .../java/com/google/gerrit/server/plugins/PluginResource.java | 4 ++-- .../google/gerrit/server/project/ChildProjectResource.java | 2 +- .../com/google/gerrit/server/project/DashboardResource.java | 4 ++-- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java index 106c033ec0..75e5ae5185 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java @@ -48,11 +48,11 @@ public class AccountResource implements RestResource { return user; } - static class Capability implements RestResource { + public static class Capability implements RestResource { private final IdentifiedUser user; private final String capability; - Capability(IdentifiedUser user, String capability) { + public Capability(IdentifiedUser user, String capability) { this.user = user; this.capability = capability; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java index 81694a36a5..1555cdd842 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java @@ -37,7 +37,7 @@ public class ChangeResource implements RestResource, HasETag { private final ChangeControl control; - ChangeResource(ChangeControl control) { + public ChangeResource(ChangeControl control) { this.control = control; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java index ec47d019a3..c535e9e6df 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java @@ -28,7 +28,7 @@ public class CommentResource implements RestResource { private final RevisionResource rev; private final PatchLineComment comment; - CommentResource(RevisionResource rev, PatchLineComment c) { + public CommentResource(RevisionResource rev, PatchLineComment c) { this.rev = rev; this.comment = c; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java index 06afcbfb33..006b1ecf0a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java @@ -31,7 +31,7 @@ public class DraftCommentResource implements RestResource { private final RevisionResource rev; private final PatchLineComment comment; - DraftCommentResource(RevisionResource rev, PatchLineComment c) { + public DraftCommentResource(RevisionResource rev, PatchLineComment c) { this.rev = rev; this.comment = c; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java index 521e8c869a..1662237026 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java @@ -27,7 +27,7 @@ public class FileResource implements RestResource { private final RevisionResource rev; private final Patch.Key key; - FileResource(RevisionResource rev, String name) { + public FileResource(RevisionResource rev, String name) { this.rev = rev; this.key = new Patch.Key(rev.getPatchSet().getId(), name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupResource.java index 89b99a11d4..7975f241e5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupResource.java @@ -25,7 +25,8 @@ public class IncludedGroupResource extends GroupResource { private final GroupDescription.Basic member; - IncludedGroupResource(GroupResource group, GroupDescription.Basic member) { + public IncludedGroupResource(GroupResource group, + GroupDescription.Basic member) { super(group); this.member = member; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java index 9572271b0b..e7ebd5654e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java @@ -25,12 +25,12 @@ public class PluginResource implements RestResource { private final Plugin plugin; private final String name; - PluginResource(Plugin plugin) { + public PluginResource(Plugin plugin) { this.plugin = plugin; this.name = plugin.getName(); } - PluginResource(String name) { + public PluginResource(String name) { this.plugin = null; this.name = name; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java index 2a386a4625..f68acddc14 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java @@ -24,7 +24,7 @@ public class ChildProjectResource extends ProjectResource { private final ProjectControl child; - ChildProjectResource(ProjectResource project, ProjectControl child) { + public ChildProjectResource(ProjectResource project, ProjectControl child) { super(project); this.child = child; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java index 0e2db483c0..099350d439 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java @@ -24,7 +24,7 @@ public class DashboardResource implements RestResource { public static final TypeLiteral> DASHBOARD_KIND = new TypeLiteral>() {}; - static DashboardResource projectDefault(ProjectControl ctl) { + public static DashboardResource projectDefault(ProjectControl ctl) { return new DashboardResource(ctl, null, null, null, true); } @@ -34,7 +34,7 @@ public class DashboardResource implements RestResource { private final Config config; private final boolean projectDefault; - DashboardResource(ProjectControl control, + public DashboardResource(ProjectControl control, String refName, String pathName, Config config,