Remove unused BackendService

Author: inklesspen

endpoints/api_backend.py

@@ -13,28 +13,19 @@
 # limitations under the License.
 
 """API serving config collection service implementation.
-
-Contains the implementation for BackendService as defined in api_backend.py.
 """
 
 # pylint: disable=g-statement-before-imports,g-import-not-at-top
 from __future__ import absolute_import
 
-try:
-  import json
-except ImportError:
-  import simplejson as json
-
 import logging
 
-from . import api_backend
 from . import api_exceptions
 
 from protorpc import message_types
 
 __all__ = [
     'ApiConfigRegistry',
-    'BackendServiceImpl',
 ]
 
 
@@ -120,66 +111,3 @@ def lookup_api_method(self, api_method_name):
   def all_api_configs(self):
     """Return a list of all API configration specs as registered above."""
     return self.__api_configs
-
-
-class BackendServiceImpl(api_backend.BackendService):
-  """Implementation of BackendService."""
-
-  def __init__(self, api_config_registry, app_revision):
-    """Create a new BackendService implementation.
-
-    Args:
-      api_config_registry: ApiConfigRegistry to register and look up configs.
-      app_revision: string containing the current app revision.
-    """
-    self.__api_config_registry = api_config_registry
-    self.__app_revision = app_revision
-
-  # pylint: disable=g-bad-name
-  # pylint: disable=g-doc-return-or-yield
-  # pylint: disable=g-doc-args
-  @staticmethod
-  def definition_name():
-    """Override definition_name so that it is not BackendServiceImpl."""
-    return api_backend.BackendService.definition_name()
-
-  def getApiConfigs(self, request=None):
-    """Return a list of active APIs and their configuration files.
-
-    Args:
-      request: A request which may contain an app revision
-
-    Returns:
-      ApiConfigList: A list of API config strings
-    """
-    if (request and request.appRevision and
-        request.appRevision != self.__app_revision):
-      raise api_exceptions.BadRequestException(
-          message='API backend app revision %s not the same as expected %s' % (
-              self.__app_revision, request.appRevision))
-
-    configs = [json.dumps(d) for d in self.__api_config_registry.all_api_configs()]
-    return api_backend.ApiConfigList(items=configs)
-
-  def logMessages(self, request):
-    """Write a log message from the Swarm FE to the log.
-
-    Args:
-      request: A log message request.
-
-    Returns:
-      Void message.
-    """
-    Level = api_backend.LogMessagesRequest.LogMessage.Level
-    log = logging.getLogger(__name__)
-    for message in request.messages:
-      level = message.level if message.level is not None else Level.info
-      # Create a log record and override the pathname and lineno.  These
-      # messages come from the front end, so it's misleading to say that they
-      # come from api_backend_service.
-      record = logging.LogRecord(name=__name__, level=level.number, pathname='',
-                                 lineno='', msg=message.message, args=None,
-                                 exc_info=None)
-      log.handle(record)
-
-    return message_types.VoidMessage()

endpoints/api_backend_service.py

@@ -94,99 +94,5 @@ def testRegisterSpiDifferentClasses(self):
     self.assertEqual([config1], self.registry.all_api_configs())
 
 
-class BackedServiceImplTest(unittest.TestCase):
-
-  def setUp(self):
-    self.service = api_backend_service.BackendServiceImpl(
-        api_backend_service.ApiConfigRegistry(), '1')
-
-  def testGetApiConfigsWithEmptyRequest(self):
-    request = api_backend.GetApiConfigsRequest()
-    self.assertEqual([], self.service.getApiConfigs(request).items)
-
-  def testGetApiConfigsWithCorrectRevision(self):
-    # TODO: there currently exists a bug in protorpc where non-unicode strings
-    #     aren't validated correctly and so their values aren't set correctly.
-    #     Remove 'u' this once that's fixed. This shouldn't affect production.
-    request = api_backend.GetApiConfigsRequest(appRevision=u'1')
-    self.assertEqual([], self.service.getApiConfigs(request).items)
-
-  def testGetApiConfigsWithIncorrectRevision(self):
-    # TODO: there currently exists a bug in protorpc where non-unicode strings
-    #     aren't validated correctly and so their values aren't set correctly.
-    #     Remove 'u' this once that's fixed. This shouldn't affect production.
-    request = api_backend.GetApiConfigsRequest(appRevision=u'2')
-    self.assertRaises(
-        api_exceptions.BadRequestException, self.service.getApiConfigs, request)
-
-  # pylint: disable=g-bad-name
-  def verifyLogLevels(self, levels):
-    Level = api_backend.LogMessagesRequest.LogMessage.Level
-    message = u'Test message.'
-    logger_name = api_backend_service.__name__
-
-    with mock.patch('logging.getLogger') as mock_getLogger:
-      log = mock_getLogger.return_value
-
-      requestMessages = []
-      for level in levels:
-        if level:
-          requestMessage = api_backend.LogMessagesRequest.LogMessage(
-              level=getattr(Level, level), message=message)
-        else:
-          requestMessage = api_backend.LogMessagesRequest.LogMessage(
-              message=message)
-        requestMessages.append(requestMessage)
-
-      request = api_backend.LogMessagesRequest(messages=requestMessages)
-      self.service.logMessages(request)
-
-      mock_getLogger.assert_called_once_with(logger_name)
-      mock_calls = []
-      for i, level in enumerate(levels):
-        if level is None:
-          level = 'info'
-        levelno = getattr(logging, level.upper())
-        # We can't assert equality of LogRecords because that's not
-        # supported. So instead we pull out the actual LogRecord
-        # objects and check values.
-        mock_call = log.handle.call_args_list[i]
-        actual_record = mock_call[0][0]  # first object in positional args
-        assert actual_record.name == logger_name
-        assert actual_record.levelno == levelno
-        assert actual_record.pathname == ''
-        assert actual_record.lineno == ''
-        assert actual_record.msg == message
-        assert actual_record.args is None
-        assert actual_record.exc_info is None
-
-  def testLogMessagesUnspecifiedLevel(self):
-    self.verifyLogLevels([None])
-
-  def testLogMessagesDebug(self):
-    self.verifyLogLevels(['debug'])
-
-  def testLogMessagesInfo(self):
-    self.verifyLogLevels(['info'])
-
-  def testLogMessagesWarning(self):
-    self.verifyLogLevels(['warning'])
-
-  def testLogMessagesError(self):
-    self.verifyLogLevels(['error'])
-
-  def testLogMessagesCritical(self):
-    self.verifyLogLevels(['critical'])
-
-  def testLogMessagesAll(self):
-    self.verifyLogLevels([None, 'debug', 'info', 'warning', 'error',
-                          'critical'])
-
-  def testLogMessagesRandom(self):
-    self.verifyLogLevels(['info', 'debug', 'info', 'info', 'warning', 'info',
-                          'error', 'error', None, 'info', None, None,
-                          'critical', 'critical', 'info', 'info', None])
-
-
 if __name__ == '__main__':
   unittest.main()