Mod_jk tooling fixes

core/src/main/groovy/noe/jk/configure/FacingServerConfigurator.groovy

@@ -60,10 +60,10 @@ class FacingServerConfigurator implements Configurator<FacingServerConfigurator>
     }
 
     uriWorkerMapProperties
-        .setBalancers(balancers)
-        .setWorkers(jkScenario.getWorkerNodes())
-        .setStatusWorkers(jkScenario.getStatusWorkerNodes())
-        .setAdditionalUrlMaps(jkScenario.getAdditionalUrlMaps())
+        .setBalancers(uriWorkerMapProperties.getBalancers() + balancers)
+        .setWorkers(uriWorkerMapProperties.getWorkers() + jkScenario.getWorkerNodes())
+        .setStatusWorkers(uriWorkerMapProperties.getStatusWorkers() + jkScenario.getStatusWorkerNodes())
+        .setAdditionalUrlMaps(uriWorkerMapProperties.getAdditionalUrlMaps() + jkScenario.getAdditionalUrlMaps())
 
     configurators << uriWorkerMapProperties.configure()
   }
@@ -78,9 +78,9 @@ class FacingServerConfigurator implements Configurator<FacingServerConfigurator>
     }
 
     workersProperties
-        .setBalancers(balancers)
-        .setWorkers(jkScenario.getWorkerNodes())
-        .setStatusWorkers(jkScenario.getStatusWorkerNodes())
+        .setBalancers(workersProperties.getBalancers() + balancers)
+        .setWorkers(workersProperties.getWorkers() + jkScenario.getWorkerNodes())
+        .setStatusWorkers(workersProperties.getStatusWorkers() + jkScenario.getStatusWorkerNodes())
 
     configurators << workersProperties.configure()
   }

core/src/main/groovy/noe/jk/configure/FacingServerNode.groovy

@@ -55,7 +55,7 @@ class FacingServerNode {
     return uriWorkerMapProperties
   }
 
-  JkScenario setUriWorkerMapProperties(UriWorkerMapProperties uriWorkerMapProperties) {
+  FacingServerNode setUriWorkerMapProperties(UriWorkerMapProperties uriWorkerMapProperties) {
     this.uriWorkerMapProperties = uriWorkerMapProperties
 
     return this
@@ -65,7 +65,7 @@ class FacingServerNode {
     return workersProperties
   }
 
-  JkScenario setWorkersProperties(WorkersProperties workersProperties) {
+  FacingServerNode setWorkersProperties(WorkersProperties workersProperties) {
     this.workersProperties = workersProperties
 
     return this

core/src/main/groovy/noe/jk/configure/StatusWorkerOperation.groovy

@@ -11,7 +11,7 @@ import noe.common.utils.Library
  * Example: List balancer summary in text format
  * <code>
  *     new StatusWorkerOperation()
- *         .setAction(StatusWorkerOperation.Action.LIST)
+ *         .setAction(new StatusWorkerOperation.List())
  *         .setOutputFormat(StatusWorkerOperation.OutputFormat.TEXT)
  *         .setBalancerId(balancerId)
  *         .setHost(facingServer.getHost())
@@ -26,30 +26,84 @@ class StatusWorkerOperation {
    * Chapter: Usage Patterns / Actions
    * @link https://tomcat.apache.org/connectors-doc/reference/status.html
    */
-  enum Action { LIST, SHOW, EDIT, UPDATE, RESET, RECOVER, VERSION, DUMP }
+  interface Action {
+    String build()
+  }
 
-  /**
-   * Chapter: Usage Patterns / Output Format
-   * @link https://tomcat.apache.org/connectors-doc/reference/status.html
-   */
-  enum OutputFormat { HTML, XML, PROPERTIES, TEXT }
+  static class List implements Action {
+    @Override
+    String build() {
+      return 'list'
+    }
+  }
 
-  /**
-   * Chapter: Request Parameters / Data Parameters for the standard Update Action
-   * @link https://tomcat.apache.org/connectors-doc/reference/status.html
-   */
-  enum Parameters {
+  static class Show implements Action {
+    @Override
+    String build() {
+      return 'show'
+    }
+  }
+
+  static class Reset implements Action {
+    @Override
+    String build() {
+      return 'reset'
+    }
+  }
+
+  static class Recover implements Action {
+    @Override
+    String build() {
+      return 'recover'
+    }
+  }
+
+  static class Version implements Action {
+    @Override
+    String build() {
+      return 'version'
+    }
+  }
+
+  static class Dump implements Action {
+    @Override
+    String build() {
+      return 'dump'
+    }
+  }
+
+  static class Update implements Action {
+    Map<String, String> params = [:]
+
+    @Override
+    String build() {
+      StringBuilder action = new StringBuilder("update")
+
+      params.each {String name, String value ->
+        action.append("&${name.toLowerCase()}=${value}")
+      }
+
+      return action.toString()
+    }
 
-    // load balancer workers
-    VLR, VLT, VLEE, VLX, VLS, VLF, VLM, VLL,
+    /**
+     * Chapter: Request Parameters / Data Parameters for the standard Update Action
+     * @link https://tomcat.apache.org/connectors-doc/reference/status.html
+     */
+    Update addParameter(String name, String value) {
+      params.put(name, value)
 
-    // load balancer members
-    VWA, VWF, VWN, VWR, VWC, VWD,
+      return this
+    }
 
-    // ajp workers and ajp load balancer members
-    VAHST, VAPRT, VACPT, VACT, VAPT, VART, VAR, VARO, VABL, VAMPS
   }
 
+  /**
+   * Chapter: Usage Patterns / Output Format
+   * @link https://tomcat.apache.org/connectors-doc/reference/status.html
+   */
+  enum OutputFormat { HTML, XML, PROPERTIES, TEXT }
+
   Action action
   OutputFormat outputFormat = OutputFormat.PROPERTIES
   String host
@@ -168,7 +222,7 @@ class StatusWorkerOperation {
     StringBuilder c = new StringBuilder("?")
 
     if (action != null) {
-      c.append("cmd=${transformAction(action)}&")
+      c.append("cmd=${action.build()}&")
     }
     if (outputFormat != null) {
       c.append("mime=${transformOutputType(outputFormat)}&")
@@ -205,10 +259,6 @@ class StatusWorkerOperation {
     return this
   }
 
-  private String transformAction(Action action) {
-    return action.toString().toLowerCase()
-  }
-
   private String transformOutputType(OutputFormat format) {
     switch (format){
       case OutputFormat.TEXT:

testsuite/src/test/groovy/noe/modjk/JkConfiguratorTestIT.groovy

@@ -237,7 +237,7 @@ class JkConfiguratorTestIT extends TestAbstract {
     ops.startAll()
 
     String res = new StatusWorkerOperation()
-      .setAction(StatusWorkerOperation.Action.LIST)
+      .setAction(new StatusWorkerOperation.List())
       .setOutputFormat(StatusWorkerOperation.OutputFormat.TEXT)
       .setBalancerId(balancerId)
       .setAutomaticRefresh(1)