@@ -32,8 +32,6 @@ import com.atlassian.jira.issue.fields.screen.issuetype.IssueTypeScreenSchemeMan
3232import com.atlassian.jira.issue.issuetype.IssueType
3333import com.atlassian.jira.issue.operation.IssueOperations
3434import com.atlassian.jira.issue.operation.ScreenableIssueOperation
35- import com.atlassian.jira.rest.v2.issue.IssueTypeResource
36- import com.atlassian.jira.rest.v2.issue.ResourceUriBuilder
3735import com.atlassian.jira.security.JiraAuthenticationContext
3836import com.linkedplanet.kotlinjiraclient.api.error.JiraClientError
3937import com.linkedplanet.kotlinjiraclient.api.interfaces.JiraIssueTypeOperator
@@ -43,10 +41,9 @@ import com.linkedplanet.kotlinjiraclient.api.model.JiraIssueTypeAttributeSchema
4341import com.linkedplanet.kotlinjiraclient.sdk.util.eitherAndCatch
4442import com.linkedplanet.kotlinjiraclient.sdk.util.getComponent
4543import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
44+ import org.springframework.stereotype.Component
4645import java.net.MalformedURLException
4746import java.net.URL
48- import org.springframework.stereotype.Component
49- import jakarta.ws.rs.core.UriBuilder
5047
5148@Component
5249object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
@@ -150,8 +147,8 @@ object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
150147 } catch (_: MalformedURLException ) {
151148 jiraBaseUrls.baseUrl() + issueType.iconUrl
152149 }
153- val restApiUrl = UriBuilder .fromPath( jiraBaseUrls.restApi2BaseUrl())
154- val self = " ResourceUriBuilder().build(restApiUrl, IssueTypeResource::class.java, issueType.id).toString() "
150+ val restApiBase = jiraBaseUrls.restApi2BaseUrl().removeSuffix( " / " )
151+ val self = " ${restApiBase} /issuetype/ ${ issueType.id} "
155152 JiraIssueType (id, name, self, descTranslation, isSubTask, iconAbsoluteURL, avatar?.id ? : 0L )
156153 }
157154
0 commit comments