1 files changed, 19 insertions, 13 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java
index 90bc07e831..30f3c95b2d 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java
@@ -17,6 +17,7 @@ package com.google.gerrit.sshd.commands;
 import com.google.gerrit.sshd.CommandModule;
 import com.google.gerrit.sshd.CommandName;
 import com.google.gerrit.sshd.Commands;
+import com.google.gerrit.sshd.DispatchCommandProvider;
 
 
 /** Register the commands a Gerrit server in master mode supports. */
@@ -24,19 +25,24 @@ public class MasterCommandModule extends CommandModule {
   @Override
   protected void configure() {
     final CommandName gerrit = Commands.named("gerrit");
+    final CommandName testSubmit = Commands.named(gerrit, "test-submit");
 
-    command(gerrit, "approve").to(ReviewCommand.class);
-    command(gerrit, "create-account").to(CreateAccountCommand.class);
-    command(gerrit, "create-group").to(CreateGroupCommand.class);
-    command(gerrit, "rename-group").to(RenameGroupCommand.class);
-    command(gerrit, "create-project").to(CreateProjectCommand.class);
-    command(gerrit, "gsql").to(AdminQueryShell.class);
-    command(gerrit, "test-submit-rule").to(TestSubmitRule.class);
-    command(gerrit, "set-reviewers").to(SetReviewersCommand.class);
-    command(gerrit, "receive-pack").to(Receive.class);
-    command(gerrit, "set-project-parent").to(AdminSetParent.class);
-    command(gerrit, "review").to(ReviewCommand.class);
-    command(gerrit, "set-account").to(SetAccountCommand.class);
-    command(gerrit, "set-project").to(SetProjectCommand.class);
+    command(gerrit, CreateAccountCommand.class);
+    command(gerrit, CreateGroupCommand.class);
+    command(gerrit, RenameGroupCommand.class);
+    command(gerrit, CreateProjectCommand.class);
+    command(gerrit, AdminQueryShell.class);
+    command(gerrit, SetReviewersCommand.class);
+    command(gerrit, Receive.class);
+    command(gerrit, AdminSetParent.class);
+    command(gerrit, ReviewCommand.class);
+    // deprecated alias to review command
+    alias(gerrit, "approve", ReviewCommand.class);
+    command(gerrit, SetAccountCommand.class);
+    command(gerrit, SetProjectCommand.class);
+
+    command(gerrit, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
+    command(testSubmit, TestSubmitRuleCommand.class);
+    command(testSubmit, TestSubmitTypeCommand.class);
   }
 }