Removed asserts from SourceAssetReference class

Cleaned up code a bit

Signed-off-by: amzn-mike <[email protected]>

Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp

@@ -1980,7 +1980,7 @@ namespace AssetProcessor
     bool AssetDatabaseConnection::GetJobsBySourceName(const SourceAssetReference& sourceAsset, JobDatabaseEntryContainer& container, AZ::Uuid builderGuid, QString jobKey, QString platform, JobStatus status)
     {
         bool found = false;
-        bool succeeded = QuerySourceBySourceNameScanFolderID(sourceAsset.RelativePath().c_str(), sourceAsset.ScanfolderId(),
+        bool succeeded = QuerySourceBySourceNameScanFolderID(sourceAsset.RelativePath().c_str(), sourceAsset.ScanFolderId(),
             [&](SourceDatabaseEntry& source)
         {
             succeeded = QueryJobBySourceID(source.m_sourceID,

Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp

@@ -781,7 +781,7 @@ namespace AssetProcessor
         {
             SourceAssetReference sourceAsset;
             bool result = GetAssetInfoByIdOnly(assetId, platformName, assetInfo, sourceAsset);
-            rootFilePath = sourceAsset.ScanfolderPath().c_str();
+            rootFilePath = sourceAsset.ScanFolderPath().c_str();
             return result;
         }
 
@@ -803,7 +803,7 @@ namespace AssetProcessor
                 assetInfo.m_assetType = assetType;
                 assetInfo.m_relativePath = sourceAsset.RelativePath().c_str();
                 assetInfo.m_sizeBytes = AZ::IO::SystemFile::Length(sourceAsset.AbsolutePath().c_str());
-                rootFilePath = sourceAsset.ScanfolderPath().c_str();
+                rootFilePath = sourceAsset.ScanFolderPath().c_str();
 
                 return true;
             }
@@ -1041,7 +1041,7 @@ namespace AssetProcessor
             AZStd::lock_guard<AZStd::mutex> lock(m_databaseMutex);
             AzToolsFramework::AssetDatabase::SourceDatabaseEntryContainer returnedSources;
 
-            if (m_db->GetSourcesBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanfolderId(), returnedSources))
+            if (m_db->GetSourcesBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanFolderId(), returnedSources))
             {
                 if (!returnedSources.empty())
                 {
@@ -1078,7 +1078,7 @@ namespace AssetProcessor
             }
         }
 
-        watchFolder = sourceAsset.ScanfolderPath().c_str();
+        watchFolder = sourceAsset.ScanFolderPath().c_str();
 
         // Source file isn't in the database yet, see if its in the job queue
         if (GetQueuedAssetInfoByRelativeSourceName(sourceAsset, assetInfo))
@@ -1097,7 +1097,7 @@ namespace AssetProcessor
 
         if (GetSourceFileInfoFromAssetId(partialId, sourceAsset))
         {
-            watchFolder = sourceAsset.ScanfolderPath().c_str();
+            watchFolder = sourceAsset.ScanFolderPath().c_str();
 
             assetInfo.m_assetId = partialId;
             assetInfo.m_assetType = AZ::Uuid::CreateNull(); // most source files don't have a type!

Code/Tools/AssetProcessor/native/AssetManager/SourceAssetReference.cpp

@@ -16,38 +16,55 @@ namespace AssetProcessor
 
         AZ_Assert(pathConversion, "IPathConversion interface is not available");
 
-        QString relativePath, scanfolderPath;
-        pathConversion->ConvertToRelativePath(absolutePath.FixedMaxPathStringAsPosix().c_str(), relativePath, scanfolderPath);
-        auto* scanFolderInfo = pathConversion->GetScanFolderForFile(scanfolderPath);
+        if(absolutePath.empty())
+        {
+            return;
+        }
 
-        AZ_Assert(scanFolderInfo, "Failed to find scanfolder for " AZ_STRING_FORMAT, AZ_STRING_ARG(absolutePath.Native()));
+        QString relativePath, scanFolderPath;
 
-        m_scanfolderId = scanFolderInfo->ScanFolderID();
-        m_absolutePath = absolutePath;
+        if(!pathConversion->ConvertToRelativePath(absolutePath.FixedMaxPathStringAsPosix().c_str(), relativePath, scanFolderPath))
+        {
+            return;
+        }
+
+        auto* scanFolderInfo = pathConversion->GetScanFolderForFile(scanFolderPath);
+
+        if(!scanFolderInfo)
+        {
+            return;
+        }
+
+        m_scanFolderPath = scanFolderPath.toUtf8().constData();
         m_relativePath = relativePath.toUtf8().constData();
-        m_scanfolderPath = scanfolderPath.toUtf8().constData();
+        m_absolutePath = absolutePath;
+        m_scanFolderId = scanFolderInfo->ScanFolderID();
 
         Normalize();
     }
 
     SourceAssetReference::SourceAssetReference(AZ::IO::PathView scanFolderPath, AZ::IO::PathView pathRelativeToScanFolder)
     {
-        AZ_Assert(!scanFolderPath.Native().empty(), "scanfolderPath is empty");
-        AZ_Assert(!pathRelativeToScanFolder.Native().empty(), "pathRelativeToScanFolder is empty");
-
-        m_scanfolderPath = scanFolderPath;
-        m_relativePath = pathRelativeToScanFolder;
-        m_absolutePath = m_scanfolderPath / m_relativePath;
-
         IPathConversion* pathConversion = AZ::Interface<IPathConversion>::Get();
 
         AZ_Assert(pathConversion, "IPathConversion interface is not available");
 
-        auto* scanFolderInfo = pathConversion->GetScanFolderForFile(m_scanfolderPath.c_str());
+        if(scanFolderPath.empty() || pathRelativeToScanFolder.empty())
+        {
+            return;
+        }
+
+        auto* scanFolderInfo = pathConversion->GetScanFolderForFile(scanFolderPath.FixedMaxPathStringAsPosix().c_str());
 
-        AZ_Assert(scanFolderInfo, "Failed to find scanfolder for " AZ_STRING_FORMAT, AZ_STRING_ARG(m_absolutePath.Native()));
+        if(!scanFolderInfo)
+        {
+            return;
+        }
 
-        m_scanfolderId = scanFolderInfo->ScanFolderID();
+        m_scanFolderPath = scanFolderPath;
+        m_relativePath = pathRelativeToScanFolder;
+        m_absolutePath = m_scanFolderPath / m_relativePath;
+        m_scanFolderId = scanFolderInfo->ScanFolderID();
 
         Normalize();
     }
@@ -73,6 +90,11 @@ namespace AssetProcessor
     }
 
     SourceAssetReference::operator bool() const
+    {
+        return IsValid();
+    }
+
+    bool SourceAssetReference::IsValid() const
     {
         return !m_absolutePath.empty();
     }
@@ -87,19 +109,19 @@ namespace AssetProcessor
         return m_relativePath;
     }
 
