Change requests done.

Ericsson · Jul 1, 2024 · bd74b5a · bd74b5a
1 parent e835a22
commit bd74b5a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/plugins/cpp_metrics/service/cxxmetrics.thrift b/plugins/cpp_metrics/service/cxxmetrics.thrift
@@ -38,7 +38,7 @@ struct CppMetricsAstNodeSingle
   3:double value
 }
 
-struct CppMetricsAstNodeAllData
+struct CppMetricsAstNodeDetailed
 {
   1:string path,
   2:string file,
@@ -80,13 +80,6 @@ service CppMetricsService
   list<CppMetricsAstNodeSingle> getCppMetricsForAstNode(
     1:common.AstNodeId astNodeId)
 
-  /**
-   * This function returns all available C++ metrics
-   * for a particular AST node.
-   */
-  //list<CppMetricsAstNodeSingle> getCppMetricsAndDataForAstNode(
-    //1:common.AstNodeId astNodeId)
-
   /**
    * This function returns all available C++ metrics
    * for a particular module (file or directory).
@@ -109,7 +102,7 @@ service CppMetricsService
    *
    * The given path is a handled as a prefix.
    */
-  map<common.AstNodeId, CppMetricsAstNodeAllData> getCppAstNodeMetricsAndDataForPath(
+  map<common.AstNodeId, CppMetricsAstNodeDetailed> getCppAstNodeMetricsDetailedForPath(
     1:string path)
 
   /**

diff --git a/plugins/cpp_metrics/service/include/service/cppmetricsservice.h b/plugins/cpp_metrics/service/include/service/cppmetricsservice.h
@@ -53,8 +53,8 @@ class CppMetricsServiceHandler : virtual public CppMetricsServiceIf
     std::map<core::AstNodeId, std::vector<CppMetricsAstNodeSingle>>& _return,
     const std::string& path_) override;
 
-  void getCppAstNodeMetricsAndDataForPath(
-    std::map<core::AstNodeId, CppMetricsAstNodeAllData>& _return,
+  void getCppAstNodeMetricsDetailedForPath(
+    std::map<core::AstNodeId, CppMetricsAstNodeDetailed>& _return,
     const std::string& path_) override;
 
   void getCppFileMetricsForPath(

diff --git a/plugins/cpp_metrics/service/src/cppmetricsservice.cpp b/plugins/cpp_metrics/service/src/cppmetricsservice.cpp
@@ -163,8 +163,8 @@ void CppMetricsServiceHandler::getCppAstNodeMetricsForPath(
   });
 }
 
-void CppMetricsServiceHandler::getCppAstNodeMetricsAndDataForPath(
-  std::map<core::AstNodeId, CppMetricsAstNodeAllData>& _return,
+void CppMetricsServiceHandler::getCppAstNodeMetricsDetailedForPath(
+  std::map<core::AstNodeId, CppMetricsAstNodeDetailed>& _return,
   const std::string& path_)
 {
   _transaction([&, this](){
@@ -185,7 +185,7 @@ void CppMetricsServiceHandler::getCppAstNodeMetricsAndDataForPath(
       }
       else
       {
-        CppMetricsAstNodeAllData metric;
+        CppMetricsAstNodeDetailed metric;
         std::size_t pos = node.path.find_last_of('/');
         metric.path = node.path.substr(0, pos + 1);
         metric.file = node.path.substr(pos + 1);