update command validation for mode value and use an enum for possible values

src/main/java/emissary/admin/Startup.java

@@ -14,6 +14,7 @@
 import emissary.pickup.PickUpPlace;
 import emissary.place.CoordinationPlace;
 import emissary.place.IServiceProviderPlace;
+import emissary.server.EmissaryServer;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -287,7 +288,7 @@ protected boolean localDirectorySetup(final Map<String, String> localDirectories
 
         final long start = System.currentTimeMillis();
         final Map<String, String> dirStarts = new HashMap<>();
-        EmissaryNode emissaryNode = new EmissaryNode();
+        EmissaryNode emissaryNode = EmissaryServer.getInstance().getNode();
         for (final String thePlaceLocation : hostParameters) {
 
             final String host = placeHost(thePlaceLocation);

src/main/java/emissary/command/ServerCommand.java

@@ -2,9 +2,8 @@
 
 import emissary.client.EmissaryResponse;
 import emissary.command.converter.ProjectBaseConverter;
-import emissary.command.validator.ServerModeValidator;
-import emissary.core.EmissaryException;
-import emissary.core.EmissaryRuntimeException;
+import emissary.command.converter.ServerModeConverter;
+import emissary.directory.EmissaryNode;
 import emissary.server.EmissaryServer;
 import emissary.server.api.Pause;
 
@@ -27,14 +26,9 @@ public class ServerCommand extends ServiceCommand {
 
     public static final int DEFAULT_PORT = 8001;
 
-    private String mode = "standalone";
-
-    @Option(names = {"-m", "--mode"}, description = "mode: standalone or cluster\nDefault: ${DEFAULT-VALUE}", defaultValue = "standalone")
-    private void setMode(String value) {
-        ServerModeValidator smv = new ServerModeValidator();
-        smv.validate("mode", value);
-        mode = value;
-    }
+    @Option(names = {"-m", "--mode"}, description = "mode: standalone or cluster\nDefault: ${DEFAULT-VALUE}", converter = ServerModeConverter.class,
+            defaultValue = "standalone")
+    private EmissaryNode.EmissaryMode mode;
 
     @Option(names = "--staticDir", description = "path to static assets, loaded from classpath otherwise", converter = ProjectBaseConverter.class)
     private Path staticDir;
@@ -58,7 +52,7 @@ public int getDefaultPort() {
         return DEFAULT_PORT;
     }
 
-    public String getMode() {
+    public EmissaryNode.EmissaryMode getMode() {
         return mode;
     }
 
@@ -87,20 +81,15 @@ public boolean shouldStrictMode() {
     public void setupCommand() {
         setupHttp();
         reinitLogback();
-        try {
-            setupServer();
-        } catch (EmissaryException e) {
-            LOG.error("Got an exception", e);
-            throw new EmissaryRuntimeException(e);
-        }
+        setupServer();
     }
 
-    public void setupServer() throws EmissaryException {
+    public void setupServer() {
         String flavorMode;
         if (getFlavor() == null) {
-            flavorMode = getMode().toUpperCase();
+            flavorMode = getMode().toString();
         } else {
-            flavorMode = getMode().toUpperCase() + "," + getFlavor();
+            flavorMode = getMode().toString() + "," + getFlavor();
         }
 
         if (shouldStrictMode()) {
@@ -122,12 +111,12 @@ public void setupServer() throws EmissaryException {
 
     @Override
     protected void startService() {
-        try {
-            LOG.info("Running Emissary Server");
-            new EmissaryServer(this).startServer();
-        } catch (EmissaryException e) {
-            LOG.error("Unable to start server", e);
-        }
+        // try {
+        LOG.info("Running Emissary Server");
+        EmissaryServer.init(this).startServer();
+        // } catch (EmissaryException e) {
+        // LOG.error("Unable to start server", e);
+        // }
     }
 
     @Override

src/main/java/emissary/command/converter/ServerModeConverter.java

@@ -0,0 +1,20 @@
+package emissary.command.converter;
+
+import emissary.directory.EmissaryNode;
+
+import picocli.CommandLine.ITypeConverter;
+
+public class ServerModeConverter implements ITypeConverter<EmissaryNode.EmissaryMode> {
+
+    @Override
+    public EmissaryNode.EmissaryMode convert(String s) throws Exception {
+        switch (s.toLowerCase()) {
+            case "cluster":
+                return EmissaryNode.EmissaryMode.CLUSTER;
+            case "standalone":
+                return EmissaryNode.EmissaryMode.STANDALONE;
+            default:
+                throw new IllegalArgumentException("Unknown mode: " + s);
+        }
+    }
+}

src/main/java/emissary/directory/EmissaryNode.java

@@ -63,9 +63,9 @@ public class EmissaryNode {
     /** Property that determines if server will shut down in the event a place fails to start */
     public static final String STRICT_STARTUP_MODE = "strict.mode";
 
-    // types are feeder, worker, standalone
-    // TODO: make an enum for these
-    private static final String DEFAULT_NODE_MODE = "standalone";
+    public enum EmissaryMode {
+        STANDALONE, CLUSTER;
+    }
 
     @Nullable
     protected String nodeName = null;
@@ -75,19 +75,23 @@ public class EmissaryNode {
     // this is the OS for all practical purposes
     @Nullable
     protected String nodeType = null;
-    @Nullable
-    protected String nodeMode = null; // probably better as nodeType, but that requires a refactor
+    protected EmissaryMode nodeMode;
     protected boolean nodeNameIsDefault = false;
     @Nullable
     protected String nodeServiceType = null;
 
     protected boolean strictStartupMode = false;
 
+    public EmissaryNode() {
+        this(EmissaryMode.STANDALONE);
+    }
+
     /**
      * Construct the node. The node name and port are from system properties. The node type is based on the os.name in this
      * implementation
      */
-    public EmissaryNode() {
+    public EmissaryNode(EmissaryMode nodeMode) {
+        this.nodeMode = nodeMode;
         this.nodeName = System.getProperty(NODE_NAME_PROPERTY);
         if (this.nodeName == null) {
             // Use IP Address for default node name since it is
@@ -103,11 +107,14 @@ public EmissaryNode() {
         this.nodeScheme = System.getProperty(NODE_SCHEME_PROPERTY, "http");
         this.nodePort = Integer.getInteger(NODE_PORT_PROPERTY, -1).intValue();
         this.nodeType = System.getProperty("os.name", DEFAULT_NODE_TYPE).toLowerCase().replace(' ', '_');
-        this.nodeMode = System.getProperty("node.mode", DEFAULT_NODE_MODE).toLowerCase();
         this.nodeServiceType = System.getProperty(NODE_SERVICE_TYPE_PROPERTY, DEFAULT_NODE_SERVICE_TYPE);
         this.strictStartupMode = Boolean.parseBoolean(System.getProperty(STRICT_STARTUP_MODE, String.valueOf(false)));
     }
 
+    public EmissaryMode getNodeMode() {
+        return nodeMode;
+    }
+
     /**
      * The node name
      */
@@ -168,11 +175,7 @@ public boolean isValidStandalone() {
      * True if this node appears to be a stand-alone (non P2P) node
      */
     public boolean isStandalone() {
-        return isValidStandalone() && getNodeMode().equals("standalone");
-    }
-
-    private Object getNodeMode() {
-        return nodeMode;
+        return isValidStandalone() && getNodeMode().equals(EmissaryMode.STANDALONE);
     }
 
     public boolean isStrictStartupMode() {
@@ -197,14 +200,14 @@ public Configurator getNodeConfigurator() throws IOException {
     }
 
     /**
-     * Get the peer configuration stream for this noed
+     * Get the peer configuration stream for this node
      */
     public Configurator getPeerConfigurator() throws IOException {
         if (isStandalone()) {
             // return a configurator here with just standalone, don't actually read the peer.cfg
             // This is a hack until we can TODO: refactor all this so standalone doesn't need peers
             // maybe even warn if there is a peer.cfg
-            logger.debug("Node is standalone, ignoring any peer.cfg and only constructing one rendevous peer with the local node");
+            logger.debug("Node is standalone, ignoring any peer.cfg and only constructing one rendezvous peer with the local node");
             Configurator cfg = new ServiceConfigGuide();
             cfg.addEntry("RENDEZVOUS_PEER", this.asUrlKey());
             return cfg;

src/main/java/emissary/pickup/WorkSpace.java

@@ -193,13 +193,13 @@ public WorkSpace(FeedCommand feedCommand) {
             this.outbound = new PriorityQueue<>(11, this.feedCommand.getSort());
         }
 
-        configure();
         startJetty();
+        register();
         initializeService();
     }
 
     protected void startJetty() {
-        if (!EmissaryServer.isStarted()) {
+        if (!EmissaryServer.isInitialized() || !EmissaryServer.getInstance().isServerRunning()) {
             // TODO investigate passing the feedCommand object directly to the serverCommand
             List<String> args = new ArrayList<>();
             args.add("-b");
@@ -224,7 +224,7 @@ protected void startJetty() {
             try {
                 // To ensure the feed command starts correctly, depends on a node-{feedCommand.getPort}.cfg file
                 ServerCommand cmd = BaseCommand.parse(ServerCommand.class, args);
-                Server server = new EmissaryServer(cmd).startServer();
+                Server server = EmissaryServer.init(cmd).startServer();
                 final boolean jettyStatus = server.isStarted();
                 if (!jettyStatus) {
                     logger.error("Cannot start the Workspace due to EmissaryServer not starting!");
@@ -293,13 +293,10 @@ public void stop() {
     public void shutDown() {
         stop();
         if (this.jettyStartedHere) {
-            final EmissaryNode node = new EmissaryNode();
+            final EmissaryNode node = EmissaryServer.getInstance().getNode();
             if (node.isValid()) {
                 try {
-                    final EmissaryServer s = EmissaryServer.lookup();
-                    s.getServer().stop();
-                } catch (NamespaceException ex) {
-                    logger.error("Cannot find jetty server", ex);
+                    EmissaryServer.getInstance().stop();
                 } catch (Exception ex) {
                     logger.error("Jetty cannot be shutdown", ex);
                 }
@@ -523,8 +520,8 @@ public void setPattern(@Nullable final String thePattern) throws Exception {
     /**
      * Configure the Processor. The *.cfg file is optional
      */
-    protected void configure() {
-        final EmissaryNode node = new EmissaryNode();
+    protected void register() {
+        final EmissaryNode node = EmissaryServer.getInstance().getNode();
         if (node.isValid()) {
             this.workSpaceUrl = node.getNodeScheme() + "://" + node.getNodeName() + ":" + node.getNodePort() + "/" + this.WORK_SPACE_NAME;
         } else {

src/main/java/emissary/place/ServiceProviderPlace.java

@@ -332,14 +332,14 @@ protected void setupPlace(@Nullable String theDir, String placeLocation) throws
      * @return true if it worked
      */
     private boolean localizeDirectory(@Nullable String theDir) {
-        // Get a local (non proxy) copy of the directory if possible!
+        // Get a local (non-proxy) copy of the directory if possible!
         // Looking up both if nothing is provided
         if (theDir == null) {
             try {
                 localDirPlace = DirectoryPlace.lookup();
                 dirPlace = localDirPlace.toString();
             } catch (EmissaryException ex) {
-                if (EmissaryServer.exists() && !(this instanceof DirectoryPlace)) {
+                if (EmissaryServer.getInstance().isServerRunning() && !(this instanceof DirectoryPlace)) {
                     logger.warn("Unable to find DirectoryPlace in local namespace", ex);
                     return false;
                 }
@@ -422,7 +422,7 @@ protected void configureServicePlace(@Nullable String placeLocation) throws IOEx
             keys.add(placeLocation); // save as first in list
             locationPart = KeyManipulator.getServiceLocation(placeLocation);
         } else if (!placeLocation.contains("://")) {
-            EmissaryNode node = new EmissaryNode();
+            EmissaryNode node = EmissaryServer.getInstance().getNode();
             locationPart = "http://" + node.getNodeName() + ":" + node.getNodePort() + "/" + placeLocation;
         }