Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit 5ebf877

Browse files
ciroqueciroque
committed
completing the renaming of data_store to datastore.
1 parent 3b68b32 commit 5ebf877

9 files changed

+53
-45
lines changed

Diff for: ‎lib/service/WebService.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var access_statistics_tracker_module = require('./AccessStatisticsTracker');
1010
var endpoint_registrar_module = require('./EndpointRegistrar');
1111
var settings_module = require('n-app-conf');
1212
var log_writer_module = require('./LogWriter');
13-
var data_store_factory = require('./DataStoreFactory');
13+
var datastore_factory = require('./DataStoreFactory');
1414
var rest_server_module = require('./RestServer');
1515

1616
/* *********************************************************************************************************************
@@ -30,7 +30,7 @@ WebService.prototype.run = function() {
3030
var log_writer = new log_writer_module.LogWriter(settings);
3131

3232
log_writer.writeInfo('Creating Datastore...');
33-
var datastore = data_store_factory.createDataStore(settings, log_writer);
33+
var datastore = datastore_factory.createDataStore(settings, log_writer);
3434

3535
log_writer.writeInfo('Creating RestServer...');
3636
var rest_server = new rest_server_module.RestServer(settings, log_writer);

Diff for: ‎lib/service/endpoint_implementation_modules/BatchConfigurationProviderService_0_0_1.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var HTTP_VERB_GET = 'get';
1616
Construction
1717
******************************************************************************************************************** */
1818

