replace remaining instances of stop if stoppable

Author: lia-viam

src/viam/sdk/module/service.cpp

@@ -185,10 +185,8 @@ struct ModuleService::ServiceImpl : viam::module::v1::ModuleService::Service {
                 "unable to remove resource " + name.to_string() + " as it doesn't exist.");
         }
 
-        try {
-            Stoppable::stop_if_stoppable(res);
-        } catch (const std::exception& err) {
-            VIAM_SDK_LOG(error) << "unable to stop resource: " << err.what();
+        if (auto stoppable = std::dynamic_pointer_cast<Stoppable>(res)) {
+            stoppable->stop();
         }
 
         manager->remove(name);

src/viam/sdk/tests/mocks/mock_robot.cpp

@@ -252,31 +252,33 @@ ::grpc::Status MockRobotService::StopAll(::grpc::ServerContext*,
         const std::shared_ptr<Resource> resource = r.second;
         const ResourceName rn = to_proto(resource->get_resource_name());
         const std::string rn_ = rn.SerializeAsString();
-        if (extra.find(rn_) != extra.end()) {
-            try {
-                Stoppable::stop_if_stoppable(resource, extra.at(rn_));
-            } catch (const std::runtime_error& err) {
+
+        auto stop_without_extra = [&status_message,
+                                   &status](const std::shared_ptr<Resource>& resource) {
+            if (auto stoppable = std::dynamic_pointer_cast<Stoppable>(resource)) {
                 try {
+                    stoppable->stop();
+                    return;
+                } catch (const std::runtime_error& err) {
                     status_message = err.what();
-                    Stoppable::stop_if_stoppable(resource);
-                } catch (std::runtime_error& err) {
-                    status_message = err.what();
-                    status = grpc::UNKNOWN;
                 } catch (...) {
                     status_message = "unknown error";
-                    status = grpc::UNKNOWN;
                 }
+                status = grpc::UNKNOWN;
             }
-        } else {
+        };
+
+        if (extra.find(rn_) != extra.end()) {
             try {
-                Stoppable::stop_if_stoppable(resource);
-            } catch (std::runtime_error& err) {
+                if (auto stoppable = std::dynamic_pointer_cast<Stoppable>(resource)) {
+                    stoppable->stop(extra.at(rn_));
+                }
+            } catch (const std::runtime_error& err) {
                 status_message = err.what();
-                status = grpc::UNKNOWN;
-            } catch (...) {
-                status_message = "unknown error";
-                status = grpc::UNKNOWN;
+                stop_without_extra(resource);
             }
+        } else {
+            stop_without_extra(resource);
         }
     }