Refactoring to address SonarCloud code smells

Author: mccaffers

sonar-project.properties

@@ -4,5 +4,5 @@ sonar.python.version=3.8
 sonar.language=c
 sonar.c.file.suffixes=.c,.h
 sonar.cpp.file.suffixes=.cc,.cpp,.cxx,.c++,.hh,.hpp,.hxx,.h++,.ipp
-sonar.coverage.exclusions=tests/**
+sonar.coverage.exclusions=tests/**, source/utilities/base64.cpp
 sonar.sources=source/

source/databaseConnection.cpp

@@ -10,13 +10,8 @@
 DatabaseConnection::DatabaseConnection(const std::string& endpoint, int port,
                                      const std::string& dbname, const std::string& user,
                                      const std::string& password) {
-    connection_string =
-        "host=" + endpoint + " "
-        "port=" + std::to_string(port) + " "
-        "dbname=" + dbname + " "
-        "user=" + user + " "
-        "password=" + password + " "
-        "connect_timeout=3";
+  connection_string = std::format("host={} port={} dbname={} user={} password={} connect_timeout=3",
+      endpoint, port, dbname, user, password);
 }
 
 void DatabaseConnection::executeQuery(const std::string& query) const {
@@ -49,13 +44,11 @@ void DatabaseConnection::executeQuery(const std::string& query) const {
       txn.commit();
 
   } catch (const pqxx::broken_connection& e) {
-        std::cerr << "Connection error: " << e.what() << std::endl;
-    } catch (const pqxx::sql_error& e) {
-        std::cerr << "SQL error: " << e.what() << std::endl;
-        std::cerr << "Query was: " << e.query() << std::endl;
-    } catch (const pqxx::usage_error& e) {
-        std::cerr << "Usage error: " << e.what() << std::endl;
-    } catch (const std::exception& e) {
-        std::cerr << "General error: " << e.what() << std::endl;
-    }
+      std::cerr << "Connection error: " << e.what() << std::endl;
+  } catch (const pqxx::sql_error& e) {
+      std::cerr << "SQL error: " << e.what() << std::endl;
+      std::cerr << "Query was: " << e.query() << std::endl;
+  } catch (const pqxx::usage_error& e) {
+      std::cerr << "Usage error: " << e.what() << std::endl;
+  }
 }

source/include/configManager.hpp

@@ -14,12 +14,14 @@ class ConfigManager {
     ConfigManager& operator=(const ConfigManager&) = delete;
 
 public:
-    static std::shared_ptr<ConfigManager> getInstance() {
-        static std::shared_ptr<ConfigManager> instance = std::shared_ptr<ConfigManager>(new ConfigManager());
-        return instance;
-    }
+
+  static std::shared_ptr<ConfigManager> getInstance() {
+     static auto instance = std::shared_ptr<ConfigManager>(new ConfigManager());
+     return instance;
+  }
 
-    std::string getConfig() const {
-        return "config data"; // Replace with actual implementation
-    }
+  std::string getConfig() const {
+      return "config data"; // Replace with actual implementation
+  }
+  
 };

source/include/databaseConnection.hpp

@@ -20,7 +20,7 @@ class DatabaseConnection {
 
   void executeQuery(const std::string& query) const;
 
-  const std::string& getConnectionString(){
+  const std::string& getConnectionString() const {
     return connection_string;
   }
 

source/include/serviceA.hpp

@@ -13,10 +13,11 @@ class ServiceA {
     std::shared_ptr<ConfigManager> configManager;
 
 public:
-    ServiceA(std::shared_ptr<ConfigManager> cm = ConfigManager::getInstance())
+  explicit ServiceA(std::shared_ptr<ConfigManager> cm = ConfigManager::getInstance())
         : configManager(cm) {}
 
-    void doSomething() {
+    void doSomething() const {
         std::cout << "ServiceA using config: " << configManager->getConfig() << std::endl;
     }
 };
+

source/main.cpp

@@ -49,13 +49,6 @@ int parseJson(const std::string& input) {
 int main(int argc, const char * argv[]) {
 
   // Connect to QuestDb argv[1]
-
-  // DatabaseConnection Constructor
-  // const std::string& endpoint
-  // int port
-  // const std::string& dbname
-  // const std::string& user
-  // const std::string& password
   DatabaseConnection db(argv[1], 8812, "qdb", "admin", "quest");
 
   // Load strategy from Base64 argv[2]