-    AZ::IO::Path SourceAssetReference::ScanfolderPath() const
+    AZ::IO::Path SourceAssetReference::ScanFolderPath() const
     {
-        return m_scanfolderPath;
+        return m_scanFolderPath;
     }
 
-    AZ::s64 SourceAssetReference::ScanfolderId() const
+    AZ::s64 SourceAssetReference::ScanFolderId() const
     {
-        return m_scanfolderId;
+        return m_scanFolderId;
     }
 
     void SourceAssetReference::Normalize()
     {
-        m_scanfolderPath = m_scanfolderPath.LexicallyNormal().AsPosix();
+        m_scanFolderPath = m_scanFolderPath.LexicallyNormal().AsPosix();
         m_relativePath = m_relativePath.LexicallyNormal().AsPosix();
         m_absolutePath = m_absolutePath.LexicallyNormal().AsPosix();
     }

Code/Tools/AssetProcessor/native/AssetManager/SourceAssetReference.h

@@ -16,6 +16,7 @@
 
 namespace AssetProcessor
 {
+    //! Represents a reference to a single source asset on disk
     class SourceAssetReference
     {
     public:
@@ -59,18 +60,19 @@ namespace AssetProcessor
         bool operator>(const SourceAssetReference& other) const;
         explicit operator bool() const;
 
+        bool IsValid() const;
         AZ::IO::Path AbsolutePath() const;
         AZ::IO::Path RelativePath() const;
-        AZ::IO::Path ScanfolderPath() const;
-        AZ::s64 ScanfolderId() const;
+        AZ::IO::Path ScanFolderPath() const;
+        AZ::s64 ScanFolderId() const;
 
     private:
         void Normalize();
 
         AZ::IO::Path m_absolutePath;
         AZ::IO::Path m_relativePath;
-        AZ::IO::Path m_scanfolderPath;
-        AZ::s64 m_scanfolderId{};
+        AZ::IO::Path m_scanFolderPath;
+        AZ::s64 m_scanFolderId{};
     };
 }
 

Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp

