Turn commands into enum

Author: kasemir

core/pva/src/main/java/org/epics/pva/client/PVAClientMain.java

@@ -8,6 +8,7 @@
 package org.epics.pva.client;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -17,6 +18,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import org.epics.pva.PVASettings;
 import org.epics.pva.data.PVAData;
@@ -38,9 +40,17 @@ public class PVAClientMain
     private static boolean completion = false;
     private static String request = "";
 
+    /** Commands */
+    private static enum Cmd
+    {
+        info, get, monitor, put, call, beacons
+    }
+
     private static void help()
     {
-        System.out.println("USAGE: pvaclient info|get|monitor|put|call|beacons [options] <PV name>...");
+        System.out.println("USAGE: pvaclient " +
+            Arrays.stream(Cmd.values()).map(Object::toString).collect(Collectors.joining("|")) +
+            " [options] <PV name>...");
         System.out.println();
         System.out.println("Options:");
         System.out.println("  -h             Help");
@@ -368,22 +378,22 @@ else if (arg.startsWith("-"))
 
         final String command = names.remove(0);
 
-        if (command.equals("beacons") && names.size() == 0)
+        if (command.equals(Cmd.beacons.name()) && names.size() == 0)
             beacons();
-        else if (command.equals("info") && names.size() > 0)
+        else if (command.equals(Cmd.info.name()) && names.size() > 0)
             info(names);
-        else if (command.equals("get") && names.size() > 0)
+        else if (command.equals(Cmd.get.name()) && names.size() > 0)
             get(names);
-        else if (command.equals("monitor") && names.size() > 0)
+        else if (command.equals(Cmd.monitor.name()) && names.size() > 0)
             monitor(names);
-        else if (command.equals("put") && names.size() == 2)
+        else if (command.equals(Cmd.put.name()) && names.size() == 2)
         {
             // By default, write to the 'value' element data structure
             if (request.isEmpty())
                 request = "value";
             put(names.get(0), names.get(1));
         }
-        else if (command.equals("call") && names.size() > 0)
+        else if (command.equals(Cmd.call.name()) && names.size() > 0)
         {
             // For now not supporting any request detail from cmdline
             PVAStructure request = new PVAStructure("", "");