QPID-5578 : Make TaskExecutor an interface and provide a test-only current thread implementation

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590044 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 7 insertions, 11 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
index c016cf25c0..06f03faa37 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
@@ -38,6 +38,7 @@ import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.exchange.TopicExchange;
@@ -120,7 +121,7 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
         cleanup(new File(_storePath));
 
         Broker<?> broker = BrokerTestHelper.createBrokerMock();
-        _taskExecutor = new TaskExecutor();
+        _taskExecutor = new TaskExecutorImpl();
         _taskExecutor.start();
         when(broker.getTaskExecutor()).thenReturn(_taskExecutor);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 60877b0cde..6f0a37ced9 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -62,14 +62,12 @@ import org.apache.qpid.server.Broker;
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHost;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.util.FileUtils;
 import org.apache.qpid.util.SystemUtils;
@@ -232,7 +230,7 @@ public class QpidBrokerTestCase extends QpidTestCase
         int actualPort = getPort(port);
         if(_taskExecutor == null)
         {
-            _taskExecutor = new TaskExecutor();
+            _taskExecutor = new TaskExecutorImpl();
             _taskExecutor.start();
         }
         TestBrokerConfiguration  configuration = new TestBrokerConfiguration(System.getProperty(_brokerStoreType), _configFile.getAbsolutePath(), _taskExecutor);
@@ -345,7 +343,7 @@ public class QpidBrokerTestCase extends QpidTestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        _taskExecutor = new TaskExecutor();
+        _taskExecutor = new TaskExecutorImpl();
         _taskExecutor.start();
         if (!_configFile.exists())
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
index 8e3d1262e7..cb4150a575 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
@@ -36,9 +36,7 @@ import org.apache.qpid.server.logging.LogRecorder;
 import org.apache.qpid.server.model.AccessControlProvider;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
 import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
 import org.apache.qpid.server.model.GroupProvider;
 import org.apache.qpid.server.model.Plugin;
 import org.apache.qpid.server.model.PreferencesProvider;
@@ -75,15 +73,14 @@ public class TestBrokerConfiguration
     private MemoryConfigurationEntryStore _store;
     private boolean _saved;
 
-    public TestBrokerConfiguration(String storeType, String intialStoreLocation, final TaskExecutor taskExecutor)
+    public TestBrokerConfiguration(String storeType, String initialStoreLocation, final TaskExecutor taskExecutor)
     {
         _store = new MemoryConfigurationEntryStore(
                 new SystemContextImpl(taskExecutor,
-                                      new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()),
                                       mock(EventLogger.class),
                                       mock(LogRecorder.class),
                                       mock(BrokerOptions.class)),
-                intialStoreLocation,
+                initialStoreLocation,
                 null,
                 Collections.<String,String>emptyMap());
         _store.visitConfiguredObjectRecords(new ConfiguredObjectRecordHandler()