@@ -217,7 +217,7 @@ namespace AssetProcessor
             jobInfo.m_platform = jobEntry.m_platformInfo.m_identifier;
             jobInfo.m_builderGuid = jobEntry.m_builderGuid;
             jobInfo.m_sourceFile = jobEntry.m_sourceAssetReference.RelativePath().Native();
-            jobInfo.m_watchFolder = jobEntry.m_sourceAssetReference.ScanfolderPath().Native();
+            jobInfo.m_watchFolder = jobEntry.m_sourceAssetReference.ScanFolderPath().Native();
             jobInfo.m_jobKey = jobEntry.m_jobKey.toUtf8().constData();
             jobInfo.m_jobRunKey = jobEntry.m_jobRunKey;
             jobInfo.m_status = status;
@@ -228,7 +228,7 @@ namespace AssetProcessor
         else
         {
             QString statKey = QString("ProcessJob,%1,%2,%3,%4,%5")
-                                  .arg(jobEntry.m_sourceAssetReference.ScanfolderPath().c_str())
+                                  .arg(jobEntry.m_sourceAssetReference.ScanFolderPath().c_str())
                                   .arg(jobEntry.m_sourceAssetReference.RelativePath().c_str())
                                   .arg(jobEntry.m_jobKey)
                                   .arg(jobEntry.m_platformInfo.m_identifier.c_str())
@@ -440,7 +440,7 @@ namespace AssetProcessor
         if (!request.m_isSearchTermJobKey)
         {
             //any succeeded or failed jobs will be in the table
-            m_stateData->GetJobInfoBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanfolderId(), jobListDataBase);
+            m_stateData->GetJobInfoBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanFolderId(), jobListDataBase);
         }
         else
         {
@@ -676,7 +676,7 @@ namespace AssetProcessor
         else
         {
             //if we didn't find a source, we make a new source
-            const ScanFolderInfo* scanFolder = m_platformConfig->GetScanFolderByPath(jobEntry.m_sourceAssetReference.ScanfolderPath().c_str());
+            const ScanFolderInfo* scanFolder = m_platformConfig->GetScanFolderByPath(jobEntry.m_sourceAssetReference.ScanFolderPath().c_str());
             if (!scanFolder)
             {
                 //can't find the scan folder this source came from!?
@@ -691,7 +691,7 @@ namespace AssetProcessor
 
                 //notify the GUI to remove the failed job that is currently onscreen:
                 AzToolsFramework::AssetSystem::JobInfo jobInfo;
-                jobInfo.m_watchFolder = jobEntry.m_sourceAssetReference.ScanfolderPath().Native();
+                jobInfo.m_watchFolder = jobEntry.m_sourceAssetReference.ScanFolderPath().Native();
                 jobInfo.m_sourceFile = jobEntry.m_sourceAssetReference.RelativePath().Native();
                 jobInfo.m_platform = jobEntry.m_platformInfo.m_identifier;
                 jobInfo.m_jobKey = jobEntry.m_jobKey.toUtf8().constData();
@@ -792,7 +792,7 @@ namespace AssetProcessor
         if (MessageInfoBus::HasHandlers())
         {
             // send a network message when not in batch mode.
-            const ScanFolderInfo* scanFolder = m_platformConfig->GetScanFolderByPath(jobEntry.m_sourceAssetReference.ScanfolderPath().c_str());
+            const ScanFolderInfo* scanFolder = m_platformConfig->GetScanFolderByPath(jobEntry.m_sourceAssetReference.ScanFolderPath().c_str());
             AzToolsFramework::AssetSystem::SourceFileNotificationMessage message(AZ::OSString(source.m_sourceName.c_str()), AZ::OSString(scanFolder->ScanPath().toUtf8().constData()), AzToolsFramework::AssetSystem::SourceFileNotificationMessage::FileFailed, source.m_sourceGuid);
             EBUS_EVENT(AssetProcessor::ConnectionBus, Send, 0, message);
             MessageInfoBus::Broadcast(&MessageInfoBusTraits::OnAssetFailed, source.m_sourceName);
@@ -1174,7 +1174,7 @@ namespace AssetProcessor
             //create/update the source record for this job
             AzToolsFramework::AssetDatabase::SourceDatabaseEntry source;
             AzToolsFramework::AssetDatabase::SourceDatabaseEntryContainer sources;
-            auto scanFolder = m_platformConfig->GetScanFolderByPath(processedAsset.m_entry.m_sourceAssetReference.ScanfolderPath().c_str());
+            auto scanFolder = m_platformConfig->GetScanFolderByPath(processedAsset.m_entry.m_sourceAssetReference.ScanFolderPath().c_str());
             if (!scanFolder)
             {
                 //can't find the scan folder this source came from!?
@@ -1906,7 +1906,7 @@ namespace AssetProcessor
         bool deleteFailure = false;
         AzToolsFramework::AssetDatabase::SourceDatabaseEntryContainer sources;
 
-        auto scanFolder = m_platformConfig->GetScanFolderByPath(sourceAsset.ScanfolderPath().c_str());
+        auto scanFolder = m_platformConfig->GetScanFolderByPath(sourceAsset.ScanFolderPath().c_str());
 
         if (m_stateData->GetSourcesBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), scanFolder->ScanFolderID(), sources))
         {
@@ -1939,7 +1939,7 @@ namespace AssetProcessor
                 }
 
                 AzToolsFramework::AssetSystem::JobInfo jobInfo;
-                jobInfo.m_watchFolder = sourceAsset.ScanfolderPath().Native();
+                jobInfo.m_watchFolder = sourceAsset.ScanFolderPath().Native();
                 jobInfo.m_sourceFile = sourceAsset.RelativePath().Native();
 
                 AzToolsFramework::AssetDatabase::JobDatabaseEntryContainer jobs;
@@ -2742,10 +2742,10 @@ namespace AssetProcessor
 
                 SourceAssetReference sourceAssetReference(examineFile.m_fileName.toUtf8().constData());
 
-                if (sourceAssetReference.AbsolutePath() == sourceAssetReference.ScanfolderPath())
+                if (sourceAssetReference.AbsolutePath() == sourceAssetReference.ScanFolderPath())
                 {
                     // We found a scanfolder, record it
-                    m_knownFolders.insert(sourceAssetReference.ScanfolderPath().c_str());
+                    m_knownFolders.insert(sourceAssetReference.ScanFolderPath().c_str());
                 }
 
 
@@ -2807,7 +2807,7 @@ namespace AssetProcessor
                         }
                         // keep track of its parent folder so that if it is deleted later we know it is a folder
                         // delete and not a file delete.
-                        AddKnownFoldersRecursivelyForFile(normalizedPath, sourceAssetReference.ScanfolderPath().c_str());
+                        AddKnownFoldersRecursivelyForFile(normalizedPath, sourceAssetReference.ScanFolderPath().c_str());
 
                         if (normalizedPath.toUtf8().length() > normalizedPath.length())
                         {
@@ -2838,7 +2838,7 @@ namespace AssetProcessor
                     else
                     {
                         // if its a folder that was added or modified, we need to keep track of that too.
-                        AddKnownFoldersRecursivelyForFile(normalizedPath, sourceAssetReference.ScanfolderPath().c_str());
+                        AddKnownFoldersRecursivelyForFile(normalizedPath, sourceAssetReference.ScanFolderPath().c_str());
                         // we actually need to scan this folder now...
                         CheckCreatedSourceFolder(normalizedPath);
                         continue;
@@ -2878,7 +2878,7 @@ namespace AssetProcessor
                 }
                 else
                 {
-                    overrider = m_platformConfig->GetOverridingFile(sourceAssetReference.RelativePath().c_str(), sourceAssetReference.ScanfolderPath().c_str());
+                    overrider = m_platformConfig->GetOverridingFile(sourceAssetReference.RelativePath().c_str(), sourceAssetReference.ScanFolderPath().c_str());
                 }
 
                 if (!overrider.isEmpty())
@@ -3913,7 +3913,7 @@ namespace AssetProcessor
                     // if we succeeded, we can erase any jobs that had failed createjobs last time for this builder:
                     AzToolsFramework::AssetSystem::JobInfo jobInfo;
                     jobInfo.m_sourceFile = sourceAsset.RelativePath().Native();
-                    jobInfo.m_watchFolder = sourceAsset.ScanfolderPath().Native();
+                    jobInfo.m_watchFolder = sourceAsset.ScanFolderPath().Native();
                     jobInfo.m_platform = "all";
                     jobInfo.m_jobKey = AZStd::string::format("CreateJobs_%s", builderInfo.m_busId.ToString<AZStd::string>().c_str());
                     Q_EMIT JobRemoved(jobInfo);

Code/Tools/AssetProcessor/native/assetprocessor.h

@@ -136,7 +136,7 @@ namespace AssetProcessor
 
         AZ::u32 GetHash() const
         {
-            AZ::Crc32 crc(m_sourceAssetReference.ScanfolderPath().c_str());
+            AZ::Crc32 crc(m_sourceAssetReference.ScanFolderPath().c_str());
             crc.Add(m_sourceAssetReference.RelativePath().c_str());
             crc.Add(m_platformInfo.m_identifier.c_str());
             crc.Add(m_jobKey.toUtf8().constData());

Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.cpp

@@ -210,7 +210,7 @@ namespace AssetProcessor
             AssetJobLogResponse jobLogResponse;
             auto* cachedJobInfo = getItem(index.row());
             jobInfo.m_sourceFile = cachedJobInfo->m_elementId.GetSourceAssetReference().RelativePath().Native();
-            jobInfo.m_watchFolder = cachedJobInfo->m_elementId.GetSourceAssetReference().ScanfolderPath().Native();
+            jobInfo.m_watchFolder = cachedJobInfo->m_elementId.GetSourceAssetReference().ScanFolderPath().Native();
             jobInfo.m_platform = cachedJobInfo->m_elementId.GetPlatform().toUtf8().data();
             jobInfo.m_jobKey = cachedJobInfo->m_elementId.GetJobDescriptor().toUtf8().data();
             jobInfo.m_builderGuid = cachedJobInfo->m_builderGuid;
@@ -260,7 +260,7 @@ namespace AssetProcessor
             AzToolsFramework::AssetSystem::JobInfo jobInfo;
             CachedJobInfo* cachedJobInfo = getItem(index.row());
             jobInfo.m_sourceFile = cachedJobInfo->m_elementId.GetSourceAssetReference().RelativePath().Native();
-            jobInfo.m_watchFolder = cachedJobInfo->m_elementId.GetSourceAssetReference().ScanfolderPath().Native();
+            jobInfo.m_watchFolder = cachedJobInfo->m_elementId.GetSourceAssetReference().ScanFolderPath().Native();
             jobInfo.m_platform = cachedJobInfo->m_elementId.GetPlatform().toUtf8().data();
             jobInfo.m_jobKey = cachedJobInfo->m_elementId.GetJobDescriptor().toUtf8().data();
             jobInfo.m_builderGuid = cachedJobInfo->m_builderGuid;

Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp

@@ -236,7 +236,7 @@ namespace AssetProcessor
         processJobRequest.m_builderGuid = GetBuilderGuid();
         processJobRequest.m_sourceFile = GetJobEntry().m_sourceAssetReference.RelativePath().c_str();
         processJobRequest.m_sourceFileUUID = GetInputFileUuid();
-        processJobRequest.m_watchFolder = GetJobEntry().m_sourceAssetReference.ScanfolderPath().c_str();
+        processJobRequest.m_watchFolder = GetJobEntry().m_sourceAssetReference.ScanFolderPath().c_str();
         processJobRequest.m_fullPath = GetJobEntry().GetAbsoluteSourcePath().toUtf8().data();
         processJobRequest.m_jobId = GetJobEntry().m_jobRunKey;
     }

Code/Tools/AssetProcessor/native/tests/SourceAssetReferenceTests.cpp

@@ -32,8 +32,8 @@ namespace UnitTests
         EXPECT_EQ(test3.AbsolutePath(), path);
 
         EXPECT_EQ(test1.RelativePath(), "file.png");
-        EXPECT_EQ(test1.ScanfolderPath(), "c:/somepath");
-        EXPECT_EQ(test1.ScanfolderId(), 1);
+        EXPECT_EQ(test1.ScanFolderPath(), "c:/somepath");
+        EXPECT_EQ(test1.ScanFolderId(), 1);
     }
 
     TEST_F(SourceAssetReferenceTests, Construct_ScanFolderPath_Succeeds)
@@ -55,8 +55,8 @@ namespace UnitTests
         EXPECT_EQ(test3.AbsolutePath(), path);
 
         EXPECT_EQ(test1.RelativePath(), relative);
-        EXPECT_EQ(test1.ScanfolderPath(), scanfolder);
-        EXPECT_EQ(test1.ScanfolderId(), 1);
+        EXPECT_EQ(test1.ScanFolderPath(), scanfolder);
+        EXPECT_EQ(test1.ScanFolderId(), 1);
     }
 
     TEST_F(SourceAssetReferenceTests, Construct_ScanFolderId_Succeeds)
@@ -73,8 +73,8 @@ namespace UnitTests
 
         EXPECT_EQ(test1.AbsolutePath(), path);
         EXPECT_EQ(test1.RelativePath(), relative);
-        EXPECT_EQ(test1.ScanfolderPath(), scanfolder);
-        EXPECT_EQ(test1.ScanfolderId(), 1);
+        EXPECT_EQ(test1.ScanFolderPath(), scanfolder);
+        EXPECT_EQ(test1.ScanFolderId(), 1);
     }
 
     TEST_F(SourceAssetReferenceTests, Copy_Succeeds)
