Skip to content

Commit 0ea6be8

Browse files
chillaqchillaq
committed
Updated method names
1 parent 93b0c11 commit 0ea6be8

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎splitio/client/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def _make_evaluation(self, key, feature_flag, attributes, method_name, metric_na
9090
start = get_current_epoch_time_ms()
9191

9292
matching_key, bucketing_key = input_validator.validate_key(key, method_name)
93-
feature_flag = input_validator.validate_feature_name(
93+
feature_flag = input_validator.validate_feature_flag_name(
9494
feature_flag,
9595
self.ready,
9696
self._factory._get_storage('splits'), # pylint: disable=protected-access

‎splitio/client/input_validator.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -232,18 +232,18 @@ def validate_key(key, method_name):
232232
return matching_key_result, bucketing_key_result
233233

234234

235-
def validate_feature_name(feature_flag_name, should_validate_existance, feature_flag_storage, method_name):
235+
def validate_feature_flag_name(feature_flag_name, should_validate_existance, feature_flag_storage, method_name):
236236
"""
237237
Check if feature flag name is valid for get_treatment.
238238
239-
:param feature_name: feature flag name to be checked
240-
:type feature_name: str
241-
:return: feature_name
239+
:param feature_flag_name: feature flag name to be checked
240+
:type feature_flag_name: str
241+
:return: feature_flag_name
242242
:rtype: str|None
243243
"""
244-
if (not _check_not_null(feature_flag_name, 'feature_name', method_name)) or \
245-
(not _check_is_string(feature_flag_name, 'feature_name', method_name)) or \
246-
(not _check_string_not_empty(feature_flag_name, 'feature_name', method_name)):
244+
if (not _check_not_null(feature_flag_name, 'feature_flag_name', method_name)) or \
245+
(not _check_is_string(feature_flag_name, 'feature_flag_name', method_name)) or \
246+
(not _check_string_not_empty(feature_flag_name, 'feature_flag_name', method_name)):
247247
return None
248248

249249
if should_validate_existance and feature_flag_storage.get(feature_flag_name) is None:
@@ -344,18 +344,18 @@ def validate_value(value):
344344
return value
345345

346346

347-
def validate_manager_feature_name(feature_flag_name, should_validate_existance, feature_flag_storage):
347+
def validate_manager_feature_flag_name(feature_flag_name, should_validate_existance, feature_flag_storage):
348348
"""
349349
Check if feature flag name is valid for track.
350350
351-
:param feature_name: feature flag name to be checked
352-
:type feature_name: str
353-
:return: feature_name
351+
:param feature_flag_name: feature flag name to be checked
352+
:type feature_flag_name: str
353+
:return: feature_flag_name
354354
:rtype: str|None
355355
"""
356-
if (not _check_not_null(feature_flag_name, 'feature_name', 'split')) or \
357-
(not _check_is_string(feature_flag_name, 'feature_name', 'split')) or \
358-
(not _check_string_not_empty(feature_flag_name, 'feature_name', 'split')):
356+
if (not _check_not_null(feature_flag_name, 'feature_flag_name', 'split')) or \
357+
(not _check_is_string(feature_flag_name, 'feature_flag_name', 'split')) or \
358+
(not _check_string_not_empty(feature_flag_name, 'feature_flag_name', 'split')):
359359
return None
360360

361361
if should_validate_existance and feature_flag_storage.get(feature_flag_name) is None:

‎splitio/client/manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def split(self, feature_name):
8484
_LOGGER.error("Client is not ready - no calls possible")
8585
return None
8686

87-
feature_name = input_validator.validate_manager_feature_name(
87+
feature_name = input_validator.validate_manager_feature_flag_name(
8888
feature_name,
8989
self._factory.ready,
9090
self._storage

‎tests/client/test_input_validator.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,31 @@ def test_get_treatment(self, mocker):
104104
_logger.reset_mock()
105105
assert client.get_treatment('some_key', None) == CONTROL
106106
assert _logger.error.mock_calls == [
107-
mocker.call('%s: you passed a null %s, %s must be a non-empty string.', 'get_treatment', 'feature_name', 'feature_name')
107+
mocker.call('%s: you passed a null %s, %s must be a non-empty string.', 'get_treatment', 'feature_flag_name', 'feature_flag_name')
108108
]
109109

110110
_logger.reset_mock()
111111
assert client.get_treatment('some_key', 123) == CONTROL
112112
assert _logger.error.mock_calls == [
113-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_name', 'feature_name')
113+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_flag_name', 'feature_flag_name')
114114
]
115115

116116
_logger.reset_mock()
117117
assert client.get_treatment('some_key', True) == CONTROL
118118
assert _logger.error.mock_calls == [
119-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_name', 'feature_name')
119+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_flag_name', 'feature_flag_name')
120120
]
121121

122122
_logger.reset_mock()
123123
assert client.get_treatment('some_key', []) == CONTROL
124124
assert _logger.error.mock_calls == [
125-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_name', 'feature_name')
125+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment', 'feature_flag_name', 'feature_flag_name')
126126
]
127127

128128
_logger.reset_mock()
129129
assert client.get_treatment('some_key', '') == CONTROL
130130
assert _logger.error.mock_calls == [
131-
mocker.call('%s: you passed an empty %s, %s must be a non-empty string.', 'get_treatment', 'feature_name', 'feature_name')
131+
mocker.call('%s: you passed an empty %s, %s must be a non-empty string.', 'get_treatment', 'feature_flag_name', 'feature_flag_name')
132132
]
133133

134134
_logger.reset_mock()
@@ -338,31 +338,31 @@ def _configs(treatment):
338338
_logger.reset_mock()
339339
assert client.get_treatment_with_config('some_key', None) == (CONTROL, None)
340340
assert _logger.error.mock_calls == [
341-
mocker.call('%s: you passed a null %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_name', 'feature_name')
341+
mocker.call('%s: you passed a null %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_flag_name', 'feature_flag_name')
342342
]
343343

344344
_logger.reset_mock()
345345
assert client.get_treatment_with_config('some_key', 123) == (CONTROL, None)
346346
assert _logger.error.mock_calls == [
347-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_name', 'feature_name')
347+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_flag_name', 'feature_flag_name')
348348
]
349349

350350
_logger.reset_mock()
351351
assert client.get_treatment_with_config('some_key', True) == (CONTROL, None)
352352
assert _logger.error.mock_calls == [
353-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_name', 'feature_name')
353+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_flag_name', 'feature_flag_name')
354354
]
355355

356356
_logger.reset_mock()
357357
assert client.get_treatment_with_config('some_key', []) == (CONTROL, None)
358358
assert _logger.error.mock_calls == [
359-
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_name', 'feature_name')
359+
mocker.call('%s: you passed an invalid %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_flag_name', 'feature_flag_name')
360360
]
361361

362362
_logger.reset_mock()
363363
assert client.get_treatment_with_config('some_key', '') == (CONTROL, None)
364364
assert _logger.error.mock_calls == [
365-
mocker.call('%s: you passed an empty %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_name', 'feature_name')
365+
mocker.call('%s: you passed an empty %s, %s must be a non-empty string.', 'get_treatment_with_config', 'feature_flag_name', 'feature_flag_name')
366366
]
367367

368368
_logger.reset_mock()
@@ -1109,25 +1109,25 @@ def test_split_(self, mocker):
11091109

11101110
assert manager.split(None) is None
11111111
assert _logger.error.mock_calls == [
1112-
mocker.call("%s: you passed a null %s, %s must be a non-empty string.", 'split', 'feature_name', 'feature_name')
1112+
mocker.call("%s: you passed a null %s, %s must be a non-empty string.", 'split', 'feature_flag_name', 'feature_flag_name')
11131113
]
11141114

11151115
_logger.reset_mock()
11161116
assert manager.split("") is None
11171117
assert _logger.error.mock_calls == [
1118-
mocker.call("%s: you passed an empty %s, %s must be a non-empty string.", 'split', 'feature_name', 'feature_name')
1118+
mocker.call("%s: you passed an empty %s, %s must be a non-empty string.", 'split', 'feature_flag_name', 'feature_flag_name')
11191119
]
11201120

11211121
_logger.reset_mock()
11221122
assert manager.split(True) is None
11231123
assert _logger.error.mock_calls == [
1124-
mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'split', 'feature_name', 'feature_name')
1124+
mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'split', 'feature_flag_name', 'feature_flag_name')
11251125
]
11261126

11271127
_logger.reset_mock()
11281128
assert manager.split([]) is None
11291129
assert _logger.error.mock_calls == [
1130-
mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'split', 'feature_name', 'feature_name')
1130+
mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'split', 'feature_flag_name', 'feature_flag_name')
11311131
]
11321132

11331133
_logger.reset_mock()

0 commit comments

Comments
 (0)