Skip to content

Commit aed4e21

Browse files
committed
remove usage of WebResourceUrlProvider
1 parent ac9a061 commit aed4e21

File tree

1 file changed

+1
-5
lines changed
  • kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk

1 file changed

+1
-5
lines changed

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import com.atlassian.jira.util.ErrorCollection.Reason
3838
import com.atlassian.jira.util.ErrorCollections
3939
import com.atlassian.jira.web.bean.I18nBean
4040
import com.atlassian.jira.web.bean.PagerFilter
41-
import com.atlassian.plugin.webresource.WebResourceUrlProvider
4241
import com.google.gson.JsonObject
4342
import com.linkedplanet.kotlinatlassianclientcore.common.api.Page
4443
import com.linkedplanet.kotlinatlassianclientcore.common.error.asEither
@@ -65,7 +64,6 @@ object SdkJiraIssueOperator : JiraIssueOperator<SdkJiraField> {
6564
private val jiraAuthenticationContext: JiraAuthenticationContext by getComponent()
6665
private val jqlParser: JqlQueryParser by getComponent()
6766
private val applicationProperties: ApplicationProperties by getComponent()
68-
private val webResourceUrlProvider: WebResourceUrlProvider by getComponent()
6967
private val issueJsonConverter = IssueJsonConverter()
7068

7169
private fun user() = jiraAuthenticationContext.loggedInUser
@@ -85,9 +83,7 @@ object SdkJiraIssueOperator : JiraIssueOperator<SdkJiraField> {
8583

8684
private fun toBasicReturnTypeIssue(createdIssue: MutableIssue): JiraIssue {
8785
val basePath = applicationProperties.jiraBaseUrl
88-
val contextPath = webResourceUrlProvider.baseUrl
89-
val fullPath = if (contextPath.isNotEmpty()) "$basePath/$contextPath" else basePath
90-
val selfLink = fullPath + "/rest/api/2/issue/" + createdIssue.id
86+
val selfLink = basePath + "/rest/api/2/issue/" + createdIssue.id
9187
return JiraIssue(createdIssue.id.toString(), createdIssue.key, selfLink)
9288
}
9389

0 commit comments

Comments
 (0)