1417 remove activemq ar 1417

autoreduce_utils/clients/settings/client_settings_factory.py

@@ -17,7 +17,7 @@ class ClientSettingsFactory:
     """
 
     ignore_kwargs = ['username', 'password', 'host', 'port']
-    valid_types = ['database', 'icat', 'queue', 'sftp', 'cycle']
+    valid_types = ['database', 'icat', 'sftp', 'cycle']
 
     def create(self, settings_type, username, password, host, port, **kwargs):
         """
@@ -47,8 +47,6 @@ def create(self, settings_type, username, password, host, port, **kwargs):
             settings = self._create_database(**kwargs)
         elif settings_type.lower() == 'icat':
             settings = self._create_icat(**kwargs)
-        elif settings_type.lower() == 'queue':
-            settings = self._create_queue(**kwargs)
         elif settings_type.lower() == 'sftp':
             settings = self._create_sftp(**kwargs)
         elif settings_type.lower() == 'cycle':
@@ -63,14 +61,6 @@ def _create_database(self, **kwargs):
         self._test_kwargs(database_kwargs, kwargs)
         return MySQLSettings(**kwargs)
 
-    def _create_queue(self, **kwargs):
-        """
-        :return: Queue compatible settings object
-        """
-        queue_kwargs = ['data_ready']
-        self._test_kwargs(queue_kwargs, kwargs)
-        return ActiveMQSettings(**kwargs)
-
     def _create_icat(self, **kwargs):
         """
         :return: Icat compatible settings object
@@ -131,21 +121,6 @@ def get_full_connection_string(self):
         return f'mysql+mysqldb://{self.username}:{self.password}@{self.host}/{self.database}'
 
 
-class ActiveMQSettings(ClientSettings):
-    """
-    ActiveMq settings to be used as a Queue settings object
-    """
-    data_ready = None
-    all_subscriptions = None
-
-    def __init__(self, data_ready='/queue/DataReady', **kwargs):
-        # TODO explicitly state args
-        super(ActiveMQSettings, self).__init__(**kwargs)  # pylint:disable=super-with-arguments
-
-        self.data_ready = data_ready
-        self.all_subscriptions = [data_ready]
-
-
 class SFTPSettings(ClientSettings):
     """
     SFTP settings object

autoreduce_utils/clients/settings/tests/test_client_settings_factory.py

@@ -10,7 +10,7 @@
 import unittest
 
 from autoreduce_utils.clients.settings.client_settings_factory import (ClientSettingsFactory, MySQLSettings,
-                                                                       ICATSettings, ActiveMQSettings)
+                                                                       ICATSettings)
 
 
 # pylint:disable=missing-docstring
@@ -34,20 +34,6 @@ def test_create_database(self):
         self.assertEqual(actual.database, 'test-name')
         self.assertEqual(actual.get_full_connection_string(), 'mysql+mysqldb://test-user:test-pass@test-host/test-name')
 
-    def test_create_queue(self):
-        actual = self.factory.create('queue',
-                                     username='test-user',
-                                     password='test-pass',
-                                     host='test-host',
-                                     port='test-port',
-                                     data_ready='test-dr')
-        self.assertIsInstance(actual, ActiveMQSettings)
-        self.assertEqual(actual.username, 'test-user')
-        self.assertEqual(actual.password, 'test-pass')
-        self.assertEqual(actual.host, 'test-host')
-        self.assertEqual(actual.port, 'test-port')
-        self.assertEqual(actual.data_ready, 'test-dr')
-
     def test_create_icat(self):
         actual = self.factory.create('icat',
                                      username='test-user',
@@ -78,17 +64,6 @@ def test_invalid_database_args(self):
                                'port',
                                database_invalid='invalid')
 
-    def test_invalid_queue_args(self):
-        self.assertRaisesRegex(ValueError,
-                               "queue_invalid is not a recognised key word argument.",
-                               self.factory.create,
-                               'queue',
-                               'user',
-                               'pass',
-                               'host',
-                               'port',
-                               queue_invalid='invalid')
-
     def test_invalid_icat_args(self):
         self.assertRaisesRegex(ValueError,
                                "icat_invalid is not a recognised key word argument.",

autoreduce_utils/credentials.py

@@ -27,12 +27,6 @@
                                          port=os.getenv('DATABASE_PORT'),
                                          database_name=os.getenv('DATABASE_NAME'))
 
-ACTIVEMQ_CREDENTIALS = SETTINGS_FACTORY.create('queue',
-                                               username=os.getenv('ACTIVEMQ_USERNAME'),
-                                               password=os.getenv('ACTIVEMQ_PASSWORD'),
-                                               host=os.getenv('ACTIVEMQ_HOST'),
-                                               port=os.getenv('ACTIVEMQ_PORT'))
-
 CYCLE_SETTINGS = SETTINGS_FACTORY.create('cycle',
                                          username=os.getenv('CYCLE_USER'),
                                          password=os.getenv('CYCLE_PASSWORD'),