Restore setting config on the messaging defaultServer

Also look in subresources for the default server instead of erroneously caching `this`.
thorntail · Nov 10, 2015 · 1e9325d · 1e9325d
1 parent 61fc31d
commit 1e9325d
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/messaging/api/src/main/java/org/wildfly/swarm/messaging/MessagingFraction.java b/messaging/api/src/main/java/org/wildfly/swarm/messaging/MessagingFraction.java
@@ -32,20 +32,35 @@ public static MessagingFraction createDefaultFraction() {
     }
 
     public MessagingFraction defaultServer() {
-        if (this.defaultServer == null) {
-            this.defaultServer = server("default", EnhancedServer::enableInVm);
-        }
+        findOrCreateDefaultServer();
 
-        return this.defaultServer;
+        return this;
     }
 
-    public MessagingFraction server(String childKey, EnhancedServerConsumer consumer) {
-        return super.server( ()->{
-            EnhancedServer s = new EnhancedServer(childKey);
-            consumer.accept(s);
+    public MessagingFraction defaultServer(EnhancedServerConsumer config) {
+        config.accept(findOrCreateDefaultServer());
+
+        return this;
+    }
+
+    public MessagingFraction server(String childKey, EnhancedServerConsumer config) {
+        super.server(() -> {
+            final EnhancedServer s = new EnhancedServer(childKey);
+            config.accept(s);
+
             return s;
         });
+
+        return this;
     }
 
-    private MessagingFraction defaultServer = null;
+    private EnhancedServer findOrCreateDefaultServer() {
+        EnhancedServer server = (EnhancedServer) subresources().server("default");
+        if (server == null) {
+            server("default", EnhancedServer::enableInVm);
+        }
+
+        return (EnhancedServer) subresources().server("default");
+    }
 }
+