@@ -25,15 +25,11 @@ import com.atlassian.jira.issue.fields.Field
2525import com.atlassian.jira.issue.fields.FieldException
2626import com.atlassian.jira.issue.fields.layout.field.FieldLayoutItem
2727import com.atlassian.jira.issue.fields.rest.RestAwareField
28- import com.atlassian.jira.issue.fields.rest.json.beans.JiraBaseUrls
29- import com.atlassian.jira.rest.v2.issue.IncludedFields
3028import com.atlassian.jira.rest.v2.issue.IssueBean
31- import com.atlassian.jira.rest.v2.issue.builder.BeanBuilderFactory
3229import com.google.gson.*
3330import com.linkedplanet.kotlinjiraclient.api.model.IssueQueryParams
3431import com.linkedplanet.kotlinjiraclient.sdk.field.FieldAccessorImpl
3532import org.slf4j.LoggerFactory
36- import jakarta.ws.rs.core.UriBuilder
3733import jakarta.xml.bind.annotation.XmlTransient
3834
3935/* *
@@ -46,25 +42,6 @@ class IssueJsonConverter {
4642 private val log = LoggerFactory .getLogger(FieldAccessorImpl ::class .java)
4743 private val fieldLayoutManager = ComponentAccessor .getFieldLayoutManager()
4844 private val fieldManager = ComponentAccessor .getFieldManager()
49- private var _beanBuilderFactory = ComponentAccessor .getOSGiComponentInstanceOfType(BeanBuilderFactory ::class .java)
50- private val beanBuilderFactory: BeanBuilderFactory
51- get() {
52- // For unknown reasons the factory is sometimes null. This workaround tries to fetch the instance again.
53- if (_beanBuilderFactory == null ) {
54- log.info(" _beanBuilderFactory is null. Using getOSGiComponentInstanceOfType to recover." )
55- _beanBuilderFactory = ComponentAccessor .getOSGiComponentInstanceOfType(BeanBuilderFactory ::class .java)
56- }
57- if (_beanBuilderFactory == null ) {
58- log.info(" _beanBuilderFactory is null. Using getComponent to recover." )
59- _beanBuilderFactory = ComponentAccessor .getComponent(BeanBuilderFactory ::class .java)
60- }
61- if (_beanBuilderFactory == null ) {
62- log.error(" _beanBuilderFactory is neither provided by getComponent nor OSGi. Giving up. " )
63- }
64- return _beanBuilderFactory
65- }
66- private val jiraBaseUrls: JiraBaseUrls = ComponentAccessor .getComponent(JiraBaseUrls ::class .java)
67- private val uriBuilder: UriBuilder = UriBuilder .fromPath(jiraBaseUrls.restApi2BaseUrl())
6845 private val gson = setupGson()
6946
7047
@@ -73,14 +50,14 @@ class IssueJsonConverter {
7350 issue : Issue ,
7451 queryParams : IssueQueryParams ,
7552 ): JsonObject {
76- val expanded = queryParams.expanded.joinToString(" ," )
77- val issueBean: IssueBean = beanBuilderFactory
78- .newIssueBeanBuilder2(IncludedFields .includeNavigableByDefault(null ), expanded /* uriBuilder*/ )
79- .build(issue)
80- this .addOrderableFieldsToBean(issueBean, issue)
81- this .addAvailableNavigableFieldsToBean(issueBean, issue)
53+ // val expanded = queryParams.expanded.joinToString(",")
54+ // val issueBean: IssueBean = beanBuilderFactory
55+ // .newIssueBeanBuilder2(IncludedFields.includeNavigableByDefault(null), expanded /*uriBuilder*/)
56+ // .build(issue)
57+ // this.addOrderableFieldsToBean(issueBean, issue)
58+ // this.addAvailableNavigableFieldsToBean(issueBean, issue)
8259
83- return gson.toJsonTree(issueBean ).asJsonObject
60+ return gson.toJsonTree(" " ).asJsonObject
8461 }
8562
8663 @Throws(FieldException ::class )
0 commit comments