Fix Bitbucket cloud host (#342)

* Fix Bitbucket cloud host * Update change log
ben-gibson · Sep 3, 2024 · 2cc706a · 2cc706a
1 parent f82ccf9
commit 2cc706a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Fix warnings and deprecations
 - Support dynamic reloading
+- Fix error using BitBucket cloud host
 
 ## 4.5.0 - 2024-09-02
 

diff --git a/...k/url/factory/BitbucketCloudUrlFactory.kt → .../url/factory/BitbucketServerUrlFactory.kt b/...k/url/factory/BitbucketCloudUrlFactory.kt → .../url/factory/BitbucketServerUrlFactory.kt
@@ -1,11 +1,13 @@
 package uk.co.ben_gibson.git.link.url.factory
 
+import com.intellij.openapi.components.Service
 import uk.co.ben_gibson.git.link.url.UrlOptions
 import uk.co.ben_gibson.git.link.url.template.UrlTemplates
 import uk.co.ben_gibson.url.Path
 import uk.co.ben_gibson.url.URL
 
-class BitbucketCloudUrlFactory : TemplatedUrlFactory(UrlTemplates.bitbucketCloud()) {
+@Service
+class BitbucketServerUrlFactory : TemplatedUrlFactory(UrlTemplates.bitbucketServer()) {
     override fun createUrl(baseUrl: URL, options: UrlOptions): URL {
         return super.createUrl(normaliseBaseUrl(baseUrl), options)
     }

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/url/factory/TemplatedUrlFactoryProvider.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/url/factory/TemplatedUrlFactoryProvider.kt
@@ -14,7 +14,7 @@ val PLATFORM_MAP = mapOf(
     Gitea::class.java to UrlTemplates.gitea(),
     Gogs::class.java to UrlTemplates.gogs(),
     Srht::class.java to UrlTemplates.srht(),
-    BitbucketServer::class.java to UrlTemplates.bitbucketServer(),
+    BitbucketCloud::class.java to UrlTemplates.bitbucketCloud(),
     Gerrit::class.java to UrlTemplates.gerrit(),
 )
 

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/url/factory/UrlFactoryLocator.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/url/factory/UrlFactoryLocator.kt
@@ -2,18 +2,15 @@ package uk.co.ben_gibson.git.link.url.factory
 
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
-import uk.co.ben_gibson.git.link.platform.Azure
-import uk.co.ben_gibson.git.link.platform.BitbucketCloud
-import uk.co.ben_gibson.git.link.platform.Chromium
-import uk.co.ben_gibson.git.link.platform.Platform
+import uk.co.ben_gibson.git.link.platform.*
 
 @Service
 class UrlFactoryLocator {
     fun locate(platform: Platform) : UrlFactory {
         return when(platform) {
             is Chromium -> service<ChromiumUrlFactory>()
             is Azure -> service<AzureUrlFactory>()
-            is BitbucketCloud -> service<BitbucketCloudUrlFactory>()
+            is BitbucketServer -> service<BitbucketServerUrlFactory>()
             else -> service<TemplatedUrlFactoryProvider>().forPlatform(platform)
         }
     }

diff --git a/src/test/kotlin/uk/co/ben_gibson/git/link/url/BitBucketCloudTest.kt b/src/test/kotlin/uk/co/ben_gibson/git/link/url/BitBucketCloudTest.kt
@@ -8,7 +8,8 @@ import uk.co.ben_gibson.git.link.git.File
 import uk.co.ben_gibson.git.link.ui.LineSelection
 import java.util.stream.Stream
 import uk.co.ben_gibson.git.link.git.Commit
-import uk.co.ben_gibson.git.link.url.factory.BitbucketCloudUrlFactory
+import uk.co.ben_gibson.git.link.url.factory.TemplatedUrlFactory
+import uk.co.ben_gibson.git.link.url.template.UrlTemplates
 import uk.co.ben_gibson.url.URL
 
 class BitBucketCloudTest {
@@ -28,15 +29,6 @@ class BitBucketCloudTest {
                 UrlOptions.UrlOptionsFileAtBranch(FILE, BRANCH, LINE_SELECTION),
                 "https://bitbucket.org/foo/bar/src/master/src/Foo.java#lines-10:20"
             ),
-            Arguments.of(
-                URL.fromString("https://dev.example.com/scm/foo/bar"),
-                UrlOptions.UrlOptionsFileAtBranch(
-                    FILE,
-                    BRANCH,
-                    LINE_SELECTION
-                ),
-                "https://dev.example.com/foo/bar/src/master/src/Foo.java#lines-10:20"
-            ),
             Arguments.of(
                 REMOTE_BASE_URL,
                 UrlOptions.UrlOptionsFileAtBranch(FILE, BRANCH),
@@ -81,7 +73,8 @@ class BitBucketCloudTest {
     @ParameterizedTest
     @MethodSource("urlExpectationsProvider")
     fun canGenerateUrl(baseUrl: URL, options: UrlOptions, expectedUrl: String) {
-        val factory = BitbucketCloudUrlFactory()
+        val factory = TemplatedUrlFactory(UrlTemplates.bitbucketCloud())
+
         val url = factory.createUrl(baseUrl, options)
 
         assertEquals(expectedUrl, url.toString())

diff --git a/src/test/kotlin/uk/co/ben_gibson/git/link/url/BitBucketServerTest.kt b/src/test/kotlin/uk/co/ben_gibson/git/link/url/BitBucketServerTest.kt
@@ -6,9 +6,8 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import uk.co.ben_gibson.git.link.git.*
 import uk.co.ben_gibson.git.link.ui.LineSelection
+import uk.co.ben_gibson.git.link.url.factory.BitbucketServerUrlFactory
 import java.util.stream.Stream
-import uk.co.ben_gibson.git.link.url.factory.TemplatedUrlFactory
-import uk.co.ben_gibson.git.link.url.template.UrlTemplates
 import uk.co.ben_gibson.url.URL
 
 class BitBucketServerTest {
@@ -23,6 +22,15 @@ class BitBucketServerTest {
 
         @JvmStatic
         fun urlExpectationsProvider(): Stream<Arguments> = Stream.of(
+            Arguments.of(
+                URL.fromString("https://stash.example.com/scm/foo/bar"),
+                UrlOptions.UrlOptionsFileAtBranch(
+                    FILE,
+                    BRANCH,
+                    LINE_SELECTION
+                ),
+                "https://stash.example.com/projects/foo/repos/bar/browse/src/Foo.java?at=refs/heads/master#10-20"
+            ),
             Arguments.of(
                 REMOTE_BASE_URL,
                 UrlOptions.UrlOptionsFileAtBranch(FILE, BRANCH, LINE_SELECTION),
@@ -72,7 +80,7 @@ class BitBucketServerTest {
     @ParameterizedTest
     @MethodSource("urlExpectationsProvider")
     fun canGenerateUrl(baseUrl: URL, options: UrlOptions, expectedUrl: String) {
-        val factory = TemplatedUrlFactory(UrlTemplates.bitbucketServer())
+        val factory = BitbucketServerUrlFactory()
         val url = factory.createUrl(baseUrl, options)
 
         assertEquals(expectedUrl, url.toString())