@@ -96,11 +96,11 @@ namespace UnitTests
         EXPECT_EQ(test1.RelativePath(), test2.RelativePath());
         EXPECT_EQ(test2.RelativePath(), test3.RelativePath());
 
-        EXPECT_EQ(test1.ScanfolderPath(), test2.ScanfolderPath());
-        EXPECT_EQ(test2.ScanfolderPath(), test3.ScanfolderPath());
+        EXPECT_EQ(test1.ScanFolderPath(), test2.ScanFolderPath());
+        EXPECT_EQ(test2.ScanFolderPath(), test3.ScanFolderPath());
 
-        EXPECT_EQ(test1.ScanfolderId(), test2.ScanfolderId());
-        EXPECT_EQ(test2.ScanfolderId(), test3.ScanfolderId());
+        EXPECT_EQ(test1.ScanFolderId(), test2.ScanFolderId());
+        EXPECT_EQ(test2.ScanFolderId(), test3.ScanFolderId());
     }
 
     TEST_F(SourceAssetReferenceTests, Move_Succeeds)
@@ -117,15 +117,15 @@ namespace UnitTests
 
         EXPECT_EQ(test2.AbsolutePath(), path);
         EXPECT_EQ(test2.RelativePath(), "file.png");
-        EXPECT_EQ(test2.ScanfolderPath(), "c:/somepath");
-        EXPECT_EQ(test2.ScanfolderId(), 1);
+        EXPECT_EQ(test2.ScanFolderPath(), "c:/somepath");
+        EXPECT_EQ(test2.ScanFolderId(), 1);
 
         auto test3(AZStd::move(test2));
 
         EXPECT_EQ(test3.AbsolutePath(), path);
         EXPECT_EQ(test3.RelativePath(), "file.png");
