Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

chrome/common/extensions/docs/server2/reference_resolver.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from file_system import FileNotFoundError
 import logging
 import re
 import string
 
 def _ClassifySchemaNode(node_name, api):
@@ skipping 34 matching lines @@
                                 "The Title".
   """
 
   # Matches after a $ref: that doesn't have []s.
   _bare_ref = re.compile('\w+(\.\w+)*')
 
   class Factory(object):
     def __init__(self,
                  api_data_source_factory,
                  api_list_data_source_factory,
-                 object_store_creator_factory):
+                 object_store_creator):
       self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source_factory = api_list_data_source_factory
-      self._object_store_creator_factory = object_store_creator_factory
+      self._object_store_creator = object_store_creator
 
     def Create(self):
       return ReferenceResolver(
           self._api_data_source_factory.Create(None, disable_refs=True),
           self._api_list_data_source_factory.Create(),
-          self._object_store_creator_factory.Create(ReferenceResolver).Create())
+          self._object_store_creator.Create(ReferenceResolver))
 
   def __init__(self, api_data_source, api_list_data_source, object_store):
     self._api_data_source = api_data_source
     self._api_list_data_source = api_list_data_source
     self._object_store = object_store
 
   def _GetRefLink(self, ref, api_list, namespace, title):
     # Check nodes within each API the ref might refer to.
     parts = ref.split('.')
     for i, part in enumerate(parts):
@@ skipping 113 matching lines @@
           ref = ''
           rest = ref_and_rest
         else:
           ref = match.group()
           rest = ref_and_rest[match.end():]
 
       ref_dict = self.SafeGetLink(ref, namespace=namespace, title=title)
       formatted_text.append('<a href="%(href)s">%(text)s</a>%(rest)s' %
           { 'href': ref_dict['href'], 'text': ref_dict['text'], 'rest': rest })
     return ''.join(formatted_text)