Run codemods

app/adapters/application.js

@@ -1,12 +1,10 @@
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { inject as service } from '@ember/service';
-import DS from 'ember-data';
 import fetch from 'fetch';
 import ENV from 'ember-api-docs/config/environment';
 import { pluralize } from 'ember-inflector';
 import { isBlank } from '@ember/utils';
 
-const { JSONAPIAdapter } = DS;
-
 export default JSONAPIAdapter.extend({
 
   host: ENV.API_HOST,

app/models/class.js

@@ -1,6 +1,5 @@
+import Model, { belongsTo, attr } from '@ember-data/model';
 import { computed } from '@ember/object';
-import DS from 'ember-data';
-const {attr, belongsTo} = DS;
 
 const projectNameFromClassName = key => {
   return computed(key, function() {
@@ -30,7 +29,7 @@ const guessVersionFor = key => {
   });
 };
 
-export default DS.Model.extend({
+export default Model.extend({
   name: attr(),
   methods: attr(),
   properties: attr(),
@@ -56,15 +55,15 @@ export default DS.Model.extend({
   usedClassVersion: guessVersionFor('uses'),
 
   extendedClassShortName: computed('extends', function() {
-    let extendedClassName = this.get('extends');
+    let extendedClassName = this['extends'];
     if (extendedClassName.substr(0, 6) === 'Ember.') {
       return extendedClassName.substr(6);
     }
     return extendedClassName;
   }),
 
   usesObjects: computed('uses', function() {
-    return this.get('uses').map(className => ({
+    return this.uses.map(className => ({
       name: className,
       shortName: className.substr(0, 6) === 'Ember.' ? className.substr(6) : className,
       projectId: className.substr(0, 6) === 'Ember.' ? 'ember' :

app/models/missing.js

@@ -1,7 +1,4 @@
-import Model from 'ember-data/model';
-import DS from 'ember-data';
-
-const { attr } = DS;
+import Model, { attr } from '@ember-data/model';
 
 export default Model.extend({
   name: attr()

app/models/module.js

@@ -1,7 +1,5 @@
+import { belongsTo, attr } from '@ember-data/model';
 import ClassModel from './class';
-import DS from 'ember-data';
-
-const { attr, belongsTo } = DS;
 
 export default ClassModel.extend({
   submodules: attr(),

app/models/namespace.js

@@ -1,7 +1,5 @@
+import { belongsTo } from '@ember-data/model';
 import ClassModel from './class';
-import DS from 'ember-data';
-
-const { belongsTo } = DS;
 
 export default ClassModel.extend({
   projectVersion: belongsTo('project-version', {inverse: 'namespaces'})

app/models/project-version.js

@@ -1,19 +1,19 @@
+import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
-import DS from 'ember-data';
 import getCompactVersion from '../utils/get-compact-version';
 
-export default DS.Model.extend({
-  version: DS.attr(),
-  classes: DS.hasMany('class', {async: true}),
-  modules: DS.hasMany('module', {async: true}),
-  namespaces: DS.hasMany('namespace', {async: true}),
-  'public-classes': DS.hasMany('class', {async: true}),
-  'private-classes': DS.hasMany('class', {async: true}),
-  'public-modules': DS.hasMany('module', {async: true}),
-  'private-modules': DS.hasMany('module', {async: true}),
-  'public-namespaces': DS.hasMany('namespace', {async: true}),
-  'private-namespaces': DS.hasMany('namespace', {async: true}),
-  project: DS.belongsTo('project'),
+export default Model.extend({
+  version: attr(),
+  classes: hasMany('class', {async: true}),
+  modules: hasMany('module', {async: true}),
+  namespaces: hasMany('namespace', {async: true}),
+  'public-classes': hasMany('class', {async: true}),
+  'private-classes': hasMany('class', {async: true}),
+  'public-modules': hasMany('module', {async: true}),
+  'private-modules': hasMany('module', {async: true}),
+  'public-namespaces': hasMany('namespace', {async: true}),
+  'private-namespaces': hasMany('namespace', {async: true}),
+  project: belongsTo('project'),
   compactVersion: computed('version', function() {
     return getCompactVersion(this.version);
   })

app/models/project.js

@@ -1,6 +1,4 @@
-import DS from 'ember-data';
-
-const {Model, attr, hasMany} = DS;
+import Model, { hasMany, attr } from '@ember-data/model';
 
 export default Model.extend({
   name: attr(),

app/serializers/application.js

@@ -1,7 +1,7 @@
+import JSONAPISerializer from '@ember-data/serializer/json-api';
 import { inject as service } from '@ember/service';
-import DS from 'ember-data';
 
-export default DS.JSONAPISerializer.extend({
+export default JSONAPISerializer.extend({
 
   metaStore: service(),
 

app/services/search.js

@@ -1,9 +1,8 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { get, set } from '@ember/object';
 import { A as emberArray } from '@ember/array';
 import { alias } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
 
 export default Service.extend({
   _algoliaService: service('algolia'),

tests/acceptance/module-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { visit, click, find, findAll } from '@ember/test-helpers';
+import { visit, click, findAll } from '@ember/test-helpers';
 
 module('Acceptance | Module', function(hooks) {
   setupApplicationTest(hooks);
@@ -37,6 +37,6 @@ module('Acceptance | Module', function(hooks) {
 
     const store = this.owner.lookup('service:store');
     const container = store.peekRecord('module', 'ember-1.0.0-ember-application');
-    assert.equal(find(`.attribute-value`).textContent, container.get('parent'));
+    assert.dom(`.attribute-value`).hasText(container.get('parent'));
   });
 });

tests/acceptance/sidebar-nav-test.js

@@ -1,6 +1,12 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { visit, click, currentURL, find, settled } from '@ember/test-helpers';
+import {
+  visit,
+  click,
+  currentURL,
+  find,
+  settled
+} from '@ember/test-helpers';
 import { timeout } from 'ember-concurrency';
 
 module('Acceptance | sidebar navigation', function(hooks) {

tests/integration/components/class-field-description-test.js

@@ -1,7 +1,12 @@
 import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, click, findAll, triggerEvent } from '@ember/test-helpers';
+import {
+  render,
+  click,
+  findAll,
+  triggerEvent
+} from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | class field description', function(hooks) {