Cleanup

1 files changed, 15 insertions, 38 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java
index bd191eccbb8..0a57a700276 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java
@@ -7,6 +7,7 @@ import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.*;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.messagebus.MessageBus;
+import com.yahoo.messagebus.NetworkMessageBus;
 import com.yahoo.messagebus.RPCMessageBus;
 import com.yahoo.messagebus.network.Network;
 import com.yahoo.messagebus.network.local.LocalNetwork;
@@ -19,22 +20,18 @@ import java.util.concurrent.ScheduledExecutorService;
 /**
  * This class implements the {@link DocumentAccess} interface using message bus for communication.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar Rosenvinge</a>
+ * @author Einar Rosenvinge
  * @author bratseth
  */
 public class MessageBusDocumentAccess extends DocumentAccess {
 
-    // either
-    private final RPCMessageBus bus;
-    // ... or
-    private final MessageBus messageBus;
-    private final Network network;
-    // ... TODO: Do that cleanly
+    private final NetworkMessageBus bus;
     
     private final MessageBusParams params;
     // TODO: make pool size configurable? ScheduledExecutorService is not dynamic
-    private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(
-            Runtime.getRuntime().availableProcessors(), ThreadFactoryFactory.getDaemonThreadFactory("mbus.access.scheduler"));
+    private final ScheduledExecutorService scheduledExecutorService = 
+            Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors(), 
+                                             ThreadFactoryFactory.getDaemonThreadFactory("mbus.access.scheduler"));
 
     /**
      * Creates a new document access using default values for all parameters.
@@ -54,17 +51,12 @@ public class MessageBusDocumentAccess extends DocumentAccess {
         try {
             com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(params.getMessageBusParams());
             mbusParams.addProtocol(new DocumentProtocol(getDocumentTypeManager(), params.getProtocolConfigId(), params.getLoadTypes()));
-            if (System.getProperty("vespa.local", "false").equals("true")) { // TODO: Hackety hack ... see Application
-                bus = null;
-                network = new LocalNetwork(new LocalWire());
-                messageBus = new MessageBus(network, mbusParams);
+            if (System.getProperty("vespa.local", "false").equals("true")) { // set by Application when running locally
+                LocalNetwork network = new LocalNetwork();
+                bus = new NetworkMessageBus(network, new MessageBus(network, mbusParams));
             }
             else {
-                bus = new RPCMessageBus(mbusParams,
-                                        params.getRPCNetworkParams(),
-                                        params.getRoutingConfigId());
-                network = null;
-                messageBus = null;
+                bus = new RPCMessageBus(mbusParams, params.getRPCNetworkParams(), params.getRoutingConfigId());
             }
         }
         catch (Exception e) {
@@ -73,13 +65,12 @@ public class MessageBusDocumentAccess extends DocumentAccess {
     }
     
     private MessageBus messageBus() {
-        return bus != null ? bus.getMessageBus() : messageBus;
+        return bus.getMessageBus();
     }
 
     @Override
     public void shutdown() {
         super.shutdown();
-        if (bus != null)
         bus.destroy();
         scheduledExecutorService.shutdownNow();
     }
@@ -121,34 +112,20 @@ public class MessageBusDocumentAccess extends DocumentAccess {
         throw new UnsupportedOperationException("Subscriptions not supported.");
     }
 
-    /**
-     * Returns the internal message bus object so that clients can use it directly.
-     *
-     * @return The internal message bus.
-     */
-    public MessageBus getMessageBus() {
-        return messageBus();
-    }
+    /** Returns the internal message bus object so that clients can use it directly. */
+    public MessageBus getMessageBus() { return messageBus(); }
 
     /**
      * Returns the network layer of the internal message bus object so that clients can use it directly. This may seem
      * abit arbitrary, but the fact is that the RPCNetwork actually implements the IMirror API as well as exposing the
      * SystemState object.
-     *
-     * @return The network layer.
      */
-    public Network getNetwork() {
-        return bus != null ? bus.getRPCNetwork() : network;
-    }
+    public Network getNetwork() { return bus.getNetwork(); }
 
     /**
      * Returns the parameter object that controls the underlying message bus. Changes to these parameters do not affect
      * previously created sessions.
-     *
-     * @return The parameter object.
      */
-    public MessageBusParams getParams() {
-        return params;
-    }
+    public MessageBusParams getParams() { return params; }
 
 }