refactor(vcs)!: Make all WorkingTree implementations internal

These partly take constructor arguments that are specific to the implementation (like `SVNClientManager`), so make these generally internal to not expose any implementation details. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Nov 10, 2023 · 801948f · 801948f
1 parent 1622397
commit 801948f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/downloader/src/main/kotlin/vcs/GitWorkingTree.kt b/downloader/src/main/kotlin/vcs/GitWorkingTree.kt
@@ -50,7 +50,7 @@ private fun findGitOrSubmoduleDir(workingDirOrFile: File): Repository {
     }.getOrThrow()
 }
 
-open class GitWorkingTree(
+internal open class GitWorkingTree(
     workingDir: File,
     vcsType: VcsType,
     private val repositoryUrlPrefixReplacements: Map<String, String> = emptyMap()

diff --git a/downloader/src/main/kotlin/vcs/Mercurial.kt b/downloader/src/main/kotlin/vcs/Mercurial.kt
@@ -55,7 +55,7 @@ class Mercurial : VersionControlSystem(MercurialCommand) {
 
     override fun getDefaultBranchName(url: String) = "default"
 
-    override fun getWorkingTree(vcsDirectory: File) = MercurialWorkingTree(vcsDirectory, type)
+    override fun getWorkingTree(vcsDirectory: File): WorkingTree = MercurialWorkingTree(vcsDirectory, type)
 
     override fun isApplicableUrlInternal(vcsUrl: String) = ProcessCapture("hg", "identify", vcsUrl).isSuccess
 

diff --git a/downloader/src/main/kotlin/vcs/MercurialWorkingTree.kt b/downloader/src/main/kotlin/vcs/MercurialWorkingTree.kt
@@ -25,7 +25,7 @@ import org.ossreviewtoolkit.downloader.WorkingTree
 import org.ossreviewtoolkit.model.VcsType
 import org.ossreviewtoolkit.utils.common.ProcessCapture
 
-class MercurialWorkingTree(workingDir: File, vcsType: VcsType) : WorkingTree(workingDir, vcsType) {
+internal class MercurialWorkingTree(workingDir: File, vcsType: VcsType) : WorkingTree(workingDir, vcsType) {
     override fun isValid(): Boolean {
         if (!workingDir.isDirectory) return false
 

diff --git a/downloader/src/main/kotlin/vcs/Subversion.kt b/downloader/src/main/kotlin/vcs/Subversion.kt
@@ -66,7 +66,8 @@ class Subversion : VersionControlSystem() {
 
     override fun getDefaultBranchName(url: String) = "trunk"
 
-    override fun getWorkingTree(vcsDirectory: File) = SubversionWorkingTree(vcsDirectory, type, clientManager)
+    override fun getWorkingTree(vcsDirectory: File): WorkingTree =
+        SubversionWorkingTree(vcsDirectory, type, clientManager)
 
     override fun isApplicableUrlInternal(vcsUrl: String) =
         try {

diff --git a/downloader/src/main/kotlin/vcs/SubversionWorkingTree.kt b/downloader/src/main/kotlin/vcs/SubversionWorkingTree.kt
@@ -32,7 +32,7 @@ import org.tmatesoft.svn.core.SVNURL
 import org.tmatesoft.svn.core.wc.SVNClientManager
 import org.tmatesoft.svn.core.wc.SVNRevision
 
-class SubversionWorkingTree(
+internal class SubversionWorkingTree(
     workingDir: File,
     vcsType: VcsType,
     private val clientManager: SVNClientManager