From 39392ec075f651955529d273131ee2c98a9b62f9 Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Thu, 10 Jun 2021 14:22:35 -0500
Subject: [PATCH] Updating the DefaultGem ${Name}Bus.h template with
 AZ::Interface

---
 .../Template/Code/Include/${Name}/${Name}Bus.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h b/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
index 1b3b67c241..7501e29796 100644
--- a/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
+++ b/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
@@ -15,22 +15,30 @@
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/Interface/Interface.h>
 
 namespace ${SanitizedCppName}
 {
     class ${SanitizedCppName}Requests
+    {
+    public:
+        AZ_RTTI(${SanitizedCppName}Requests, "${Random_Uuid}");
+        virtual ~${SanitizedCppName}Requests = default();
+        // Put your public methods here
+    };
+    
+    class ${SanitizedCppName}BusTraits
         : public AZ::EBusTraits
     {
     public:
         //////////////////////////////////////////////////////////////////////////
         // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        static constexpr AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
         //////////////////////////////////////////////////////////////////////////
-
-        // Put your public methods here
     };
 
-    using ${SanitizedCppName}RequestBus = AZ::EBus<${SanitizedCppName}Requests>;
+    using ${SanitizedCppName}RequestBus = AZ::EBus<${SanitizedCppName}Requests, ${SanitizedCppName}BusTraits>;
+    using ${SanitizedCppName}Interface = AZ::Interface<${SanitizedCppName}Requests>;
 
 } // namespace ${SanitizedCppName}