RetryKoraAspect simplified and value class bug fixed (#231)

Tinkoff · Aug 2, 2023 · ab111ae · ab111ae
1 parent 0b1aa03
commit ab111ae
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/...sor/src/main/kotlin/ru/tinkoff/kora/resilient/symbol/processor/aop/RetryableKoraAspect.kt b/...sor/src/main/kotlin/ru/tinkoff/kora/resilient/symbol/processor/aop/RetryableKoraAspect.kt
@@ -72,14 +72,12 @@ class RetryableKoraAspect(val resolver: Resolver) : KoraAspect {
 
     private fun buildBodySync(method: KSFunctionDeclaration, superCall: String, retryName: String, fieldRetrier: String): CodeBlock {
         return CodeBlock.builder()
-            .add("return %L.asState()", fieldRetrier).indent().add("\n")
+            .add("%L.asState()", fieldRetrier).indent().add("\n")
             .controlFlow(".use { _state ->", fieldRetrier) {
                 addStatement("val _suppressed = %T<Exception>();", ArrayList::class)
-                addStatement("lateinit var _result: %T", method.returnType?.resolve()?.toTypeName())
                 controlFlow("while (true)") {
                     controlFlow("try") {
-                        add("_result = ").add(buildMethodCall(method, superCall)).add("\n")
-                        addStatement("break")
+                        add("return ").add(buildMethodCall(method, superCall)).add("\n")
                         nextControlFlow("catch (_e: Exception)")
                         addStatement("val _status = _state.onException(_e)")
                         controlFlow("when (_status)") {
@@ -108,10 +106,8 @@ class RetryableKoraAspect(val resolver: Resolver) : KoraAspect {
                         }
                     }
                 }
-                addStatement("return@use _result")
             }
             .unindent()
-            .add("\n")
             .build()
     }