-        EXPECT_EQ(test3.ScanfolderPath(), "c:/somepath");
-        EXPECT_EQ(test3.ScanfolderId(), 1);
+        EXPECT_EQ(test3.ScanFolderPath(), "c:/somepath");
+        EXPECT_EQ(test3.ScanFolderId(), 1);
     }
 
     TEST_F(SourceAssetReferenceTests, BoolCheck_EmptyReference_ReturnsFalse)

Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.cpp

@@ -290,7 +290,7 @@ namespace UnitTests
 
         AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
 
-        m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(sourcePath.RelativePath().c_str(), sourcePath.ScanfolderId(), fileEntry);
+        m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(sourcePath.RelativePath().c_str(), sourcePath.ScanFolderId(), fileEntry);
 
         ASSERT_NE(fileEntry.m_modTime, timestamp);
         uint64_t existingTimestamp = fileEntry.m_modTime;
@@ -305,7 +305,7 @@ namespace UnitTests
 
         ExpectNoWork();
 
-        m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(sourcePath.RelativePath().c_str(), sourcePath.ScanfolderId(), fileEntry);
+        m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(sourcePath.RelativePath().c_str(), sourcePath.ScanFolderId(), fileEntry);
 
         // The timestamp should be updated even though nothing processed
         ASSERT_NE(fileEntry.m_modTime, existingTimestamp);

Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp

