Addressed PR feedback

Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp

@@ -12,7 +12,6 @@
 
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Asset/AssetJsonSerializer.h>
-#include <AzCore/Asset/SerializedAssetTracker.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/Serialization/Json/StackedString.h>
 #include <AzCore/Memory/SystemAllocator.h>
@@ -112,8 +111,8 @@ namespace AZ
             AssetId id;
             JSR::ResultCode result(JSR::Tasks::ReadField);
 
-            SerializedAssetTracker** assetIdTracker =
-                context.GetMetadata().Find<SerializedAssetTracker*>();
+            SerializedAssetTracker* assetTracker =
+                context.GetMetadata().Find<SerializedAssetTracker>();
 
             {
                 Data::AssetLoadBehavior loadBehavior = instance->GetAutoLoadBehavior();
@@ -168,9 +167,9 @@ namespace AZ
                     "The asset hint is missing for Asset<T>, so it will be left empty."));
             }
 
-            if (assetIdTracker && *assetIdTracker)
+            if (assetTracker)
             {
-                (*assetIdTracker)->AddAsset(*instance);
+                assetTracker->AddAsset(*instance);
             }
 
             bool success = result.GetOutcome() <= JSR::Outcomes::PartialSkip;
@@ -181,5 +180,20 @@ namespace AZ
                 "Not enough information was available to create an instance of Asset<T> or data was corrupted.";
             return context.Report(result, message);
         }
+
+        void SerializedAssetTracker::AddAsset(Asset<AssetData>& asset)
+        {
+            m_serializedAssets.emplace_back(asset);
+        }
+
+        const AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets() const
+        {
+            return m_serializedAssets;
+        }
+
+        AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets()
+        {
+            return m_serializedAssets;
+        }
     } // namespace Data
 } // namespace AZ

Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.h

@@ -13,6 +13,7 @@
 #pragma once
 
 #include <AzCore/Memory/Memory.h>
+#include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/Serialization/Json/BaseJsonSerializer.h>
 
 namespace AZ
@@ -37,5 +38,18 @@ namespace AZ
         private:
             JsonSerializationResult::Result LoadAsset(void* outputValue, const rapidjson::Value& inputValue, JsonDeserializerContext& context);
         };
+
+        class SerializedAssetTracker
+        {
+        public:
+            AZ_RTTI(SerializedAssetTracker, "{1E067091-8C0A-44B1-A455-6E97663F6963}");
+
+            void AddAsset(Asset<AssetData>& asset);
+            AZStd::vector<Asset<AssetData>>& GetTrackedAssets();
+            const AZStd::vector<Asset<AssetData>>& GetTrackedAssets() const;
+
+        private:
+            AZStd::vector<Asset<AssetData>> m_serializedAssets;
+        };
     } // namespace Data
 } // namespace AZ

Code/Framework/AzCore/AzCore/Asset/SerializedAssetTracker.cpp

@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <AzCore/Asset/SerializedAssetTracker.h>
-
-namespace AZ
-{
-    namespace Data
-    {
-        void SerializedAssetTracker::AddAsset(Asset<AssetData>& asset)
-        {
-            m_serializedAssets.emplace_back(asset);
-        }
-
-        const AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets() const
-        {
-            return m_serializedAssets;
-        }
-
-        AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets()
-        {
-            return m_serializedAssets;
-        }
-    }
-}

Code/Framework/AzCore/AzCore/Asset/SerializedAssetTracker.h

@@ -1,34 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/std/containers/vector.h>
-namespace AZ
-{
-    namespace Data
-    {
-        class SerializedAssetTracker
-        {
-        public:
-            AZ_RTTI(SerializedAssetTracker, "{1E067091-8C0A-44B1-A455-6E97663F6963}");
-
-            void AddAsset(Asset<AssetData>& asset);
-            AZStd::vector<Asset<AssetData>>& GetTrackedAssets();
-            const AZStd::vector<Asset<AssetData>>& GetTrackedAssets() const;
-
-        private:
-            AZStd::vector<Asset<AssetData>> m_serializedAssets;
-        };
-    }
-}

Code/Framework/AzCore/AzCore/azcore_files.cmake

