Throwing in a few defaults on AppConfig

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -27,6 +27,25 @@
  */
 public class AppConfig {
 
+    /**
+     * This is set purely for development purposes so that an app can be created without specifying an app name.
+     */
+    public static final String DEFAULT_APP_NAME = "my-app";
+
+    /**
+     * These are assumed as sensible defaults in a development environment, where teams often use admin/admin for the
+     * admin login. They are of course expected to change in a real environment.
+     */
+    public static final String DEFAULT_USERNAME = "admin";
+    public static final String DEFAULT_PASSWORD = "admin";
+
+    /**
+     * This is set purely for development purposes so that an app can be configured without specifying a port. The
+     * v1/rest-apis endpoint will select an open port if none is provided, but some work is then required to figure out
+     * what that port is before modules are loaded.
+     */
+    public static final Integer DEFAULT_PORT = 8003;
+
     /**
      * The default path from which modules will be loaded into a modules database.
      */
@@ -35,20 +54,21 @@ public class AppConfig {
     public final static String DEFAULT_HOST = "localhost";
     public final static String DEFAULT_GROUP = "Default";
 
-    private String name;
+    private String name = DEFAULT_APP_NAME;
     private String host = DEFAULT_HOST;
 
     // Username/password combo for using the client REST API - e.g. to load modules
-    private String restAdminUsername;
-    private String restAdminPassword;
+    private String restAdminUsername = DEFAULT_USERNAME;
+    private String restAdminPassword = DEFAULT_PASSWORD;
     private SSLContext restSslContext;
     private SSLHostnameVerifier restSslHostnameVerifier;
     private Authentication restAuthentication = Authentication.DIGEST;
 
-    private Integer restPort;
+    private Integer restPort = DEFAULT_PORT;
     private Integer testRestPort;
 
-    // These can all be set to override the default names
+    // These can all be set to override the default names that are generated off of the "name" attribute.
+    private String groupName = DEFAULT_GROUP;
     private String restServerName;
     private String testRestServerName;
     private String contentDatabaseName;
@@ -60,8 +80,6 @@ public class AppConfig {
     private List<String> modulePaths;
     private ConfigDir configDir;
 
-    private String groupName = DEFAULT_GROUP;
-
     // Passed into the TokenReplacer that subclasses of AbstractCommand use
     private Map<String, String> customTokens = new HashMap<>();
 

src/main/java/com/marklogic/mgmt/ManageConfig.java

@@ -9,15 +9,22 @@
  */
 public class ManageConfig extends RestConfig {
 
+    /**
+     * These are assumed as sensible defaults in a development environment, where teams often use admin/admin for the
+     * admin login. They are of course expected to change in a real environment.
+     */
+    public static final String DEFAULT_USERNAME = "admin";
+    public static final String DEFAULT_PASSWORD = "admin";
+    
     private String adminUsername;
     private String adminPassword;
 
     public ManageConfig() {
-        this("localhost", "admin");
+        this("localhost", DEFAULT_PASSWORD);
     }
 
     public ManageConfig(String host, String password) {
-        this(host, 8002, "admin", password);
+        this(host, 8002, DEFAULT_USERNAME, password);
     }
 
     public ManageConfig(String host, int port, String username, String password) {