review applied

Signed-off-by: Adam Dabrowski <[email protected]>

Project/Gem/CMakeLists.txt

@@ -43,7 +43,6 @@ ly_add_target(
             Gem::ROS2.Static
         PRIVATE
             AZ::AzGameFramework
-            AZ::AzToolsFramework
             AZ::AzFramework
             Gem::LmbrCentral.API
             Gem::AtomLyIntegration_CommonFeatures.Editor.Static
@@ -65,7 +64,6 @@ ly_add_target(
         PRIVATE
             Gem::ROSConDemo.Static
             AZ::AzCore
-            AZ::AzToolsFramework
             AZ::AzFramework
 )
 

Project/Gem/Source/ApplePicker/ApplePickerComponent.cpp

@@ -68,7 +68,7 @@ namespace AppleKraken
         return false;
     }
 
-    void ApplePickerComponent::ProcessTriggerServiceCall(const TriggerRequest req, TriggerResponse resp)
+    void ApplePickerComponent::ProcessTriggerServiceCall(const TriggerRequestPtr req, TriggerResponsePtr resp)
     {
         // TODO - also, perhaps add a check whether Kraken is in gathering position, immobile etc.
         if (IsBusy())
@@ -135,7 +135,7 @@ namespace AppleKraken
         auto topic = ROS2Names::GetNamespacedName(robotNamespace, m_triggerServiceTopic);
         m_triggerService = ros2Node->create_service<std_srvs::srv::Trigger>(
             topic.c_str(),
-            [this](const TriggerRequest request, TriggerResponse response)
+            [this](const TriggerRequestPtr request, TriggerResponsePtr response)
             {
                 this->ProcessTriggerServiceCall(request, response);
             });

Project/Gem/Source/ApplePicker/ApplePickerComponent.h

@@ -16,8 +16,8 @@
 
 namespace AppleKraken
 {
-    using TriggerRequest = std::shared_ptr<std_srvs::srv::Trigger::Request>;
-    using TriggerResponse = std::shared_ptr<std_srvs::srv::Trigger::Response>;
+    using TriggerRequestPtr = std::shared_ptr<std_srvs::srv::Trigger::Request>;
+    using TriggerResponsePtr = std::shared_ptr<std_srvs::srv::Trigger::Response>;
 
     //! Demo component handling orchestration of apple picking
     class ApplePickerComponent
@@ -53,7 +53,7 @@ namespace AppleKraken
         bool IsBusy() const;
         void PickNextApple();
         void QueryEnvironmentForAllApplesInBox(const AZ::Obb& globalBox);
-        void ProcessTriggerServiceCall(const TriggerRequest req, TriggerResponse resp);
+        void ProcessTriggerServiceCall(const TriggerRequestPtr req, TriggerResponsePtr resp);
 
         AZStd::string m_triggerServiceTopic = "trigger_apple_gathering";
         AZ::EntityId m_effectorEntityId;