From 8f79379bc8c5132495f7b56e8e5c80d4d74bec4b Mon Sep 17 00:00:00 2001
From: daimini <daimini@amazon.com>
Date: Thu, 22 Apr 2021 16:45:20 -0700
Subject: [PATCH] Fixes as per Ram's review

---
 .../Entity/PrefabEditorEntityOwnershipInterface.h         | 3 ++-
 .../Entity/PrefabEditorEntityOwnershipService.cpp         | 8 +-------
 .../Entity/PrefabEditorEntityOwnershipService.h           | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
index 9dc3fc16f7..19c236f509 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
@@ -38,7 +38,8 @@ namespace AzToolsFramework
             AZ::IO::PathView filePath, Prefab::InstanceOptionalReference instanceToParentUnder = AZStd::nullopt) = 0;
 
         //! Instantiate the prefab file provided.
-        //! /param entityToParentUnder The entity the newly created prefab instance is parented under.
+        //! /param filePath The filepath for the prefab file the instance should be created from.
+        //! /param instanceToParentUnder The instance the newly instantiated prefab instance is parented under.
         //! /return The optional reference to the prefab instance.
         virtual Prefab::InstanceOptionalReference InstantiatePrefab(
             AZ::IO::PathView filePath, Prefab::InstanceOptionalReference instanceToParentUnder = AZStd::nullopt) = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
index 93e90efe96..4e74a1b020 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
@@ -53,10 +53,6 @@ namespace AzToolsFramework
         AZ_Assert(m_loaderInterface != nullptr,
             "Couldn't get prefab loader interface, it's a requirement for PrefabEntityOwnership system to work");
 
-        m_instanceEntityMapperInterface = AZ::Interface<Prefab::InstanceEntityMapperInterface>::Get();
-        AZ_Assert(m_instanceEntityMapperInterface != nullptr,
-            "Couldn't get instance entity mapper interface, it's a requirement for PrefabEntityOwnership system to work");
-
         m_rootInstance = AZStd::unique_ptr<Prefab::Instance>(m_prefabSystemComponent->CreatePrefab({}, {}, "NewLevel.prefab"));
 
         m_sliceOwnershipService.BusConnect(m_entityContextId);
@@ -325,9 +321,7 @@ namespace AzToolsFramework
             }
 
             Prefab::Instance& addedInstance = instanceToParentUnder->get().AddInstance(AZStd::move(createdPrefabInstance));
-            AZ::Entity* containerEntity = addedInstance.m_containerEntity.get();
-            HandleEntitiesAdded({containerEntity});
-
+            HandleEntitiesAdded({addedInstance.m_containerEntity.get()});
             return addedInstance;
         }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
index 2c66c691b6..9c483e61c5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
@@ -25,7 +25,6 @@ namespace AzToolsFramework
     namespace Prefab
     {
         class Instance;
-        class InstanceEntityMapperInterface;
         class PrefabSystemComponentInterface;
         class PrefabLoaderInterface;
     }
@@ -209,7 +208,6 @@ namespace AzToolsFramework
 
         AZStd::string m_rootPath;
         AZStd::unique_ptr<Prefab::Instance> m_rootInstance;
-        Prefab::InstanceEntityMapperInterface* m_instanceEntityMapperInterface;
         Prefab::PrefabSystemComponentInterface* m_prefabSystemComponent;
         Prefab::PrefabLoaderInterface* m_loaderInterface;
         AzFramework::EntityContextId m_entityContextId;