@@ -35,8 +35,6 @@ set(FILES
     Asset/AssetSerializer.h
     Asset/AssetTypeInfoBus.h
     Asset/AssetInternal/WeakAsset.h
-    Asset/SerializedAssetTracker.cpp
-    Asset/SerializedAssetTracker.h
     Casting/lossy_cast.h
     Casting/numeric_cast.h
     Component/Component.cpp

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp

@@ -11,7 +11,7 @@
 */
 
 #include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/SerializedAssetTracker.h>
+#include <AzCore/Asset/AssetJsonSerializer.h>
 #include <AzCore/JSON/prettywriter.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 
@@ -132,15 +132,13 @@ namespace AzToolsFramework
                     entityIdMapper.SetEntityIdGenerationApproach(InstanceEntityIdMapper::EntityIdGenerationApproach::Random);
                 }
 
-                AZ::Data::SerializedAssetTracker assetTracker;
-
                 AZ::JsonDeserializerSettings settings;
                 // The InstanceEntityIdMapper is registered twice because it's used in several places during deserialization where one is
                 // specific for the InstanceEntityIdMapper and once for the generic JsonEntityIdMapper. Because the Json Serializer's meta
                 // data has strict typing and doesn't look for inheritance both have to be explicitly added so they're found both locations.
                 settings.m_metadata.Add(static_cast<AZ::JsonEntityIdSerializer::JsonEntityIdMapper*>(&entityIdMapper));
                 settings.m_metadata.Add(&entityIdMapper);
-                settings.m_metadata.Add(&assetTracker);
+                settings.m_metadata.Create<AZ::Data::SerializedAssetTracker>();
 
                 AZ::JsonSerializationResult::ResultCode result =
                     AZ::JsonSerialization::Load(instance, prefabDom, settings);
@@ -155,8 +153,9 @@ namespace AzToolsFramework
 
                     return false;
                 }
+                AZ::Data::SerializedAssetTracker* assetTracker = settings.m_metadata.Find<AZ::Data::SerializedAssetTracker>();
 
-                referencedAssets = AZStd::move(assetTracker.GetTrackedAssets());
+                referencedAssets = AZStd::move(assetTracker->GetTrackedAssets());
                 return true;
             }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h

@@ -43,7 +43,7 @@ namespace AzToolsFramework
             /**
             * Stores a valid Prefab Instance within a Prefab Dom. Useful for generating Templates
             * @param instance The instance to store
-            * @param prefabDom the prefabDom that will be used to store the Instance data
+            * @param prefabDom The prefabDom that will be used to store the Instance data
             * @return bool on whether the operation succeeded
             */
             bool StoreInstanceInPrefabDom(const Instance& instance, PrefabDom& prefabDom);
@@ -61,8 +61,8 @@ namespace AzToolsFramework
             /**
             * Loads a valid Prefab Instance from a Prefab Dom. Useful for generating Instances.
             * @param instance The Instance to load.
-            * @param prefabDom the prefabDom that will be used to load the Instance data.
-            * @param shouldClearContainers whether to clear containers in Instance while loading.
+            * @param prefabDom The prefabDom that will be used to load the Instance data.
+            * @param shouldClearContainers Whether to clear containers in Instance while loading.
             * @return bool on whether the operation succeeded.
             */
             bool LoadInstanceFromPrefabDom(
@@ -72,8 +72,8 @@ namespace AzToolsFramework
             * Loads a valid Prefab Instance from a Prefab Dom. Useful for generating Instances.
             * @param instance The Instance to load.
             * @param referencedAssets AZ::Assets discovered during json load are added to this list
-            * @param prefabDom the prefabDom that will be used to load the Instance data.
-            * @param shouldClearContainers whether to clear containers in Instance while loading.
+            * @param prefabDom The prefabDom that will be used to load the Instance data.
+            * @param shouldClearContainers Whether to clear containers in Instance while loading.
             * @return bool on whether the operation succeeded.
             */
             bool LoadInstanceFromPrefabDom(
@@ -85,8 +85,8 @@ namespace AzToolsFramework
             * @param instance The Instance to load.
             * @param newlyAddedEntities The new instances added during deserializing the instance. These are the entities found
             *       in the prefabDom.
-            * @param prefabDom the prefabDom that will be used to load the Instance data.
-            * @param shouldClearContainers whether to clear containers in Instance while loading.
+            * @param prefabDom The prefabDom that will be used to load the Instance data.
+            * @param shouldClearContainers Whether to clear containers in Instance while loading.
             * @return bool on whether the operation succeeded.
             */
             bool LoadInstanceFromPrefabDom(