@@ -467,7 +467,7 @@ namespace AssetProcessor
         {
             UNIT_TEST_EXPECT_TRUE(processResults[checkIdx].m_jobEntry.m_computedFingerprint != 0);
             UNIT_TEST_EXPECT_TRUE(processResults[checkIdx].m_jobEntry.m_jobRunKey != 0);
-            UNIT_TEST_EXPECT_TRUE(QString(processResults[checkIdx].m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str()) == AssetUtilities::NormalizeFilePath(watchFolderPath));
+            UNIT_TEST_EXPECT_TRUE(QString(processResults[checkIdx].m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str()) == AssetUtilities::NormalizeFilePath(watchFolderPath));
             UNIT_TEST_EXPECT_TRUE(processResults[checkIdx].m_jobEntry.m_sourceAssetReference.RelativePath().Native() == "uniquefile.txt");
 
             QString platformFolder = cacheRoot.filePath(QString::fromUtf8(processResults[checkIdx].m_jobEntry.m_platformInfo.m_identifier.c_str()));
@@ -494,7 +494,7 @@ namespace AssetProcessor
                 info.m_jobKey = processResults[checkIdx].m_jobEntry.m_jobKey.toUtf8().data();
                 info.m_platform = processResults[checkIdx].m_jobEntry.m_platformInfo.m_identifier.c_str();
                 info.m_sourceFile = processResults[checkIdx].m_jobEntry.m_sourceAssetReference.RelativePath().c_str();
-                info.m_watchFolder = processResults[checkIdx].m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str();
+                info.m_watchFolder = processResults[checkIdx].m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str();
 
                 AZStd::string logFolder = AZStd::string::format("%s/%s", AssetUtilities::ComputeJobLogFolder().c_str(), AssetUtilities::ComputeJobLogFileName(info).c_str());
                 AZ::IO::HandleType logHandle;
@@ -540,7 +540,7 @@ namespace AssetProcessor
                 for (const JobDetails& details : processResults)
                 {
                     if ((QString::compare(jobInfo.m_sourceFile.c_str(), details.m_jobEntry.m_sourceAssetReference.RelativePath().c_str(), Qt::CaseSensitive) == 0) &&
-                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str(), Qt::CaseSensitive) ==
+                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str(), Qt::CaseSensitive) ==
                          0) &&
                         (QString::compare(jobInfo.m_platform.c_str(), details.m_jobEntry.m_platformInfo.m_identifier.c_str(), Qt::CaseInsensitive) == 0) &&
                         (QString::compare(jobInfo.m_jobKey.c_str(), details.m_jobEntry.m_jobKey, Qt::CaseInsensitive) == 0) &&
