remove get_

Author: lia-viam

src/viam/sdk/resource/resource_api.cpp

@@ -195,7 +195,7 @@ const std::string& ModelFamily::get_namespace() const {
     return namespace_;
 }
 
-const std::string& ModelFamily::get_family() const {
+const std::string& ModelFamily::family() const {
     return family_;
 }
 
@@ -205,11 +205,11 @@ Model::Model(ModelFamily model_family, std::string model_name)
 Model::Model(std::string namespace_, std::string family, std::string model_name)
     : Model(ModelFamily(std::move(namespace_), std::move(family)), std::move(model_name)) {}
 
-const ModelFamily& Model::get_model_family() const {
+const ModelFamily& Model::model_family() const {
     return model_family_;
 }
 
-const std::string& Model::get_model_name() const {
+const std::string& Model::model_name() const {
     return model_name_;
 }
 

src/viam/sdk/resource/resource_api.hpp

@@ -115,7 +115,7 @@ class ModelFamily {
     ModelFamily(std::string namespace_, std::string family);
 
     const std::string& get_namespace() const;
-    const std::string& get_family() const;
+    const std::string& family() const;
 
     std::string to_string() const;
 
@@ -132,8 +132,8 @@ class Model {
     Model(ModelFamily model, std::string model_name);
     Model();
 
-    const ModelFamily& get_model_family() const;
-    const std::string& get_model_name() const;
+    const ModelFamily& model_family() const;
+    const std::string& model_name() const;
 
     std::string to_string() const;
 

src/viam/sdk/tests/test_resource.cpp

@@ -78,31 +78,31 @@ BOOST_AUTO_TEST_CASE(test_model) {
     ModelFamily mf("ns", "mf");
     BOOST_CHECK_EQUAL(mf.to_string(), "ns:mf");
     BOOST_CHECK_EQUAL(mf.get_namespace(), "ns");
-    BOOST_CHECK_EQUAL(mf.get_family(), "mf");
+    BOOST_CHECK_EQUAL(mf.family(), "mf");
 
     Model model1(mf, "model1");
     BOOST_CHECK_EQUAL(model1.to_string(), "ns:mf:model1");
-    BOOST_CHECK_EQUAL(model1.get_model_family().to_string(), "ns:mf");
-    BOOST_CHECK_EQUAL(model1.get_model_name(), "model1");
+    BOOST_CHECK_EQUAL(model1.model_family().to_string(), "ns:mf");
+    BOOST_CHECK_EQUAL(model1.model_name(), "model1");
     Model model2("ns", "mf", "model2");
     BOOST_CHECK_EQUAL(model2.to_string(), "ns:mf:model2");
-    BOOST_CHECK_EQUAL(model2.get_model_family().to_string(), "ns:mf");
-    BOOST_CHECK_EQUAL(model2.get_model_name(), "model2");
+    BOOST_CHECK_EQUAL(model2.model_family().to_string(), "ns:mf");
+    BOOST_CHECK_EQUAL(model2.model_name(), "model2");
 
     Model model3 = Model::from_str("ns:mf:model3");
     BOOST_CHECK_EQUAL(model3.to_string(), "ns:mf:model3");
-    BOOST_CHECK_EQUAL(model3.get_model_family().to_string(), "ns:mf");
-    BOOST_CHECK_EQUAL(model3.get_model_name(), "model3");
+    BOOST_CHECK_EQUAL(model3.model_family().to_string(), "ns:mf");
+    BOOST_CHECK_EQUAL(model3.model_name(), "model3");
     Model model4 = Model::from_str("model4");
     BOOST_CHECK_EQUAL(model4.to_string(), "rdk:builtin:model4");
-    BOOST_CHECK_EQUAL(model4.get_model_family().to_string(), "rdk:builtin");
-    BOOST_CHECK_EQUAL(model4.get_model_name(), "model4");
+    BOOST_CHECK_EQUAL(model4.model_family().to_string(), "rdk:builtin");
+    BOOST_CHECK_EQUAL(model4.model_name(), "model4");
 
     ModelFamily empty("", "");
     Model model5(empty, "model5");
     BOOST_CHECK_EQUAL(model5.to_string(), "model5");
-    BOOST_CHECK_EQUAL(model5.get_model_family().to_string(), "");
-    BOOST_CHECK_EQUAL(model5.get_model_name(), "model5");
+    BOOST_CHECK_EQUAL(model5.model_family().to_string(), "");
+    BOOST_CHECK_EQUAL(model5.model_name(), "model5");
 
     BOOST_CHECK_THROW(Model::from_str("@"), Exception);
 }