refactoring after review 9

Author: Vladislav Kalugin

server/src/Server.cpp

@@ -578,7 +578,7 @@ Status Server::TestsGenServiceImpl::PrintModulesContent(ServerContext *context,
 
     utbot::ProjectContext projectContext{*request};
     fs::path serverBuildDir = Paths::getUtbotBuildDir(projectContext);
-    std::shared_ptr<ProjectBuildDatabase> buildDatabase = ProjectBuildDatabase::create(projectContext);
+    std::shared_ptr<ProjectBuildDatabase> buildDatabase = std::make_shared<ProjectBuildDatabase>(projectContext);
     StubSourcesFinder(buildDatabase).printAllModules();
     return Status::OK;
 }
@@ -653,7 +653,7 @@ Status Server::TestsGenServiceImpl::GetProjectTargets(ServerContext *context,
 
     try {
         utbot::ProjectContext projectContext{request->projectcontext()};
-        auto buildDatabase = ProjectBuildDatabase::create(projectContext);
+        auto buildDatabase = std::make_shared<ProjectBuildDatabase>(projectContext);
         std::vector<fs::path> targets = buildDatabase->getAllTargetPaths();
         ProjectTargetsWriter targetsWriter(response);
         targetsWriter.writeResponse(projectContext, targets);
@@ -675,7 +675,7 @@ Status Server::TestsGenServiceImpl::GetFileTargets(ServerContext *context,
 
     try {
         utbot::ProjectContext projectContext{request->projectcontext()};
-        auto buildDatabase = ProjectBuildDatabase::create(projectContext);
+        auto buildDatabase = std::make_shared<ProjectBuildDatabase>(projectContext);
         fs::path path = request->path();
         auto targetPaths = buildDatabase->getTargetPathsForSourceFile(path);
         FileTargetsWriter targetsWriter{response};

server/src/building/ProjectBuildDatabase.h

@@ -16,10 +16,10 @@ class ProjectBuildDatabase : public BuildDatabase {
     void fillTargetInfoParents();
 
 public:
-    ProjectBuildDatabase(fs::path _buildCommandsJsonPath, fs::path _serverBuildDir,
-                         utbot::ProjectContext _projectContext);
+    ProjectBuildDatabase(fs::path buildCommandsJsonPath, fs::path serverBuildDir,
+                         utbot::ProjectContext projectContext);
 
-    static std::shared_ptr<ProjectBuildDatabase> create(const utbot::ProjectContext &projectContext);
+    ProjectBuildDatabase(utbot::ProjectContext projectContext);
 };
 
 

server/src/building/ProjectBuildDatabse.cpp

@@ -43,14 +43,10 @@ ProjectBuildDatabase::ProjectBuildDatabase(fs::path _buildCommandsJsonPath,
     createClangCompileCommandsJson();
 }
 
-std::shared_ptr<ProjectBuildDatabase> ProjectBuildDatabase::create(const utbot::ProjectContext &projectContext) {
-    fs::path compileCommandsJsonPath =
-            CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(
-                    projectContext.projectPath, projectContext.buildDirRelativePath);
-    fs::path serverBuildDir = Paths::getUtbotBuildDir(projectContext);
-    std::shared_ptr<ProjectBuildDatabase> buildDatabase = std::make_shared<ProjectBuildDatabase>(
-            std::move(ProjectBuildDatabase(compileCommandsJsonPath, serverBuildDir, projectContext)));
-    return buildDatabase;
+ProjectBuildDatabase::ProjectBuildDatabase(utbot::ProjectContext projectContext) : ProjectBuildDatabase(
+        CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(projectContext.projectPath,
+                                                                        projectContext.buildDirRelativePath),
+        Paths::getUtbotBuildDir(projectContext), std::move(projectContext)) {
 }
 
 

server/src/building/TargetBuildDatabase.cpp

@@ -4,11 +4,23 @@
 #include "utils/GrpcUtils.h"
 #include "utils/GenerationUtils.h"
 
-TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase,
-                                         const fs::path &_target) :
-        BuildDatabase(baseBuildDatabase),
-        target(_target),
-        isAutoTarget(_target == GrpcUtils::UTBOT_AUTO_TARGET_PATH) {
+TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath) :
+        BuildDatabase(baseBuildDatabase) {
+    if (Paths::isSourceFile(targetOrSourcePath)) {
+        target = baseBuildDatabase->getRootForSource(targetOrSourcePath);
+    } else if (targetOrSourcePath == GrpcUtils::UTBOT_AUTO_TARGET_PATH || targetOrSourcePath.empty()) {
+        target = baseBuildDatabase->getRootForFirstSource();
+    } else {
+        auto new_target = GenerationUtils::findTarget(baseBuildDatabase->getAllTargets(), targetOrSourcePath);
+        if (new_target.has_value()) {
+            target = new_target.value();
+        } else {
+            throw CompilationDatabaseException("Can't find target: " + targetOrSourcePath);
+        }
+    }
+
+    isAutoTarget = target == GrpcUtils::UTBOT_AUTO_TARGET_PATH;
+
     {
         auto objectFilesList = baseBuildDatabase->getArchiveObjectFiles(target);
         for (const auto &objectFilePath: objectFilesList) {
@@ -33,24 +45,6 @@ TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase,
     createClangCompileCommandsJson();
 }
 
-std::shared_ptr<TargetBuildDatabase> TargetBuildDatabase::createForSourceOrTarget(BuildDatabase *baseBuildDatabase,
-                                                                                  const std::string &_targetOrSourcePath) {
-    fs::path _target;
-    if (Paths::isSourceFile(_targetOrSourcePath)) {
-        _target = baseBuildDatabase->getRootForSource(_targetOrSourcePath);
-    } else if (_targetOrSourcePath == GrpcUtils::UTBOT_AUTO_TARGET_PATH || _targetOrSourcePath.empty()) {
-        _target = baseBuildDatabase->getRootForFirstSource();
-    } else {
-        auto new_target = GenerationUtils::findTarget(baseBuildDatabase->getAllTargets(), _targetOrSourcePath);
-        if (new_target.has_value()) {
-            _target = new_target.value();
-        } else {
-            throw CompilationDatabaseException("Can't find target: " + _targetOrSourcePath);
-        }
-    }
-    return std::make_shared<TargetBuildDatabase>(std::move(TargetBuildDatabase(baseBuildDatabase, _target)));
-}
-
 std::vector<std::shared_ptr<BuildDatabase::TargetInfo>> TargetBuildDatabase::getRootTargets() const {
     if (!hasAutoTarget()) {
         return {targetInfos.at(target)};

server/src/building/TargetBuildDatabase.h

@@ -6,13 +6,11 @@
 
 class TargetBuildDatabase : public BuildDatabase {
 private:
-    TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const fs::path &_target);
-
     fs::path target;
     bool isAutoTarget;
+
 public:
-    static std::shared_ptr<TargetBuildDatabase> createForSourceOrTarget(BuildDatabase *baseBuildDatabase,
-                                                                        const std::string &_targetOrSourcePath);
+    TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath);
 
     bool hasAutoTarget() const;
 

server/src/coverage/GcovCoverageTool.cpp

@@ -13,12 +13,12 @@
 #include "utils/MakefileUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/path/FileSystemPath.h"
+#include "printers/DefaultMakefilePrinter.h"
 
 #include "loguru.h"
 #include "json.hpp"
 
 #include <utility>
-#include "printers/DefaultMakefilePrinter.h"
 
 using Coverage::CoverageMap;
 using Coverage::FileCoverage;

server/src/coverage/TestRunner.cpp

@@ -1,5 +1,6 @@
-#include "printers/DefaultMakefilePrinter.h"
 #include "TestRunner.h"
+
+#include "printers/DefaultMakefilePrinter.h"
 #include "GTestLogger.h"
 #include "Paths.h"
 #include "TimeExecStatistics.h"

server/src/printers/NativeMakefilePrinter.cpp

@@ -116,7 +116,7 @@ namespace printer {
     }
 
     NativeMakefilePrinter::NativeMakefilePrinter(
-        const BaseTestGen* testGen,
+        const BaseTestGen *testGen,
         fs::path const &rootPath,
         fs::path primaryCompiler,
         CollectionUtils::FileSet const *stubSources,

server/src/printers/NativeMakefilePrinter.h

@@ -15,7 +15,7 @@ namespace printer {
     class NativeMakefilePrinter : public RelativeMakefilePrinter {
         friend class TestMakefilesPrinter;
     private:
-        const BaseTestGen* testGen;
+        const BaseTestGen *testGen;
         fs::path rootPath;
 
         fs::path primaryCompiler;
@@ -66,7 +66,7 @@ namespace printer {
                                              bool transformExeToLib);
 
     public:
-        NativeMakefilePrinter(const BaseTestGen* testGen,
+        NativeMakefilePrinter(const BaseTestGen *testGen,
                               fs::path const &rootPath,
                               fs::path primaryCompiler,
                               CollectionUtils::FileSet const *stubSources,

server/src/printers/RelativeMakefilePrinter.h

@@ -1,5 +1,6 @@
 #ifndef UNITTESTBOT_RELATIVEMAKEFILEPRINTER_H
 #define UNITTESTBOT_RELATIVEMAKEFILEPRINTER_H
+
 #include "printers/DefaultMakefilePrinter.h"
 
 namespace printer {

server/src/testgens/BaseTestGen.cpp

@@ -48,8 +48,7 @@ void BaseTestGen::setInitializedTestsMap() {
 
 void BaseTestGen::setTargetPath(fs::path _targetPath) {
     if (targetBuildDatabase->hasAutoTarget() && targetBuildDatabase->getTargetPath() != _targetPath) {
-        targetBuildDatabase = std::move(
-                TargetBuildDatabase::createForSourceOrTarget(projectBuildDatabase.get(), _targetPath));
+        targetBuildDatabase = std::make_shared<TargetBuildDatabase>(projectBuildDatabase.get(), _targetPath);
         updateTargetSources(_targetPath);
     }
 }

server/src/testgens/ProjectTestGen.cpp

@@ -17,7 +17,7 @@ ProjectTestGen::ProjectTestGen(const testsgen::ProjectRequest &request,
     compileCommandsJsonPath = CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(
             projectContext.projectPath, projectContext.buildDirRelativePath);
     projectBuildDatabase = std::make_shared<ProjectBuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext);
-    targetBuildDatabase = TargetBuildDatabase::createForSourceOrTarget(projectBuildDatabase.get(), request.targetpath());
+    targetBuildDatabase = std::make_shared<TargetBuildDatabase>(projectBuildDatabase.get(), request.targetpath());
     if (autoDetect) {
         autoDetectSourcePathsIfNotEmpty();
     } else {

server/src/testgens/SnippetTestGen.cpp

@@ -19,7 +19,7 @@ SnippetTestGen::SnippetTestGen(const testsgen::SnippetRequest &request,
     compileCommandsJsonPath = serverBuildDir;
     utbot::ProjectContext projectContext{request, serverBuildDir};
     projectBuildDatabase = std::make_shared<ProjectBuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext);
-    targetBuildDatabase = TargetBuildDatabase::createForSourceOrTarget(projectBuildDatabase.get(), serverBuildDir / SNIPPET_TARGET);
+    targetBuildDatabase = std::make_shared<TargetBuildDatabase>(projectBuildDatabase.get(), serverBuildDir / SNIPPET_TARGET);
     setTargetForSource(filePath);
     setInitializedTestsMap();
 }