[CLEANUP BUGFIX] cleanup modelFor and modelFactoryFor codepaths

emberjs · Apr 22, 2018 · 4270054 · 4270054
1 parent 87be9b7
commit 4270054
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 132 deletions.
diff --git a/addon/-private/system/model/internal-model.js b/addon/-private/system/model/internal-model.js
@@ -172,7 +172,7 @@ export default class InternalModel {
   }
 
   get modelClass() {
-    return this._modelClass || (this._modelClass = this.store._modelFor(this.modelName));
+    return this._modelClass || (this._modelClass = this.store.modelFor(this.modelName));
   }
 
   get type() {
@@ -391,7 +391,7 @@ export default class InternalModel {
         createOptions.container = this.store.container;
       }
 
-      this._record = this.store.modelFactoryFor(this.modelName).create(createOptions);
+      this._record = this.store._modelFactoryFor(this.modelName).create(createOptions);
 
       this._triggerDeferredTriggers();
       heimdall.stop(token);

diff --git a/addon/-private/system/record-arrays/record-array.js b/addon/-private/system/record-arrays/record-array.js
@@ -95,7 +95,7 @@ export default ArrayProxy.extend(Evented, {
     if (!this.modelName) {
       return null;
     }
-    return this.store._modelFor(this.modelName);
+    return this.store.modelFor(this.modelName);
   }).readOnly(),
 
   /**

diff --git a/addon/-private/system/relationships/relationship-payloads-manager.js b/addon/-private/system/relationships/relationship-payloads-manager.js
@@ -128,7 +128,7 @@ export default class RelationshipPayloadsManager {
     @method
   */
   unload(modelName, id) {
-    let modelClass = this._store._modelFor(modelName);
+    let modelClass = this._store.modelFor(modelName);
     let relationshipsByName = get(modelClass, 'relationshipsByName');
     relationshipsByName.forEach((_, relationshipName) => {
       let relationshipPayloads = this._getRelationshipPayloads(modelName, relationshipName, false);
@@ -189,7 +189,7 @@ export default class RelationshipPayloadsManager {
       return cached;
     }
 
-    let modelClass = store._modelFor(modelName);
+    let modelClass = store.modelFor(modelName);
     let relationshipsByName = get(modelClass, 'relationshipsByName');
 
     // CASE: We don't have a relationship at all