Move account related RPCs to the account package

This way we can start to break out the different handlers into their
own top level classes within the package.

Signed-off-by: Shawn O. Pearce <sop@google.com>

4 files changed, 40 insertions, 4 deletions

diff --git a/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java b/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java
index 00fc702d62..02657fec48 100644
--- a/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java
+++ b/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java
@@ -16,6 +16,7 @@ package com.google.gerrit.server.rpc;
 
 import com.google.gerrit.server.http.RpcServletModule;
 import com.google.gerrit.server.patch.PatchModule;
+import com.google.gerrit.server.rpc.account.AccountModule;
 import com.google.gerrit.server.rpc.changedetail.ChangeModule;
 import com.google.gerrit.server.rpc.project.ProjectModule;
 
@@ -29,13 +30,12 @@ public class UiRpcModule extends RpcServletModule {
 
   @Override
   protected void configureServlets() {
-    rpc(AccountServiceImpl.class);
-    rpc(AccountSecurityImpl.class);
     rpc(GroupAdminServiceImpl.class);
     rpc(ChangeListServiceImpl.class);
     rpc(SuggestServiceImpl.class);
     rpc(SystemInfoServiceImpl.class);
 
+    install(new AccountModule());
     install(new ChangeModule());
     install(new PatchModule());
     install(new ProjectModule());
diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java b/src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java
new file mode 100644
index 0000000000..e8d929c1c8
--- /dev/null
+++ b/src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java
@@ -0,0 +1,36 @@
+// Copyright (C) 2009 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.rpc.account;
+
+import com.google.gerrit.server.config.FactoryModule;
+import com.google.gerrit.server.http.RpcServletModule;
+import com.google.gerrit.server.rpc.UiRpcModule;
+
+public class AccountModule extends RpcServletModule {
+  public AccountModule() {
+    super(UiRpcModule.PREFIX);
+  }
+
+  @Override
+  protected void configureServlets() {
+    install(new FactoryModule() {
+      @Override
+      protected void configure() {
+      }
+    });
+    rpc(AccountSecurityImpl.class);
+    rpc(AccountServiceImpl.class);
+  }
+}
diff --git a/src/main/java/com/google/gerrit/server/rpc/AccountSecurityImpl.java b/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java
index e29649e73e..5da1dd3495 100644
--- a/src/main/java/com/google/gerrit/server/rpc/AccountSecurityImpl.java
+++ b/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.rpc;
+package com.google.gerrit.server.rpc.account;
 
 import com.google.gerrit.client.account.AccountSecurity;
 import com.google.gerrit.client.account.ExternalIdDetail;
diff --git a/src/main/java/com/google/gerrit/server/rpc/AccountServiceImpl.java b/src/main/java/com/google/gerrit/server/rpc/account/AccountServiceImpl.java
index e2030ee508..bb26b60786 100644
--- a/src/main/java/com/google/gerrit/server/rpc/AccountServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/rpc/account/AccountServiceImpl.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.rpc;
+package com.google.gerrit.server.rpc.account;
 
 import com.google.gerrit.client.account.AccountProjectWatchInfo;
 import com.google.gerrit.client.account.AccountService;