Remove deprecated overwriting of options using computed properties

Author: josemarluedke

addon/-private/deprecate-computed.js

@@ -14,7 +14,6 @@ import { getOwner } from '@ember/application';
 import { isArray } from '@ember/array';
 import { isNone, isPresent } from '@ember/utils';
 import { registerWaiter } from '@ember/test';
-import deprecateComputed from 'ember-apollo-client/-private/deprecate-computed';
 import { run } from '@ember/runloop';
 import { QueryManager } from '../index';
 
@@ -104,14 +103,7 @@ export default class ApolloService extends Service {
   init() {
     super.init(...arguments);
 
-    let options = this.clientOptions;
-    if (typeof options === 'function') {
-      options = this.clientOptions();
-    } else {
-      deprecateComputed('clientOptions');
-    }
-
-    this.client = new ApolloClient(options);
+    this.client = new ApolloClient(this.clientOptions());
 
     if (Ember.testing) {
       this._registerWaiter();
@@ -155,21 +147,10 @@ export default class ApolloService extends Service {
    * @public
    */
   clientOptions() {
-    let { link, cache } = this;
-
-    if (typeof link === 'function') {
-      link = this.link();
-    } else {
-      deprecateComputed('link');
-    }
-
-    if (typeof cache === 'function') {
-      cache = this.cache();
-    } else {
-      deprecateComputed('cache');
-    }
-
-    return { link, cache };
+    return {
+      link: this.link(),
+      cache: this.cache(),
+    };
   }
 
   /**

addon/services/apollo.js

@@ -163,46 +163,6 @@ module('Unit | Service | apollo', function (hooks) {
     removeListener(result, 'event', handleEvent);
   });
 
-  test('it works when cache and link are computed properties, deprecated computed', function (assert) {
-    assert.expect(3);
-    this.owner.register(
-      'service:deprecated-overridden-apollo',
-      ApolloService.extend({
-        cache: computed(function () {
-          assert.ok('should have called cache in computed');
-
-          return new InMemoryCache();
-        }),
-        link: computed(function () {
-          assert.ok('should have called link in computed');
-
-          return createHttpLink({ uri: '/some-api', fetch });
-        }),
-      })
-    );
-    let service = this.owner.lookup('service:deprecated-overridden-apollo');
-
-    assert.ok(service);
-  });
-
-  test('it works when clientOptions is a computed property, deprecated computed', function (assert) {
-    this.owner.register(
-      'service:client-options-overridden-apollo',
-      ApolloService.extend({
-        clientOptions: computed(function () {
-          return {
-            cache: this.cache(),
-            link: fakeLink,
-          };
-        }),
-      })
-    );
-    let service = this.owner.lookup('service:client-options-overridden-apollo');
-    assert.ok(service);
-    // make sure the override was used.
-    assert.equal(service.client.link, fakeLink);
-  });
-
   test('tests should wait for response', async function (assert) {
     let service = this.owner.lookup('service:apollo');