From b6cbf2304d2562c82773fc60fb83ae5f62b8cc47 Mon Sep 17 00:00:00 2001
From: Sasa Zivkov <sasa.zivkov@sap.com>
Date: Fri, 16 Nov 2012 17:23:25 +0100
Subject: [PATCH] Split test-submit-rule command into "test-submit rule"

Make "rule" a subcommand of the "test-submit" command.  This follows the
same pattern as the "plugin" set of commands and is a preparation for
introducing a command for testing submit type. The goal is to have a
dispatching "test-submit" command with "rule" and "type" as subcommands:

  test-submit rule ChangeId
  test-submit type ChangeId

Change-Id: I570a9e1931a257d9e64fd8b924e6d12f2d74d45d
---
 .../google/gerrit/sshd/commands/MasterCommandModule.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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..6540a5adf3 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,6 +25,7 @@ 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);
@@ -31,12 +33,14 @@ public class MasterCommandModule extends CommandModule {
     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, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
+    command(testSubmit, "rule").to(TestSubmitRule.class);
   }
 }