@@ -647,7 +647,7 @@ namespace AssetProcessor
                 for (const JobDetails& details : processResults)
                 {
                     if ((QString::compare(jobInfo.m_sourceFile.c_str(), details.m_jobEntry.m_sourceAssetReference.RelativePath().c_str(), Qt::CaseSensitive) == 0) &&
-                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str(), Qt::CaseSensitive) == 0) &&
+                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str(), Qt::CaseSensitive) == 0) &&
                         (QString::compare(jobInfo.m_platform.c_str(), details.m_jobEntry.m_platformInfo.m_identifier.c_str(), Qt::CaseInsensitive) == 0) &&
                         (QString::compare(jobInfo.m_jobKey.c_str(), details.m_jobEntry.m_jobKey, Qt::CaseInsensitive) == 0) &&
                         (jobInfo.m_builderGuid == details.m_jobEntry.m_builderGuid) &&
@@ -778,7 +778,7 @@ namespace AssetProcessor
                     const JobDetails& details = processResults[detailsIdx];
 
                     if ((QString::compare(jobInfo.m_sourceFile.c_str(), details.m_jobEntry.m_sourceAssetReference.RelativePath().c_str(), Qt::CaseSensitive) == 0) &&
-                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str(), Qt::CaseSensitive) == 0) &&
+                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str(), Qt::CaseSensitive) == 0) &&
                         (QString::compare(jobInfo.m_jobKey.c_str(), details.m_jobEntry.m_jobKey, Qt::CaseInsensitive) == 0) &&
                         (jobInfo.m_builderGuid == details.m_jobEntry.m_builderGuid) &&
                         (jobInfo.GetHash() == details.m_jobEntry.GetHash()))
