Skip to content

Commit a596cf5

Browse files
yavoronayavorona
authored
Merge branch 'master' into pnguen-pr442
2 parents 2ac2394 + b1436b6 commit a596cf5

File tree

11 files changed

+4
-52
lines changed

11 files changed

+4
-52
lines changed

‎packages/optimizely-sdk/lib/core/project_config/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,14 +499,13 @@ module.exports = {
499499
* @param {Object} config.datafile
500500
* @param {Object} config.jsonSchemaValidator
501501
* @param {Object} config.logger
502-
* @param {Object} config.skipJSONValidation
503502
* @return {Object} Project config object
504503
*/
505504
tryCreatingProjectConfig: function(config) {
506505
configValidator.validateDatafile(config.datafile);
507-
if (config.skipJSONValidation === true) {
506+
if (!config.jsonSchemaValidator) {
508507
config.logger.log(LOG_LEVEL.INFO, jsSdkUtils.sprintf(LOG_MESSAGES.SKIPPING_JSON_VALIDATION, MODULE_NAME));
509-
} else if (config.jsonSchemaValidator) {
508+
} else {
510509
config.jsonSchemaValidator.validate(config.datafile);
511510
config.logger.log(LOG_LEVEL.INFO, jsSdkUtils.sprintf(LOG_MESSAGES.VALID_DATAFILE, MODULE_NAME));
512511
}

‎packages/optimizely-sdk/lib/core/project_config/index.tests.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,6 @@ describe('lib/core/project_config', function() {
726726
datafile: { foo: 'bar' },
727727
jsonSchemaValidator: stubJsonSchemaValidator,
728728
logger: logger,
729-
skipJSONValidation: false,
730729
});
731730
assert.deepEqual(result, configObj);
732731
});
@@ -739,7 +738,6 @@ describe('lib/core/project_config', function() {
739738
datafile: { foo: 'bar' },
740739
jsonSchemaValidator: stubJsonSchemaValidator,
741740
logger: logger,
742-
skipJSONValidation: false,
743741
});
744742
});
745743
});
@@ -752,21 +750,10 @@ describe('lib/core/project_config', function() {
752750
datafile: { foo: 'bar' },
753751
jsonSchemaValidator: stubJsonSchemaValidator,
754752
logger: logger,
755-
skipJSONValidation: false,
756753
});
757754
});
758755
});
759756

