Decouple Azure Devops from git-plugin and prepare for other Git providers

git-plugin/src/main/kotlin/io/rabobank/ret/git/plugin/command/AutoCompleteCommand.kt

@@ -2,12 +2,11 @@ package io.rabobank.ret.git.plugin.command
 
 import io.rabobank.ret.IntelliSearch
 import io.rabobank.ret.RetContext
-import io.rabobank.ret.git.plugin.azure.AzureDevopsClient
-import io.rabobank.ret.git.plugin.azure.Pipeline
-import io.rabobank.ret.git.plugin.azure.PipelineRun
-import io.rabobank.ret.git.plugin.azure.PullRequest
-import io.rabobank.ret.git.plugin.config.PluginConfig
+import io.rabobank.ret.git.plugin.provider.Pipeline
+import io.rabobank.ret.git.plugin.provider.PipelineRun
+import io.rabobank.ret.git.plugin.provider.PullRequest
 import io.rabobank.ret.git.plugin.output.OutputHandler
+import io.rabobank.ret.git.plugin.provider.GitProvider
 import io.rabobank.ret.picocli.mixin.ContextAwareness
 import io.rabobank.ret.util.RegexUtils.DIGITS_PATTERN
 import picocli.CommandLine.Command
@@ -17,8 +16,7 @@ import picocli.CommandLine.ScopeType
 
 @Command(name = "autocomplete", hidden = true)
 class AutoCompleteCommand(
-    private val azureDevopsClient: AzureDevopsClient,
-    private val pluginConfig: PluginConfig,
+    private val gitProvider: GitProvider,
     private val intelliSearch: IntelliSearch,
     private val outputHandler: OutputHandler,
     private val retContext: RetContext,
@@ -32,11 +30,11 @@ class AutoCompleteCommand(
 
     @Command(name = "git-pipeline")
     fun printPipelines(@Option(names = ["--word", "-w"]) word: String?) {
-        val pipelines = azureDevopsClient.getAllPipelines()
+        val pipelines = gitProvider.getAllPipelines()
 
         outputHandler.listPipelines(
-            pipelines.value.filter { it.matches(word) }
-                .sortedWith(compareBy({ it.folder }, { it.name })),
+            pipelines.filter { it.matches(word) }
+                .sortedWith(compareBy({ it.container }, { it.name })),
         )
     }
 
@@ -55,21 +53,21 @@ class AutoCompleteCommand(
             getPipelineByUniqueName(pipelineIdFlag).id.toString()
         }
 
-        val pipelineRuns = azureDevopsClient.getPipelineRuns(pipelineId)
+        val pipelineRuns = gitProvider.getPipelineRuns(pipelineId)
 
         outputHandler.listPipelineRuns(
-            pipelineRuns.value.filter { it.matches(word) }
+            pipelineRuns.filter { it.matches(word) }
                 .sortedByDescending { it.createdDate }
                 .take(TOP_20_PIPELINES),
         )
     }
 
     @Command(name = "git-repository")
     fun printRepositories(@Option(names = ["--word", "-w"]) word: String?) {
-        val repositories = azureDevopsClient.getAllRepositories()
+        val repositories = gitProvider.getAllRepositories()
 
         outputHandler.listRepositories(
-            repositories.value.filter {
+            repositories.filter {
                 word == null || intelliSearch.matches(word, it.name)
             },
         )
@@ -85,7 +83,7 @@ class AutoCompleteCommand(
 
         repository?.let { repo ->
             outputHandler.listBranches(
-                azureDevopsClient.getAllRefs(repo, "heads/").value
+                gitProvider.getAllRefs(repo, "heads/")
                     .filter { word == null || intelliSearch.matches(word, it.shortName) },
             )
         } ?: outputHandler.error("No repository could be determined")
@@ -106,14 +104,14 @@ class AutoCompleteCommand(
         )
         filterRepository: String? = null,
     ) {
-        val prs = azureDevopsClient.getAllPullRequests().value
-            .filter { !notReviewed || !it.reviewers.any { r -> r.uniqueName.equals(pluginConfig.email, true) } }
+        val prs = if (!notReviewed) gitProvider.getAllPullRequests() else gitProvider.getPullRequestsNotReviewedByUser()
+        val filteredPrs = prs
             .filter { it.isFromRepository(filterRepository) }
-        val filteredPrs = prs.filter {
-            word == null ||
-                intelliSearch.matches(word, it.title) ||
-                intelliSearch.matches(word, it.repository.name)
-        }
+            .filter {
+                word == null ||
+                        intelliSearch.matches(word, it.title) ||
+                        intelliSearch.matches(word, it.repository.name)
+            }
         outputHandler.listPRs(filteredPrs)
     }
 
@@ -127,15 +125,15 @@ class AutoCompleteCommand(
     private fun Pipeline.matches(value: String?): Boolean =
         value == null ||
             intelliSearch.matches(value, name) ||
-            intelliSearch.matches(value, cleanedFolder) ||
+            intelliSearch.matches(value, container) ||
             intelliSearch.matches(value, uniqueName)
 
     private fun PipelineRun.matches(word: String?): Boolean =
         word == null || intelliSearch.matches(word, id.toString()) || intelliSearch.matches(word, name) ||
             intelliSearch.matches(word, state.toString()) || intelliSearch.matches(word, result.toString())
 
     private fun getPipelineByUniqueName(pipelineIdFlag: String) =
-        requireNotNull(azureDevopsClient.getAllPipelines().value.firstOrNull { it.uniqueName == pipelineIdFlag }) {
+        requireNotNull(gitProvider.getAllPipelines().firstOrNull { it.uniqueName == pipelineIdFlag }) {
             "Could not find pipeline id by <folder>\\<pipeline-name> combination: '$pipelineIdFlag'"
         }
 }

git-plugin/src/main/kotlin/io/rabobank/ret/git/plugin/command/PipelineCommand.kt

@@ -1,7 +1,6 @@
 package io.rabobank.ret.git.plugin.command
 
-import io.rabobank.ret.git.plugin.azure.AzureDevopsClient
-import io.rabobank.ret.git.plugin.azure.AzureDevopsUrlFactory
+import io.rabobank.ret.git.plugin.provider.GitProvider
 import io.rabobank.ret.util.BrowserUtils
 import io.rabobank.ret.util.RegexUtils.DIGITS_PATTERN
 import picocli.CommandLine.Command
@@ -12,9 +11,8 @@ import picocli.CommandLine.Parameters
     description = ["Open a recent pipeline run"],
 )
 class PipelineCommand(
-    private val azureDevopsUrlFactory: AzureDevopsUrlFactory,
     private val browserUtils: BrowserUtils,
-    private val azureDevopsClient: AzureDevopsClient,
+    private val gitProvider: GitProvider,
 ) {
 
     @Command(name = "open", description = ["Open the pipeline dashboard, or a specific pipeline or run"])
@@ -32,21 +30,21 @@ class PipelineCommand(
             completionCandidates = PipelineRunCompletionCandidates::class,
         ) pipelineRunId: String?,
     ) {
-        val url = if (pipelineId == null) azureDevopsUrlFactory.createPipelineDashboardUrl()
+        val url = if (pipelineId == null) gitProvider.urlFactory.pipelineDashboard()
         else if (pipelineRunId == null) {
             val resolvedPipelineId = if (pipelineId.matches(DIGITS_PATTERN)) {
                 pipelineId
             } else {
                 getPipelineByUniqueName(pipelineId).id.toString()
             }
-            azureDevopsUrlFactory.createPipelineUrl(resolvedPipelineId)
-        } else azureDevopsUrlFactory.createPipelineRunUrl(pipelineRunId)
+            gitProvider.urlFactory.pipeline(resolvedPipelineId)
+        } else gitProvider.urlFactory.pipelineRun(pipelineRunId)
 
         browserUtils.openUrl(url)
     }
 
     private fun getPipelineByUniqueName(pipelineId: String?) =
-        requireNotNull(azureDevopsClient.getAllPipelines().value.firstOrNull { it.uniqueName == pipelineId }) {
+        requireNotNull(gitProvider.getAllPipelines().firstOrNull { it.uniqueName == pipelineId }) {
             "Could not find pipeline id by <folder>\\<pipeline-name> combination: '$pipelineId'"
         }
 }

git-plugin/src/main/kotlin/io/rabobank/ret/git/plugin/command/PullRequestCreateCommand.kt

@@ -1,10 +1,8 @@
 package io.rabobank.ret.git.plugin.command
 
 import io.rabobank.ret.RetContext
-import io.rabobank.ret.git.plugin.azure.AzureDevopsClient
-import io.rabobank.ret.git.plugin.azure.AzureDevopsUrlFactory
-import io.rabobank.ret.git.plugin.azure.CreatePullRequest
 import io.rabobank.ret.git.plugin.output.OutputHandler
+import io.rabobank.ret.git.plugin.provider.GitProvider
 import io.rabobank.ret.picocli.mixin.ContextAwareness
 import io.rabobank.ret.util.BrowserUtils
 import org.jboss.resteasy.reactive.ClientWebApplicationException
@@ -20,8 +18,7 @@ import picocli.CommandLine.ScopeType
     description = ["Create a pull request"],
 )
 class PullRequestCreateCommand(
-    private val azureDevopsClient: AzureDevopsClient,
-    private val azureDevopsUrlFactory: AzureDevopsUrlFactory,
+    private val gitProvider: GitProvider,
     private val browserUtils: BrowserUtils,
     private val outputHandler: OutputHandler,
     private val retContext: RetContext,
@@ -64,32 +61,26 @@ class PullRequestCreateCommand(
         if (!noPrompt) {
             val branch = if (autofillBranchRequired(filterRepository, providedBranch, contextBranch)) sourceBranch else null
 
-            val prCreateURL = azureDevopsUrlFactory.createPullRequestCreateUrl(repositoryName, branch)
+            val prCreateURL = gitProvider.urlFactory.pullRequestCreate(repositoryName, branch)
             browserUtils.openUrl(prCreateURL)
         } else {
             requireNotNull(sourceBranch) { "Could not determine branch from context. Please provide the branch." }
-            val repository = azureDevopsClient.getRepositoryById(repositoryName)
+            val repository = gitProvider.getRepositoryById(repositoryName)
             val defaultBranch = requireNotNull(repository.defaultBranch) { "No default branch available." }
 
             require(defaultBranch != sourceBranch) {
                 "Could not create PR. Source branch is the same as the default branch."
             }
 
-            val createPullRequest = CreatePullRequest(
-                "refs/heads/$sourceBranch",
-                defaultBranch,
-                "Merge $sourceBranch into ${repository.defaultBranch}",
-                "PR created by RET using `ret pr create --no-prompt`.",
-            )
-
             try {
-                val createPullRequestResponse = azureDevopsClient.createPullRequest(
+                val createPullRequestResponse = gitProvider.createPullRequest(
                     repositoryName,
-                    "6.0",
-                    createPullRequest,
+                    "refs/heads/$sourceBranch",
+                    defaultBranch,
+                    "Merge $sourceBranch into ${repository.defaultBranch}",
+                    "PR created by RET using `ret pr create --no-prompt`.",
                 )
-                val pullRequestUrl =
-                    azureDevopsUrlFactory.pullRequestUrl(repositoryName, createPullRequestResponse.pullRequestId)
+                val pullRequestUrl = gitProvider.urlFactory.pullRequest(repositoryName, createPullRequestResponse.pullRequestId).toString()
                 outputHandler.println(pullRequestUrl)
             } catch (e: ClientWebApplicationException) {
                 val message = if (e.response.status == CONFLICT) "A pull request for this branch already exists!"

git-plugin/src/main/kotlin/io/rabobank/ret/git/plugin/command/PullRequestOpenCommand.kt

@@ -1,9 +1,8 @@
 package io.rabobank.ret.git.plugin.command
 
 import io.quarkus.logging.Log
-import io.rabobank.ret.git.plugin.azure.AzureDevopsClient
-import io.rabobank.ret.git.plugin.azure.AzureDevopsUrlFactory
 import io.rabobank.ret.git.plugin.output.OutputHandler
+import io.rabobank.ret.git.plugin.provider.GitProvider
 import io.rabobank.ret.picocli.mixin.ContextAwareness
 import io.rabobank.ret.util.BrowserUtils
 import org.jboss.resteasy.reactive.ClientWebApplicationException
@@ -19,8 +18,7 @@ import picocli.CommandLine.ScopeType
     description = ["Navigate to a pull request in Git"],
 )
 class PullRequestOpenCommand(
-    private val azureDevopsClient: AzureDevopsClient,
-    private val azureDevopsUrlFactory: AzureDevopsUrlFactory,
+    private val gitProvider: GitProvider,
     private val browserUtils: BrowserUtils,
     private val outputHandler: OutputHandler,
 ) : Runnable {
@@ -46,8 +44,8 @@ class PullRequestOpenCommand(
 
     override fun run() {
         try {
-            val pullRequest = azureDevopsClient.getPullRequestById(pullRequestId)
-            val prURL = azureDevopsUrlFactory.createPullRequestUrl(pullRequest.repository.name, pullRequest.id)
+            val pullRequest = gitProvider.getPullRequestById(pullRequestId)
+            val prURL = gitProvider.urlFactory.pullRequest(pullRequest.repository.name, pullRequest.id)
 
             browserUtils.openUrl(prURL)
         } catch (e: ClientWebApplicationException) {

git-plugin/src/main/kotlin/io/rabobank/ret/git/plugin/command/RepositoryCommand.kt

@@ -1,8 +1,7 @@
 package io.rabobank.ret.git.plugin.command
 
 import io.rabobank.ret.RetContext
-import io.rabobank.ret.git.plugin.azure.AzureDevopsClient
-import io.rabobank.ret.git.plugin.azure.AzureDevopsUrlFactory
+import io.rabobank.ret.git.plugin.provider.GitProvider
 import io.rabobank.ret.picocli.mixin.ContextAwareness
 import io.rabobank.ret.util.BrowserUtils
 import picocli.CommandLine.Command
@@ -14,8 +13,7 @@ import picocli.CommandLine.Parameters
     description = ["List all repositories"],
 )
 class RepositoryCommand(
-    private val azureDevopsClient: AzureDevopsClient,
-    private val azureDevopsUrlFactory: AzureDevopsUrlFactory,
+    private val gitProvider: GitProvider,
     private val browserUtils: BrowserUtils,
     private val retContext: RetContext,
 ) {
@@ -26,7 +24,7 @@ class RepositoryCommand(
     fun openRepositoryInBrowser(
         @Parameters(
             arity = "0..1",
-            description = ["Repository name to open in Azure DevOps"],
+            description = ["Repository name to open in the browser"],
             paramLabel = "<repository>",
             completionCandidates = RepositoryCompletionCandidates::class,
         ) repositoryName: String?,
@@ -35,11 +33,12 @@ class RepositoryCommand(
             "No repository provided and ret cannot get repository from context."
         }
 
-        val repositories = azureDevopsClient.getAllRepositories().value
+        val repositories = gitProvider.getAllRepositories()
 
         require(repositories.any { it.name == repository }) { "No repository found with name $repository." }
 
-        browserUtils.openUrl(azureDevopsUrlFactory.createRepositoryUrl(repository))
+        val url = gitProvider.urlFactory.repository(repository)
+        browserUtils.openUrl(url)
     }
 }