@@ -915,7 +915,7 @@ namespace AssetProcessor
                 for (const JobDetails& details : processResults)
                 {
                     if ((QString::compare(jobInfo.m_sourceFile.c_str(), details.m_jobEntry.m_sourceAssetReference.RelativePath().c_str(), Qt::CaseSensitive) == 0) &&
-                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str(), Qt::CaseSensitive) == 0) &&
+                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str(), Qt::CaseSensitive) == 0) &&
                         (QString::compare(jobInfo.m_platform.c_str(), details.m_jobEntry.m_platformInfo.m_identifier.c_str(), Qt::CaseInsensitive) == 0) &&
                         (QString::compare(jobInfo.m_jobKey.c_str(), details.m_jobEntry.m_jobKey, Qt::CaseInsensitive) == 0) &&
                         (jobInfo.m_builderGuid == details.m_jobEntry.m_builderGuid) &&
@@ -1414,7 +1414,7 @@ namespace AssetProcessor
                     const JobDetails& details = processResults[detailsIdx];
 
                     if ((QString::compare(jobInfo.m_sourceFile.c_str(), details.m_jobEntry.m_sourceAssetReference.RelativePath().c_str(), Qt::CaseSensitive) == 0) &&
-                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanfolderPath().c_str(), Qt::CaseSensitive) == 0) &&
+                        (QString::compare(jobInfo.m_watchFolder.c_str(), details.m_jobEntry.m_sourceAssetReference.ScanFolderPath().c_str(), Qt::CaseSensitive) == 0) &&
                         (QString::compare(jobInfo.m_platform.c_str(), details.m_jobEntry.m_platformInfo.m_identifier.c_str(), Qt::CaseInsensitive) == 0) &&
                         (QString::compare(jobInfo.m_jobKey.c_str(), details.m_jobEntry.m_jobKey, Qt::CaseInsensitive) == 0) &&
                         (jobInfo.m_builderGuid == details.m_jobEntry.m_builderGuid) &&

Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp

@@ -1437,13 +1437,13 @@ namespace AssetUtilities
         if (!topLevelSource)
         {
             AzToolsFramework::AssetDatabase::SourceDatabaseEntryContainer source;
-            db->GetSourcesBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanfolderId(), source);
+            db->GetSourcesBySourceNameScanFolderId(sourceAsset.RelativePath().c_str(), sourceAsset.ScanFolderId(), source);
 
             AZ_Assert(
                 source.size() <= 1,
                 "Should find exactly 1 source for the given path (%s) and scanfolder (%d).  Found %d",
                 sourceAsset.RelativePath().c_str(),
-                sourceAsset.ScanfolderId(),
+                sourceAsset.ScanFolderId(),
                 source.size());
 
             if(source.empty())