From 8fbb41742c8224cdc6890084dd956c4cfc5614ab Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Mon, 3 Oct 2016 15:25:01 +0200 Subject: [PATCH] Rename redis conf factories to builders --- server/extension/sql/20_geocode_street.sql | 6 +++--- .../cartodb_services/refactor/storage/redis_config.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/extension/sql/20_geocode_street.sql b/server/extension/sql/20_geocode_street.sql index e457206..e65e8b5 100644 --- a/server/extension/sql/20_geocode_street.sql +++ b/server/extension/sql/20_geocode_street.sql @@ -144,7 +144,7 @@ RETURNS Geometry AS $$ from cartodb_services.metrics import QuotaService from cartodb_services.tools import Logger from cartodb_services.refactor.storage.server_config import InDbServerConfigStorage - from cartodb_services.refactor.storage.redis_config import UserConfigStorageFactory, OrgConfigStorageFactory + from cartodb_services.refactor.storage.redis_config import RedisUserConfigStorageBuilder, RedisOrgConfigStorageBuilder from cartodb_services.refactor.tools.logger import LoggerConfigBuilder from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock from cartodb_services.refactor.storage.redis_connection_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder @@ -164,8 +164,8 @@ RETURNS Geometry AS $$ else: redis_metadata_connection_config = RedisMetadataConnectionConfigBuilder(server_config_storage).get() redis_metadata_connection = RedisConnectionBuilder(redis_metadata_connection_config).get() - user_config_storage = UserConfigStorageFactory(redis_metadata_connection, username).get() - org_config_storage = OrgConfigStorageFactory(redis_metadata_connection, orgname).get() + user_config_storage = RedisUserConfigStorageBuilder(redis_metadata_connection, username).get() + org_config_storage = RedisOrgConfigStorageBuilder(redis_metadata_connection, orgname).get() mapzen_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get() diff --git a/server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_config.py b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_config.py index 43e61bb..35d0645 100644 --- a/server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_config.py +++ b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_config.py @@ -15,7 +15,7 @@ class RedisConfigStorage(ConfigStorageInterface): return self._data[key] -class UserConfigStorageFactory(object): +class RedisUserConfigStorageBuilder(object): # TODO rework to support onpremise and InDbStorage def __init__(self, redis_connection, username): self._redis_connection = redis_connection @@ -25,7 +25,7 @@ class UserConfigStorageFactory(object): return RedisConfigStorage(self._redis_connection, 'rails:users:{0}'.format(self._username)) -class OrgConfigStorageFactory(object): +class RedisOrgConfigStorageBuilder(object): # TODO rework to support onpremise and InDbStorage def __init__(self, redis_connection, orgname): self._redis_connection = redis_connection