From c93d66513db01166fb8a914f514f0a876e55e795 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 18 Feb 2016 19:01:26 +0900 Subject: [PATCH] Move RestApiServlet classes under httpd.restapi Instead of having them all under their own separate package where in some cases (for example httpd.rpc.access) they are the only class. This also makes it a bit easier to see, from the remaining classes under httpd.rpc, what features are potentially still missing from the REST API. Change-Id: I205fd40241a9f4144d785206e4e0eaed46584b4e --- .../main/java/com/google/gerrit/httpd/UrlModule.java | 12 ++++++------ .../access => restapi}/AccessRestApiServlet.java | 3 +-- .../account => restapi}/AccountsRestApiServlet.java | 3 +-- .../change => restapi}/ChangesRestApiServlet.java | 3 +-- .../config => restapi}/ConfigRestApiServlet.java | 3 +-- .../{rpc/group => restapi}/GroupsRestApiServlet.java | 3 +-- .../project => restapi}/ProjectsRestApiServlet.java | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/access => restapi}/AccessRestApiServlet.java (91%) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/account => restapi}/AccountsRestApiServlet.java (91%) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/change => restapi}/ChangesRestApiServlet.java (91%) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/config => restapi}/ConfigRestApiServlet.java (91%) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/group => restapi}/GroupsRestApiServlet.java (91%) rename gerrit-httpd/src/main/java/com/google/gerrit/httpd/{rpc/project => restapi}/ProjectsRestApiServlet.java (91%) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java index f3874bed86..3083edda62 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java @@ -23,13 +23,13 @@ import com.google.gerrit.httpd.raw.HostPageServlet; import com.google.gerrit.httpd.raw.LegacyGerritServlet; import com.google.gerrit.httpd.raw.SshInfoServlet; import com.google.gerrit.httpd.raw.ToolServlet; -import com.google.gerrit.httpd.rpc.access.AccessRestApiServlet; -import com.google.gerrit.httpd.rpc.account.AccountsRestApiServlet; -import com.google.gerrit.httpd.rpc.change.ChangesRestApiServlet; -import com.google.gerrit.httpd.rpc.config.ConfigRestApiServlet; +import com.google.gerrit.httpd.restapi.AccessRestApiServlet; +import com.google.gerrit.httpd.restapi.AccountsRestApiServlet; +import com.google.gerrit.httpd.restapi.ChangesRestApiServlet; +import com.google.gerrit.httpd.restapi.ConfigRestApiServlet; +import com.google.gerrit.httpd.restapi.GroupsRestApiServlet; +import com.google.gerrit.httpd.restapi.ProjectsRestApiServlet; import com.google.gerrit.httpd.rpc.doc.QueryDocumentationFilter; -import com.google.gerrit.httpd.rpc.group.GroupsRestApiServlet; -import com.google.gerrit.httpd.rpc.project.ProjectsRestApiServlet; import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccessRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccessRestApiServlet.java index fda64166ce..a9bd85d380 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccessRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.access; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.access.AccessCollection; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccountsRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccountsRestApiServlet.java index 351d563fea..7f8b152cf3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/AccountsRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.account; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.account.AccountsCollection; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ChangesRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ChangesRestApiServlet.java index fe810b91b8..f6f89a6e54 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ChangesRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.change; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.change.ChangesCollection; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ConfigRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ConfigRestApiServlet.java index f951ad37b0..48dcfd9ae1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ConfigRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.config; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.config.ConfigCollection; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/GroupsRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/GroupsRestApiServlet.java index 04dc747895..4503bc55d8 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/GroupsRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.group; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.group.GroupsCollection; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ProjectsRestApiServlet.java similarity index 91% rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ProjectsRestApiServlet.java index ea3b8b01f0..87245ab503 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ProjectsRestApiServlet.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.httpd.rpc.project; +package com.google.gerrit.httpd.restapi; -import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.project.ProjectsCollection; import com.google.inject.Inject; import com.google.inject.Provider;