From 856b6040df7476923bd2c6f7233c7133099a709b Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Tue, 3 Apr 2018 02:45:02 -0700 Subject: [PATCH 1/2] [CHORE] remove deprecated code --- addon/-private/system/model/errors.js | 22 +--------- addon/-private/system/store.js | 59 --------------------------- tests/unit/store/serialize-test.js | 31 -------------- 3 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 tests/unit/store/serialize-test.js diff --git a/addon/-private/system/model/errors.js b/addon/-private/system/model/errors.js index 11c5213b9a0..b955dc1ef61 100644 --- a/addon/-private/system/model/errors.js +++ b/addon/-private/system/model/errors.js @@ -4,7 +4,7 @@ import ArrayProxy from '@ember/array/proxy'; import { set, get, computed } from '@ember/object'; import { makeArray, A } from '@ember/array'; import MapWithDefault from '../map-with-default'; -import { deprecate, warn } from '@ember/debug'; +import { warn } from '@ember/debug'; /** @module ember-data @@ -86,25 +86,6 @@ import { deprecate, warn } from '@ember/debug'; @uses Ember.Evented */ export default ArrayProxy.extend(Evented, { - /** - Register with target handler - - @method registerHandlers - @param {Object} target - @param {Function} becameInvalid - @param {Function} becameValid - @deprecated - */ - registerHandlers(target, becameInvalid, becameValid) { - deprecate( - `Record errors will no longer be evented.`, false, { - id: 'ds.errors.registerHandlers', - until: '3.0.0' - }); - - this._registerHandlers(target, becameInvalid, becameValid); - }, - /** Register with target handler @@ -117,7 +98,6 @@ export default ArrayProxy.extend(Evented, { this.on('becameValid', target, becameValid); }, - /** @property errorsByAttributeName @type {MapWithDefault} diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js index 1a138bc8763..36efa2542a5 100644 --- a/addon/-private/system/store.js +++ b/addon/-private/system/store.js @@ -256,31 +256,6 @@ Store = Service.extend({ */ adapter: '-json-api', - /** - Returns a JSON representation of the record using a custom - type-specific serializer, if one exists. - - The available options are: - - * `includeId`: `true` if the record's ID should be included in - the JSON representation - - @method serialize - @private - @deprecated - @param {DS.Model} record the record to serialize - @param {Object} options an options hash - */ - serialize(record, options) { - deprecate('Use of store.serialize is deprecated, use record.serialize instead.', false, { - id: 'ds.store.serialize', - until: '3.0' - }); - - let snapshot = record._internalModel.createSnapshot(); - return snapshot.serialize(options); - }, - /** This property returns the adapter, after resolving a possible string key. @@ -1827,24 +1802,6 @@ Store = Service.extend({ return promiseArray(promise.then(() => array, null, `DS: Store#filter of ${normalizedModelName}`)); }, - /** - This method has been deprecated and is an alias for store.hasRecordForId, which should - be used instead. - - @deprecated - @method recordIsLoaded - @param {String} modelName - @param {string} id - @return {boolean} - */ - recordIsLoaded(modelName, id) { - deprecate(`Use of recordIsLoaded is deprecated, use hasRecordForId instead.`, false, { - id: 'ds.store.recordIsLoaded', - until: '3.0' - }); - return this.hasRecordForId(modelName, id); - }, - // .............. // . PERSISTING . @@ -2785,22 +2742,6 @@ Store = Service.extend({ return serializer; }, - lookupAdapter(name) { - deprecate(`Use of lookupAdapter is deprecated, use adapterFor instead.`, false, { - id: 'ds.store.lookupAdapter', - until: '3.0' - }); - return this.adapterFor(name); - }, - - lookupSerializer(name) { - deprecate(`Use of lookupSerializer is deprecated, use serializerFor instead.`, false, { - id: 'ds.store.lookupSerializer', - until: '3.0' - }); - return this.serializerFor(name); - }, - willDestroy() { this._super(...arguments); this._pushedInternalModels = null; diff --git a/tests/unit/store/serialize-test.js b/tests/unit/store/serialize-test.js deleted file mode 100644 index 5378324a9e4..00000000000 --- a/tests/unit/store/serialize-test.js +++ /dev/null @@ -1,31 +0,0 @@ -import { run } from '@ember/runloop'; -import { module } from 'qunit'; -import testInDebug from 'dummy/tests/helpers/test-in-debug'; -import attr from 'ember-data/attr'; -import Model from 'ember-data/model'; -import { createStore } from 'dummy/tests/helpers/store'; - -module("unit/store/serialize - DS.Store#serialize"); - -testInDebug('Store#serialize is deprecated', function(assert) { - let store = createStore({ - person: Model.extend({ firstName: attr() }) - }); - - run(() => { - let person = store.push({ - data: { - type: 'person', - id: 1, - attributes: { - firstName: 'original first name' - } - } - }); - - assert.expectDeprecation(() => { - store.serialize(person); - }, 'Use of store.serialize is deprecated, use record.serialize instead.'); - }); - -}); From 1d0e9f2527b3ff127bfa714e8cfcb54b912263a9 Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Tue, 3 Apr 2018 02:48:39 -0700 Subject: [PATCH 2/2] cleanup --- addon/-private/system/store.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js index 36efa2542a5..f1aecf14094 100644 --- a/addon/-private/system/store.js +++ b/addon/-private/system/store.js @@ -16,7 +16,7 @@ import { typeOf, isPresent, isNone } from '@ember/utils'; import Ember from 'ember'; import { InvalidError } from '../adapters/errors'; import { instrument } from 'ember-data/-debug'; -import { assert, deprecate, warn, inspect } from '@ember/debug'; +import { assert, warn, inspect } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import Model from './model/model'; import normalizeModelName from "./normalize-model-name"; @@ -1652,11 +1652,6 @@ Store = Service.extend({ this.recordArrayManager._didUpdateAll(modelName); }, - didUpdateAll(modelName) { - deprecate('didUpdateAll was documented as private and will be removed in the next version of Ember Data.', false, { id: 'ember-data.didUpdateAll', until: '2.17.0' }); - return this._didUpdateAll(modelName); - }, - /** This method returns a filtered array that contains all of the known records for a given type in the store. @@ -2569,11 +2564,6 @@ Store = Service.extend({ return internalModel; }, - buildInternalModel(modelName, id, data) { - deprecate('buildInternalModel was documented as private and will be removed in the next version of Ember Data.', false, { id: 'ember-data.buildInternalModel', until: '2.17.0' }); - return this._buildInternalModel(modelName, id, data); - }, - //Called by the state machine to notify the store that the record is ready to be interacted with recordWasLoaded(record) { this.recordArrayManager.recordWasLoaded(record);