get rid of by lazy, introduce withErrorCollection

Author: HighKo

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

@@ -26,7 +26,6 @@ import com.atlassian.jira.bc.issue.comment.CommentService
 import com.atlassian.jira.bc.issue.comment.CommentService.CommentParameters
 import com.atlassian.jira.component.ComponentAccessor
 import com.atlassian.jira.issue.MutableIssue
-import com.atlassian.jira.util.SimpleErrorCollection
 import com.linkedplanet.kotlinjiraclient.api.error.JiraClientError
 import com.linkedplanet.kotlinjiraclient.api.interfaces.JiraCommentOperator
 import com.linkedplanet.kotlinjiraclient.api.model.JiraIssueComment
@@ -69,9 +68,7 @@ object SdkJiraCommentOperator : JiraCommentOperator {
 
     override suspend fun deleteComment(issueKey: String, id: String): Either<JiraClientError, Unit> =
         eitherAndCatch {
-            val simpleErrorCollection = SimpleErrorCollection()
-            val comment = commentService.getCommentById(user(), id.toLongOrNull()!!, simpleErrorCollection)
-            simpleErrorCollection.toEither().bind()
+            val comment = withErrorCollection { commentService.getCommentById(user(), id.toLongOrNull()!!, it) }.bind()
             val jiraServiceContextImpl = JiraServiceContextImpl(user())
             commentService.delete(jiraServiceContextImpl, comment, DISPATCH_EVENT)
             jiraServiceContextImpl.errorCollection.toEither().bind()

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

@@ -33,9 +33,9 @@ import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
 object SdkJiraTransitionOperator : JiraTransitionOperator {
 
     private val issueService = ComponentAccessor.getIssueService()
-    private val workflowManager by lazy { ComponentAccessor.getWorkflowManager() }
-    private val transitionManager by lazy { ComponentAccessor.getComponent(TransitionManager::class.java) }
-    private val jiraAuthenticationContext by lazy { ComponentAccessor.getJiraAuthenticationContext() }
+    private val workflowManager = ComponentAccessor.getWorkflowManager()
+    private val transitionManager = ComponentAccessor.getComponent(TransitionManager::class.java)
+    private val jiraAuthenticationContext = ComponentAccessor.getJiraAuthenticationContext()
     private fun user() = jiraAuthenticationContext.loggedInUser
 
     override suspend fun doTransition(

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

@@ -26,6 +26,7 @@ import arrow.core.raise.fold
 import arrow.core.right
 import com.atlassian.jira.bc.ServiceResult
 import com.atlassian.jira.util.ErrorCollection
+import com.atlassian.jira.util.SimpleErrorCollection
 import com.linkedplanet.kotlinjiraclient.api.error.JiraClientError
 import org.jetbrains.kotlin.util.removeSuffixIfPresent
 
@@ -45,6 +46,18 @@ fun ErrorCollection.toEither(errorTitle: String = "SdkError") : Either<JiraClien
         else -> Unit.right()
     }
 
+fun <T> withErrorCollection(
+    errorTitle: String = "SdkError",
+    block: (errors: ErrorCollection) -> T
+): Either<JiraClientError, T> {
+    val simpleErrorCollection = SimpleErrorCollection()
+    val result = block(simpleErrorCollection)
+    return when {
+        simpleErrorCollection.hasAnyErrors() -> jiraClientError(simpleErrorCollection, errorTitle).left()
+        else -> result.right()
+    }
+}
+
 fun jiraClientError(errorCollection: ErrorCollection, errorTitle: String = "SdkError"): JiraClientError {
     val worstReason: ErrorCollection.Reason? = ErrorCollection.Reason.getWorstReason(errorCollection.reasons)
     val httpStatusSuffix = worstReason?.let { " (${it.httpStatusCode})" } ?: ""

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

@@ -43,12 +43,12 @@ import javax.xml.bind.annotation.XmlTransient
 class IssueJsonConverter {
 
     private val log = LoggerFactory.getLogger(FieldAccessorImpl::class.java)
-    private val fieldLayoutManager by lazy { ComponentAccessor.getFieldLayoutManager() }
-    private val fieldManager by lazy { ComponentAccessor.getFieldManager() }
+    private val fieldLayoutManager = ComponentAccessor.getFieldLayoutManager()
+    private val fieldManager = ComponentAccessor.getFieldManager()
     private val beanBuilderFactory = ComponentAccessor.getOSGiComponentInstanceOfType(BeanBuilderFactory::class.java)
     private val jiraBaseUrls: JiraBaseUrls = ComponentAccessor.getComponent(JiraBaseUrls::class.java)
     private val uriBuilder: UriBuilder = UriBuilder.fromPath(jiraBaseUrls.restApi2BaseUrl())
-    private val gson by lazy { setupGson() }
+    private val gson = setupGson()
 
 
     @Throws(FieldException::class)