From 86303084793c5f195b5bce3af8b44a2a036e28e0 Mon Sep 17 00:00:00 2001
From: Anton Duyun <anton.duyun@gmail.com>
Date: Mon, 7 Aug 2023 19:20:15 +0300
Subject: [PATCH] polishing

---
 .../annotation/processor/aop/CircuitBreakerKoraAspect.java   | 3 ++-
 .../annotation/processor/aop/TimeoutKoraAspect.java          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/CircuitBreakerKoraAspect.java b/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/CircuitBreakerKoraAspect.java
index c82ec08ee..4fab26c6a 100644
--- a/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/CircuitBreakerKoraAspect.java
+++ b/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/CircuitBreakerKoraAspect.java
@@ -1,5 +1,6 @@
 package ru.tinkoff.kora.resilient.annotation.processor.aop;
 
+import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import ru.tinkoff.kora.annotation.processor.common.MethodUtils;
 import ru.tinkoff.kora.annotation.processor.common.ProcessingError;
@@ -74,7 +75,7 @@ private CodeBlock buildBodySync(ExecutableElement method, String superCall, Stri
             ? CodeBlock.of("return")
             : CodeBlock.of("return t", superMethod.toString());
 
-        final DeclaredType cbException = env.getTypeUtils().getDeclaredType(env.getElementUtils().getTypeElement("ru.tinkoff.kora.resilient.timeout.TimeoutExhaustedException"));
+        final ClassName cbException = ClassName.get("ru.tinkoff.kora.resilient.timeout", "TimeoutExhaustedException");
 
         return CodeBlock.builder().add("""
             var _circuitBreaker = $L;
diff --git a/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/TimeoutKoraAspect.java b/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/TimeoutKoraAspect.java
index 6a9d8f438..b8ec44880 100644
--- a/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/TimeoutKoraAspect.java
+++ b/resilient/resilient-annotation-processor/src/main/java/ru/tinkoff/kora/resilient/annotation/processor/aop/TimeoutKoraAspect.java
@@ -1,6 +1,7 @@
 package ru.tinkoff.kora.resilient.annotation.processor.aop;
 
 import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import ru.tinkoff.kora.annotation.processor.common.MethodUtils;
 import ru.tinkoff.kora.annotation.processor.common.ProcessingErrorException;
@@ -85,7 +86,7 @@ private CodeBlock buildBodySync(ExecutableElement method, String superCall, Stri
 
     private CodeBlock buildBodyMono(ExecutableElement method, String superCall, String timeoutName, String fieldTimeout, String fieldMetrics) {
         final CodeBlock superMethod = buildMethodCall(method, superCall);
-        final DeclaredType timeoutException = env.getTypeUtils().getDeclaredType(env.getElementUtils().getTypeElement("ru.tinkoff.kora.resilient.timeout.TimeoutExhaustedException"));
+        final ClassName timeoutException = ClassName.get("ru.tinkoff.kora.resilient.timeout", "TimeoutExhaustedException");
 
         return CodeBlock.builder().add("""
             return $L
@@ -102,7 +103,7 @@ private CodeBlock buildBodyMono(ExecutableElement method, String superCall, Stri
 
     private CodeBlock buildBodyFlux(ExecutableElement method, String superCall, String timeoutName, String fieldTimeout, String fieldMetrics) {
         final CodeBlock superMethod = buildMethodCall(method, superCall);
-        final DeclaredType timeoutException = env.getTypeUtils().getDeclaredType(env.getElementUtils().getTypeElement("ru.tinkoff.kora.resilient.timeout.TimeoutExhaustedException"));
+        final ClassName timeoutException = ClassName.get("ru.tinkoff.kora.resilient.timeout", "TimeoutExhaustedException");
 
         return CodeBlock.builder().add("""
             return $L