From 3f41d7a76feeb764ec4ec12d7f61a6c6ebc45111 Mon Sep 17 00:00:00 2001
From: Chris Batey <christopher.batey@gmail.com>
Date: Tue, 30 Aug 2016 08:53:09 +0100
Subject: [PATCH] Fix stress daemon help message

patch by Christopher Bailey; reviewed by Blake Eggleston for CASSANDRA-12563
---
 CHANGES.txt                                   |  1 +
 .../stress/settings/SettingsMisc.java         | 51 +++++++------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a632136b5..97d49af85d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Stress daemon help is incorrect (CASSANDRA-12563)
  * Remove ALTER TYPE support (CASSANDRA-12443)
  * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
  * Set javac encoding to utf-8 (CASSANDRA-11077)
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
index 5735f9d56a..5334f250d5 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
@@ -153,52 +153,35 @@ public class SettingsMisc implements Serializable
 
     public static Runnable helpHelpPrinter()
     {
-        return new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                System.out.println("Usage: ./bin/cassandra-stress help <command|option>");
-                System.out.println("Commands:");
-                for (Command cmd : Command.values())
-                    System.out.println("    " + cmd.names.toString().replaceAll("\\[|\\]", ""));
-                System.out.println("Options:");
-                for (CliOption op : CliOption.values())
-                    System.out.println("    -" + op.toString().toLowerCase() + (op.extraName != null ? ", " + op.extraName : ""));
-            }
+        return () -> {
+            System.out.println("Usage: ./bin/cassandra-stress help <command|option>");
+            System.out.println("Commands:");
+            for (Command cmd : Command.values())
+                System.out.println("    " + cmd.names.toString().replaceAll("\\[|\\]", ""));
+            System.out.println("Options:");
+            for (CliOption op : CliOption.values())
+                System.out.println("    -" + op.toString().toLowerCase() + (op.extraName != null ? ", " + op.extraName : ""));
         };
     }
 
     public static Runnable printHelpPrinter()
     {
-        return new Runnable()
+        return () -> GroupedOptions.printOptions(System.out, "print", new GroupedOptions()
         {
             @Override
-            public void run()
+            public List<? extends Option> options()
             {
-                GroupedOptions.printOptions(System.out, "print", new GroupedOptions()
-                {
-                    @Override
-                    public List<? extends Option> options()
-                    {
-                        return Arrays.asList(new OptionDistribution("dist=", null, "A mathematical distribution"));
-                    }
-                });
+                return Arrays.asList(new OptionDistribution("dist=", null, "A mathematical distribution"));
             }
-        };
+        });
     }
 
     public static Runnable sendToDaemonHelpPrinter()
     {
-        return new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                System.out.println("Usage: -sendToDaemon <host>");
-                System.out.println();
-                System.out.println("Specify a host running the stress server to send this stress command to");
-            }
+        return () -> {
+            System.out.println("Usage: -sendto <host>");
+            System.out.println();
+            System.out.println("Specify a host running the stress server to send this stress command to");
         };
     }
 
@@ -212,7 +195,7 @@ public class SettingsMisc implements Serializable
         if (params.length != 1)
         {
             sendToDaemonHelpPrinter().run();
-            System.out.println("Invalid -send-to specifier: " + Arrays.toString(params));
+            System.out.println("Invalid -sendto specifier: " + Arrays.toString(params));
             System.exit(1);
         }
         return params[0];