Merge pull request #5405 from runspired/runspired/cleanup-ff-deprecat…

…ions [CHORE] remove dead methods left behind from ff removal
emberjs · Mar 29, 2018 · 8c26c2e · 8c26c2e
2 parents b23bd2c + 74d2d76
commit 8c26c2e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 42 deletions.
diff --git a/addon/adapters/json-api.js b/addon/adapters/json-api.js
@@ -4,7 +4,6 @@
 */
 import { dasherize } from '@ember/string';
 import RESTAdapter from "./rest";
-import { deprecate } from '@ember/debug';
 import { instrument } from 'ember-data/-debug';
 import { pluralize } from 'ember-inflector';
 
@@ -266,26 +265,6 @@ const JSONAPIAdapter = RESTAdapter.extend({
     let url = this.buildURL(type.modelName, snapshot.id, snapshot, 'updateRecord');
 
     return this.ajax(url, 'PATCH', { data: data });
-  },
-
-  _hasCustomizedAjax() {
-    if (this.ajax !== JSONAPIAdapter.prototype.ajax) {
-      deprecate('JSONAPIAdapter#ajax has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
-        id: 'ds.json-api-adapter.ajax',
-        until: '3.0.0'
-      });
-      return true;
-    }
-
-    if (this.ajaxOptions !== JSONAPIAdapter.prototype.ajaxOptions) {
-      deprecate('JSONAPIAdapterr#ajaxOptions has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
-        id: 'ds.json-api-adapter.ajax-options',
-        until: '3.0.0'
-      });
-      return true;
-    }
-
-    return false;
   }
 });
 

diff --git a/addon/adapters/rest.js b/addon/adapters/rest.js
@@ -24,7 +24,7 @@ import {
   MapWithDefault
 } from '../-private';
 import { instrument } from 'ember-data/-debug';
-import { warn, deprecate } from '@ember/debug';
+import { warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 const Promise = EmberPromise;
@@ -1130,26 +1130,6 @@ const RESTAdapter = Adapter.extend(BuildURLMixin, {
     }
 
     return query;
-  },
-
-  _hasCustomizedAjax() {
-    if (this.ajax !== RESTAdapter.prototype.ajax) {
-      deprecate('RESTAdapter#ajax has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
-        id: 'ds.rest-adapter.ajax',
-        until: '3.0.0'
-      });
-      return true;
-    }
-
-    if (this.ajaxOptions !== RESTAdapter.prototype.ajaxOptions) {
-      deprecate('RESTAdapter#ajaxOptions has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
-        id: 'ds.rest-adapter.ajax-options',
-        until: '3.0.0'
-      });
-      return true;
-    }
-
-    return false;
   }
 });