760-
it('does not call jsonSchemaValidator.validate when skipJSONValidation is true', function() {
761-
projectConfig.tryCreatingProjectConfig({
762-
datafile: { foo: 'bar' },
763-
jsonSchemaValidator: stubJsonSchemaValidator,
764-
logger: logger,
765-
skipJSONValidation: true,
766-
});
767-
sinon.assert.notCalled(stubJsonSchemaValidator.validate);
768-
});
769-
770757
it('skips json validation when jsonSchemaValidator is not provided', function() {
771758
configValidator.validateDatafile.returns(true);
772759
var configObj = {

‎packages/optimizely-sdk/lib/core/project_config/project_config_manager.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ function getErrorMessage(maybeError, defaultMessage) {
5454
* @param {Object=} config.datafileOptions
5555
* @param {Object=} config.jsonSchemaValidator
5656
* @param {string=} config.sdkKey
57-
* @param {boolean=} config.skipJSONValidation
5857
*/
5958
function ProjectConfigManager(config) {
6059
try {
@@ -80,12 +79,10 @@ function ProjectConfigManager(config) {
8079
* @param {Object=} config.datafileOptions
8180
* @param {Object=} config.jsonSchemaValidator
8281
* @param {string=} config.sdkKey
83-
* @param {boolean=} config.skipJSONValidation
8482
*/
8583
ProjectConfigManager.prototype.__initialize = function(config) {
8684
this.__updateListeners = [];
8785
this.jsonSchemaValidator = config.jsonSchemaValidator;
88-
this.skipJSONValidation = config.skipJSONValidation;
8986

9087
if (!config.datafile && !config.sdkKey) {
9188
this.__configObj = null;
@@ -106,7 +103,6 @@ ProjectConfigManager.prototype.__initialize = function(config) {
106103
datafile: initialDatafile,
107104
jsonSchemaValidator: this.jsonSchemaValidator,
108105
logger: logger,
109-
skipJSONValidation: this.skipJSONValidation,
110106
});
111107
this.__optimizelyConfigObj = optimizelyConfig.getOptimizelyConfig(this.__configObj);
112108
} catch (ex) {
@@ -162,7 +158,6 @@ ProjectConfigManager.prototype.__onDatafileManagerReadyFulfill = function() {
162158
datafile: newDatafile,
163159
jsonSchemaValidator: this.jsonSchemaValidator,
164160
logger: logger,
165-
skipJSONValidation: this.skipJSONValidation,
166161
});
167162
} catch (ex) {
168163
logger.error(ex);
@@ -204,7 +199,6 @@ ProjectConfigManager.prototype.__onDatafileManagerUpdate = function() {
204199
datafile: newDatafile,
205200
jsonSchemaValidator: this.jsonSchemaValidator,
206201
logger: logger,
207-
skipJSONValidation: this.skipJSONValidation,
208202
});
209203
} catch (ex) {
210204
logger.error(ex);

‎packages/optimizely-sdk/lib/core/project_config/project_config_manager.tests.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ describe('lib/core/project_config/project_config_manager', function() {
5959

6060
it('should call the error handler and fulfill onReady with an unsuccessful result if neither datafile nor sdkKey are passed into the constructor', function() {
6161
var manager = new projectConfigManager.ProjectConfigManager({
62-
skipJSONValidation: true,
6362
});
6463
sinon.assert.calledOnce(globalStubErrorHandler.handleError);
6564
var errorMessage = globalStubErrorHandler.handleError.lastCall.args[0].message;
@@ -75,7 +74,6 @@ describe('lib/core/project_config/project_config_manager', function() {
7574
var invalidDatafileJSON = 'abc';
7675
var manager = new projectConfigManager.ProjectConfigManager({
7776
datafile: invalidDatafileJSON,
78-
skipJSONValidation: true,
7977
});
8078
sinon.assert.calledOnce(globalStubErrorHandler.handleError);
8179
var errorMessage = globalStubErrorHandler.handleError.lastCall.args[0].message;
@@ -131,20 +129,18 @@ describe('lib/core/project_config/project_config_manager', function() {
131129
jsonSchemaValidator.validate.restore();
132130
});
133131

134-
it('should skip JSON schema validation if skipJSONValidation is passed into instance args with `true` value', function() {
132+
it('should skip JSON schema validation if jsonSchemaValidator is not provided', function() {
135133
var manager = new projectConfigManager.ProjectConfigManager({
136134
datafile: testData.getTestProjectConfig(),
137-
skipJSONValidation: true,
138135
});
139136
sinon.assert.notCalled(jsonSchemaValidator.validate);
140137
return manager.onReady();
141138
});
142139

143-
it('should not skip JSON schema validation if skipJSONValidation is passed into instance args with any value other than true', function() {
140+
it('should not skip JSON schema validation if jsonSchemaValidator is provided', function() {
144141
var manager = new projectConfigManager.ProjectConfigManager({
145142
datafile: testData.getTestProjectConfig(),
146143
jsonSchemaValidator: jsonSchemaValidator,
147-
skipJSONValidation: 'hi',
148144
});
149145
sinon.assert.calledOnce(jsonSchemaValidator.validate);
150146
sinon.assert.calledOnce(stubLogHandler.log);

‎packages/optimizely-sdk/lib/index.browser.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@ module.exports = {
8484
config.isValidInstance = false;
8585
}
8686

87-
// Explicitly check for null or undefined
88-
// prettier-ignore
89-
if (config.skipJSONValidation == null) { // eslint-disable-line eqeqeq
90-
config.skipJSONValidation = true;
91-
}
92-
9387
var eventDispatcher;
9488
// prettier-ignore
9589
if (config.eventDispatcher == null) { // eslint-disable-line eqeqeq

‎packages/optimizely-sdk/lib/index.browser.umdtests.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ describe('javascript-sdk', function() {
7474
// checking that INFO logs log for an unspecified logLevel
7575
var optlyInstance = window.optimizelySdk.createInstance({
7676
datafile: testData.getTestProjectConfig(),
77-
skipJSONValidation: true,
7877
});
7978
assert.strictEqual(console.info.getCalls().length, 1);
8079
call = console.info.getCalls()[0];
@@ -87,7 +86,6 @@ describe('javascript-sdk', function() {
8786
var optlyInstance = window.optimizelySdk.createInstance({
8887
datafile: testData.getTestProjectConfig(),
8988
logLevel: enums.LOG_LEVEL.ERROR,
90-
skipJSONValidation: true,
9189
});
9290
assert.strictEqual(console.log.getCalls().length, 0);
9391

‎packages/optimizely-sdk/lib/index.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ declare module '@optimizely/optimizely-sdk' {
4949
| enums.LOG_LEVEL.INFO
5050
| enums.LOG_LEVEL.NOTSET
5151
| enums.LOG_LEVEL.WARNING;
52-
skipJSONValidation?: boolean;
5352
jsonSchemaValidator?: object;
5453
userProfileService?: UserProfileService | null;
5554
eventBatchSize?: number;

‎packages/optimizely-sdk/lib/index.node.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var defaultErrorHandler = require('./plugins/error_handler');
1919
var defaultEventDispatcher = require('./plugins/event_dispatcher/index.node');
2020
var enums = require('./utils/enums');
2121
var fns = require('./utils/fns');
22-
var jsonSchemaValidator = require('./utils/json_schema_validator');
2322
var loggerPlugin = require('./plugins/logger');
2423
var Optimizely = require('./optimizely');
2524
var eventProcessorConfigValidator = require('./utils/event_processor_config_validator');
@@ -48,7 +47,6 @@ module.exports = {
4847
* @param {Object} config.datafile
4948
* @param {Object} config.errorHandler
5049
* @param {Object} config.eventDispatcher
51-
* @param {Object} config.jsonSchemaValidator
5250
* @param {Object} config.logger
5351
* @param {Object} config.userProfileService
5452
* @param {Object} config.eventBatchSize
@@ -93,8 +91,6 @@ module.exports = {
9391
eventBatchSize: DEFAULT_EVENT_BATCH_SIZE,
9492
eventDispatcher: defaultEventDispatcher,
9593
eventFlushInterval: DEFAULT_EVENT_FLUSH_INTERVAL,
96-
jsonSchemaValidator: jsonSchemaValidator,
97-
skipJSONValidation: false,
9894
},
9995
config,
10096
{

‎packages/optimizely-sdk/lib/index.react_native.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ module.exports = {
8080
config.isValidInstance = false;
8181
}
8282

83-
// Explicitly check for null or undefined
84-
// prettier-ignore
85-
if (config.skipJSONValidation == null) { // eslint-disable-line eqeqeq
86-
config.skipJSONValidation = true;
87-
}
88-
8983
config = fns.assign(
9084
{
9185
clientEngine: enums.REACT_NATIVE_JS_CLIENT_ENGINE,

‎packages/optimizely-sdk/lib/optimizely/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ var DEFAULT_ONREADY_TIMEOUT = 30000;
4949
* @param {Object} config.errorHandler
5050
* @param {Object} config.eventDispatcher
5151
* @param {Object} config.logger
52-
* @param {Object} config.skipJSONValidation
5352
* @param {Object} config.userProfileService
5453
* @param {Object} config.eventBatchSize
5554
* @param {Object} config.eventFlushInterval
@@ -76,7 +75,6 @@ function Optimizely(config) {
7675
datafileOptions: config.datafileOptions,
7776
jsonSchemaValidator: config.jsonSchemaValidator,
7877
sdkKey: config.sdkKey,
79-
skipJSONValidation: config.skipJSONValidation,
8078
});
8179

8280
this.__disposeOnUpdate = this.projectConfigManager.onUpdate(

‎packages/optimizely-sdk/lib/optimizely/index.tests.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ describe('lib/optimizely', function() {
216216
jsonSchemaValidator: jsonSchemaValidator,
217217
logger: createdLogger,
218218
sdkKey: '12345',
219-
skipJSONValidation: false,
220219
});
221220
sinon.assert.notCalled(stubErrorHandler.handleError);
222221
});
@@ -236,7 +235,6 @@ describe('lib/optimizely', function() {
236235
jsonSchemaValidator: jsonSchemaValidator,
237236
logger: createdLogger,
238237
sdkKey: '12345',
239-
skipJSONValidation: false,
240238
});
241239
sinon.assert.calledOnce(projectConfigManager.ProjectConfigManager);
242240
sinon.assert.calledWithExactly(projectConfigManager.ProjectConfigManager, {
@@ -247,7 +245,6 @@ describe('lib/optimizely', function() {
247245
},
248246
jsonSchemaValidator: jsonSchemaValidator,
249247
sdkKey: '12345',
250-
skipJSONValidation: false,
251248
});
252249
});
253250
});

0 commit comments

Comments
 (0)