refactoring after review 7

Author: Vladislav Kalugin

server/src/building/BuildDatabase.cpp

@@ -534,7 +534,6 @@ fs::path BuildDatabase::newDirForFile(const fs::path &file) const {
 }
 
 CollectionUtils::FileSet BuildDatabase::getSourceFilesForTarget(const fs::path &_target) {
-    LOG_IF_S(WARNING, !hasAutoTarget() && getTargetPath() != _target.c_str()) << "Try get sources for different target";
     return CollectionUtils::transformTo<CollectionUtils::FileSet>(
             getArchiveObjectFiles(_target),
             [this](fs::path const &objectPath) {

server/src/building/BuildDatabase.h

@@ -212,11 +212,11 @@ class BuildDatabase {
      */
     std::vector<std::shared_ptr<ObjectFileInfo>> getAllCompileCommands() const;
 
-    std::vector<std::shared_ptr<TargetInfo>> getRootTargets() const;
+    virtual std::vector<std::shared_ptr<TargetInfo>> getRootTargets() const;
 
-    std::vector<std::shared_ptr<TargetInfo>> getAllTargets() const;
+    virtual std::vector<std::shared_ptr<TargetInfo>> getAllTargets() const;
 
-    std::vector<fs::path> getAllTargetPaths() const;
+    virtual std::vector<fs::path> getAllTargetPaths() const;
 
     virtual std::vector<fs::path> getTargetPathsForSourceFile(const fs::path &sourceFilePath) const;
 
@@ -228,10 +228,6 @@ class BuildDatabase {
 
     std::shared_ptr<TargetInfo> getTargetInfo(const fs::path &_target);
 
-    virtual bool hasAutoTarget() const = 0;
-
-    virtual fs::path getTargetPath() const = 0;
-
     std::shared_ptr<CompilationDatabase> compilationDatabase;
 
 protected:

server/src/building/ProjectBuildDatabase.h

@@ -20,10 +20,6 @@ class ProjectBuildDatabase : public BuildDatabase {
                          utbot::ProjectContext _projectContext);
 
     static std::shared_ptr<ProjectBuildDatabase> create(const utbot::ProjectContext &projectContext);
-
-    bool hasAutoTarget() const override;
-
-    fs::path getTargetPath() const override;
 };
 
 

server/src/building/ProjectBuildDatabse.cpp

@@ -233,12 +233,3 @@ void ProjectBuildDatabase::fillTargetInfoParents() {
         targetInfos[library]->parentLinkUnits = std::move(parents);
     }
 }
-
-
-bool ProjectBuildDatabase::hasAutoTarget() const {
-    return true;
-}
-
-fs::path ProjectBuildDatabase::getTargetPath() const {
-    throw CompilationDatabaseException("Incorrect method for project build database");
-}

server/src/building/TargetBuildDatabase.cpp

@@ -51,6 +51,13 @@ std::shared_ptr<TargetBuildDatabase> TargetBuildDatabase::createForSourceOrTarge
     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)};
+    }
+    return BuildDatabase::getRootTargets();
+}
+
 std::vector<fs::path> TargetBuildDatabase::getTargetPathsForSourceFile(const fs::path &sourceFilePath) const {
     if (!hasAutoTarget()) {
         return {target};

server/src/building/TargetBuildDatabase.h

@@ -14,9 +14,11 @@ class TargetBuildDatabase : public BuildDatabase {
     static std::shared_ptr<TargetBuildDatabase> createForSourceOrTarget(BuildDatabase *baseBuildDatabase,
                                                                         const std::string &_targetOrSourcePath);
 
-    bool hasAutoTarget() const override;
+    bool hasAutoTarget() const;
 
-    fs::path getTargetPath() const override;
+    fs::path getTargetPath() const;
+
+    std::vector<std::shared_ptr<TargetInfo>> getRootTargets() const override;
 
     std::vector<fs::path> getTargetPathsForSourceFile(const fs::path &sourceFilePath) const override;