19-
function BatchConfigurationProviderService_0_0_1(data_store, log_writer, access_stats_tracker, settings) {
19+
function BatchConfigurationProviderService_0_0_1(datastore, log_writer, access_stats_tracker, settings) {
2020
this.routes = [
2121
{
2222
verb : HTTP_VERB_GET,
@@ -30,7 +30,7 @@ function BatchConfigurationProviderService_0_0_1(data_store, log_writer, access_
3030
}
3131
];
3232

33-
this.datastore = data_store;
33+
this.datastore = datastore;
3434
this.log_writer = log_writer;
3535
this.access_stats_tracker = access_stats_tracker;
3636
this.default_environment = settings.defaults.default_environment;

Diff for: ‎lib/service/endpoint_implementation_modules/ConfigurationManagementService_0_0_1.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ var parameter_validator_module = require('../ParameterValidator');
1212

1313
/**
1414
* Constructor for the ConfigurationManagementService_0_0_1 endpoint implementation module.
15-
* @param data_store
15+
* @param datastore
1616
* @param log_writer
1717
* @param access_stats_tracker
1818
* @param settings
1919
* @constructor
2020
*/
21-
function ConfigurationManagementService_0_0_1(data_store, log_writer, access_stats_tracker, settings) {
21+
function ConfigurationManagementService_0_0_1(datastore, log_writer, access_stats_tracker, settings) {
2222
this.routes = [
2323
{
2424
verb : 'post',
@@ -52,7 +52,7 @@ function ConfigurationManagementService_0_0_1(data_store, log_writer, access_sta
5252
}
5353
];
5454

55-
this.datastore = data_store;
55+
this.datastore = datastore;
5656
this.log_writer = log_writer;
5757
}
5858

Diff for: ‎lib/service/endpoint_implementation_modules/ConfigurationProviderService_0_0_1.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var HTTP_VERB_GET = 'get';
1414
Construction
1515
******************************************************************************************************************** */
1616

17-
function ConfigurationProviderService_0_0_1(data_store, log_writer, access_stats_tracker, settings) {
17+
function ConfigurationProviderService_0_0_1(datastore, log_writer, access_stats_tracker, settings) {
1818
this.routes = [
1919
{
2020
verb : HTTP_VERB_GET,
@@ -43,7 +43,7 @@ function ConfigurationProviderService_0_0_1(data_store, log_writer, access_stats
4343
}
4444
];
4545

46-
this.datastore = data_store;
46+
this.datastore = datastore;
4747
this.log_writer = log_writer;
4848
this.access_stats_tracker = access_stats_tracker;
4949
this.default_environment = settings.defaults.default_environment;
@@ -96,30 +96,30 @@ ConfigurationProviderService_0_0_1.prototype.handleRequest = function(req, res)
9696

9797
var count = settings.length;
9898

99-
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[data_store.retrieveActiveSetting]::count => ' + count);
99+
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[datastore.retrieveActiveSetting]::count => ' + count);
100100

101101
if(count == 0) {
102102
res.send(404);
103103

104104
} else if(count == 1 ) {
105-
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[data_store.retrieveActiveSetting]::setting => ' + JSON.stringify(settings));
105+
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[datastore.retrieveActiveSetting]::setting => ' + JSON.stringify(settings));
106106
res.send(settings);
107107

108108
} else {
109109

110-
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[data_store.retrieveActiveSetting]::all_parameters_provided(' + all_parameters_provided + ')::settings(' + JSON.stringify(settings) + ')');
110+
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[datastore.retrieveActiveSetting]::all_parameters_provided(' + all_parameters_provided + ')::settings(' + JSON.stringify(settings) + ')');
111111

112112
// full path should send only the actual setting, not the default
113113
if(all_parameters_provided) {
114114

115115
var index = findSettingToSend(settings, req.params.environment, self.default_environment, self);
116116

117117
if(index > -1 && index < count) {
118-
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[data_store.retrieveActiveSetting]::settings => ' + settings[index]);
118+
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[datastore.retrieveActiveSetting]::settings => ' + settings[index]);
119119
res.send( [ settings[index] ]);
120120

121121
} else {
122-
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[data_store.retrieveActiveSetting]::404');
122+
self.log_writer.writeDebug('(&ConfigurationProviderService_0_0_1::handleRequest&)[datastore.retrieveActiveSetting]::404');
123123
res.send(404)
124124
}
125125

Diff for: ‎test/run_api_tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ writeToConsole() {
1616
}
1717

1818
writeToConsole 'Setting environment variable overrides.'
19-
export data_store__database_name=ccr_tests
19+
export datastore__database_name=ccr_tests
2020
export service__port=33131
2121
export datastore__database_name=ccr_tests
2222
export logging__log_level=8
@@ -40,4 +40,4 @@ popd
4040

4141
export datastore__database_name=
4242
export service__port=
43-
export data_store__database_name=
43+
export datastore__database_name=

Diff for: ‎test/unit/ConfigurationManagmentService_0_0_1Fixture.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ exports.primaryTestGroup = test_case(
1717
getVersion : function(test) {
1818
test.expect(1);
1919

20-
var mock_data_store = {
20+
var mock_datastore = {
2121
retrieveActiveSetting : function(env, app, scope, setting, handler) {
2222
handler(null);
2323
}
@@ -35,7 +35,7 @@ exports.primaryTestGroup = test_case(
3535
};
3636

3737
var cms_0_0_1 = new cms_0_0_1_module.ConfigurationManagementService_0_0_1(
38-
mock_data_store,
38+
mock_datastore,
3939
mock_log_writer,
4040
mock_access_stats_tracker,
4141
settings
@@ -69,7 +69,7 @@ exports.primaryTestGroup = test_case(
6969
}
7070
];
7171

72-
var mock_data_store = {
72+
var mock_datastore = {
7373
retrieveSettingSchedule : function(env, app, scope, setting, handler) {
7474
handler(null, result);
7575
}
@@ -89,7 +89,7 @@ exports.primaryTestGroup = test_case(
8989
};
9090

9191
var cms_0_0_1 = new cms_0_0_1_module.ConfigurationManagementService_0_0_1(
92-
mock_data_store,
92+
mock_datastore,
9393
mock_log_writer,
9494
mock_access_stats_tracker,
9595
settings

Diff for: ‎test/unit/ConfigurationProviderService_0_0_1Fixture.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports.primaryTestGroup = test_case(
2626
getVersion : function(test) {
2727
test.expect(1);
2828

29-
var mock_data_store = {
29+
var mock_datastore = {
3030
retrieveActiveSetting : function(env, app, scope, setting, handler) {
3131
handler(null);
3232
}
@@ -39,7 +39,7 @@ exports.primaryTestGroup = test_case(
3939
};
4040

4141
var cps_0_0_1 = new cps_0_0_1_module.ConfigurationProviderService_0_0_1(
42-
mock_data_store,
42+
mock_datastore,
4343
mock_log_writer,
4444
mock_access_stats_tracker,
4545
settings
@@ -73,7 +73,7 @@ exports.primaryTestGroup = test_case(
7373
}
7474
];
7575

76-
var mock_data_store = {
76+
var mock_datastore = {
7777
retrieveActiveSetting : function(env, app, scope, setting, handler) {
7878
handler(null, result);
7979
}
@@ -93,7 +93,7 @@ exports.primaryTestGroup = test_case(
9393
};
9494

9595
var cps_0_0_1 = new cps_0_0_1_module.ConfigurationProviderService_0_0_1(
96-
mock_data_store,
96+
mock_datastore,
9797
mock_log_writer,
9898
mock_access_stats_tracker,
9999
settings
@@ -176,7 +176,7 @@ exports.primaryTestGroup = test_case(
176176
}
177177
];
178178

179-
var mock_data_store = {
179+
var mock_datastore = {
180180
retrieveActiveSetting : function(env, app, scope, setting, handler) {
181181
handler(null, result);
182182
}
@@ -190,7 +190,7 @@ exports.primaryTestGroup = test_case(
190190
};
191191

192192
var cps_0_0_1 = new cps_0_0_1_module.ConfigurationProviderService_0_0_1(
193-
mock_data_store,
193+
mock_datastore,
194194
mock_log_writer,
195195
mock_access_stats_tracker,
196196
settings
@@ -273,7 +273,7 @@ exports.primaryTestGroup = test_case(
273273
}
274274
];
275275

276-
var mock_data_store = {
276+
var mock_datastore = {
277277
retrieveActiveSetting : function(env, app, scope, setting, handler) {
278278
handler(null, result);
279279
}
@@ -287,7 +287,7 @@ exports.primaryTestGroup = test_case(
287287
};
288288

289289
var cps_0_0_1 = new cps_0_0_1_module.ConfigurationProviderService_0_0_1(
290-
mock_data_store,
290+
mock_datastore,
291291
mock_log_writer,
292292
mock_access_stats_tracker,
293293
settings

Diff for: ‎test/unit/DataStoreFixture.js

+20-12
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var test_case = nodeunit_module.testCase;
1212
var settings_module = require('n-app-conf');
1313
var log_writer_module = require('../../lib/service/LogWriter');
1414

15-
var data_store_factory = require('../../lib/service/DataStoreFactory');
15+
var datastore_factory = require('../../lib/service/DataStoreFactory');
1616

1717
exports.retrieveActiveSettingTests = test_case(
1818
{
@@ -22,7 +22,7 @@ exports.retrieveActiveSettingTests = test_case(
2222

2323
this.settings = new settings_module.Settings(TEST_SETTINGS_PATH);
2424
this.log_writer = new log_writer_module.LogWriter(this.settings);
25-
this.datastore = data_store_factory.createDataStore(this.settings, this.log_writer);
25+
this.datastore = datastore_factory.createDataStore(this.settings, this.log_writer);
2626

2727
callback();
2828
},
@@ -43,7 +43,7 @@ exports.retrieveActiveSettingTests = test_case(
4343
function(err, settings) {
4444
test.expect(2 + settings.length);
4545
test.ok(err == null, err);
46-
test.equal(settings.length, 3);
46+
test.equal(settings.length, 4);
4747

4848
self.log_writer.writeDebug(JSON.stringify(settings));
4949

@@ -208,7 +208,7 @@ exports.retrieveSettingScheduleTests = test_case(
208208

209209
this.settings = new settings_module.Settings(TEST_SETTINGS_PATH);
210210
this.log_writer = new log_writer_module.LogWriter(this.settings);
211-
this.datastore = data_store_factory.createDataStore(this.settings, this.log_writer);
211+
this.datastore = datastore_factory.createDataStore(this.settings, this.log_writer);
212212
callback();
213213
},
214214

@@ -228,7 +228,7 @@ exports.retrieveSettingScheduleTests = test_case(
228228
function(err, settings) {
229229
test.expect(2 + settings.length);
230230
test.ok(err == null, err);
231-
test.equal(settings.length, 3);
231+
test.equal(settings.length, 4);
232232

233233
self.log_writer.writeDebug(JSON.stringify(settings));
234234

@@ -411,10 +411,18 @@ var update_document = {
411411
}
412412
},
413413
"updatedDocument": {
414+
"key": {
415+
environment : "update_tests_env",
416+
application : "update_tests_app",
417+
scope : "update_tests_scope",
418+
setting : "update_tests_setting"
419+
},
414420
"value": "servername=thedatabase",
415-
"cache_lifetime": "600",
416-
"eff_date": new Date(1968, 04, 31),
417-
"end_date": new Date(2012, 04, 31)
421+
"temporalization": {
422+
"cache_lifetime": "600",
423+
"eff_date": new Date(1968, 04, 31),
424+
"end_date": new Date(2012, 04, 31)
425+
}
418426
}
419427
};
420428

@@ -429,7 +437,7 @@ exports.updateSettingsTests = test_case(
429437

430438
this.settings = new settings_module.Settings(TEST_SETTINGS_PATH);
431439
this.log_writer = new log_writer_module.LogWriter(this.settings);
432-
this.datastore = data_store_factory.createDataStore(this.settings, this.log_writer);
440+
this.datastore = datastore_factory.createDataStore(this.settings, this.log_writer);
433441

434442
var ctxt = this;
435443

@@ -480,9 +488,9 @@ exports.updateSettingsTests = test_case(
480488

481489
ctxt.log_writer.writeInfo('updateSettingsTests >> updateSetting >> result == ' + JSON.stringify(result));
482490
test.equal(result.value, update_document.updatedDocument.value);
483-
test.equal(result.temporalization.cache_lifetime, update_document.updatedDocument.cache_lifetime);
484-
test.ok((result.temporalization.eff_date + '') == (update_document.updatedDocument.eff_date + ''));
485-
test.equal((result.temporalization.end_date + ''), (update_document.updatedDocument.end_date + ''));
491+
test.equal(result.temporalization.cache_lifetime, update_document.updatedDocument.temporalization.cache_lifetime);
492+
test.ok((result.temporalization.eff_date + '') == (update_document.updatedDocument.temporalization.eff_date + ''));
493+
test.equal((result.temporalization.end_date + ''), (update_document.updatedDocument.temporalization.end_date + ''));
486494

487495
test.done();
488496
}

Diff for: ‎test/unit/SettingsFixture.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ exports.datastoreSettings = test_case(
3131
var hostname_override = 'env_datastore_host';
3232
var port_override = 951753;
3333

34-
process.env['data_store__database_name'] = database_name_override;
35-
process.env['data_store__hostname'] = hostname_override;
36-
process.env['data_store__port'] = port_override;
34+
process.env['datastore__database_name'] = database_name_override;
35+
process.env['datastore__hostname'] = hostname_override;
36+
process.env['datastore__port'] = port_override;
3737

3838
test.expect(3);
3939

@@ -45,8 +45,8 @@ exports.datastoreSettings = test_case(
4545

4646
test.done();
4747

48-
delete process.env['data_store__hostname'];
49-
delete process.env['data_store__port'];
48+
delete process.env['datastore__hostname'];
49+
delete process.env['datastore__port'];
5050
}
5151
}
5252
);

0 commit comments

Comments
 (0)