AUT-2597 Update Resilience4j to version 2.3.0

Author: madislm

pom.xml

@@ -16,7 +16,7 @@
         <bouncycastle.version>1.81</bouncycastle.version>
         <jackson.version>2.19.1</jackson.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <resilience4j.version>1.7.0</resilience4j.version>
+        <resilience4j.version>2.3.0</resilience4j.version>
         <junit-jupiter.version>5.13.3</junit-jupiter.version>
         <assertj.version>3.27.3</assertj.version>
         <mockito.version>5.18.0</mockito.version>
@@ -89,6 +89,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-vavr</artifactId>
+            <version>${resilience4j.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/eu/webeid/resilientocsp/ResilientOcspCertificateRevocationChecker.java

@@ -38,11 +38,11 @@
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.github.resilience4j.core.functions.CheckedSupplier;
 import io.github.resilience4j.decorators.Decorators;
 import io.github.resilience4j.retry.Retry;
 import io.github.resilience4j.retry.RetryConfig;
 import io.github.resilience4j.retry.RetryRegistry;
-import io.vavr.CheckedFunction0;
 import io.vavr.control.Try;
 import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
 import org.bouncycastle.cert.ocsp.BasicOCSPResp;
@@ -115,18 +115,18 @@ public List<RevocationInfo> validateCertificateNotRevoked(X509Certificate subjec
 
         List<RevocationInfo> revocationInfoList = new ArrayList<>();
 
-        CheckedFunction0<RevocationInfo> primarySupplier = () -> request(ocspService, subjectCertificate, issuerCertificate, false);
+        CheckedSupplier<RevocationInfo> primarySupplier = () -> request(ocspService, subjectCertificate, issuerCertificate, false);
         OcspService firstFallbackService = ocspService.getFallbackService();
-        CheckedFunction0<RevocationInfo> firstFallbackSupplier = () -> request(firstFallbackService, subjectCertificate, issuerCertificate, true);
+        CheckedSupplier<RevocationInfo> firstFallbackSupplier = () -> request(firstFallbackService, subjectCertificate, issuerCertificate, true);
         OcspService secondFallbackService = getOcspServiceProvider().getFallbackService(firstFallbackService.getAccessLocation());
-        CheckedFunction0<RevocationInfo> fallbackSupplier;
+        CheckedSupplier<RevocationInfo> fallbackSupplier;
         if (secondFallbackService == null) {
             fallbackSupplier = firstFallbackSupplier;
         } else {
-            CheckedFunction0<RevocationInfo> secondFallbackSupplier = () -> request(secondFallbackService, subjectCertificate, issuerCertificate, true);
+            CheckedSupplier<RevocationInfo> secondFallbackSupplier = () -> request(secondFallbackService, subjectCertificate, issuerCertificate, true);
             fallbackSupplier = () -> {
                 try {
-                    return firstFallbackSupplier.apply();
+                    return firstFallbackSupplier.get();
                 } catch (Exception e) {
                     if (e instanceof ResilientUserCertificateOCSPCheckFailedException exception) {
                         revocationInfoList.addAll((exception.getValidationInfo().revocationInfoList()));
@@ -135,7 +135,7 @@ public List<RevocationInfo> validateCertificateNotRevoked(X509Certificate subjec
                             Map.entry(RevocationInfo.KEY_OCSP_ERROR, e)
                         )));
                     }
-                    return secondFallbackSupplier.apply();
+                    return secondFallbackSupplier.get();
                 }
             };
         }
@@ -154,12 +154,12 @@ public List<RevocationInfo> validateCertificateNotRevoked(X509Certificate subjec
         decorateCheckedSupplier.withCircuitBreaker(circuitBreaker)
             .withFallback(List.of(ResilientUserCertificateOCSPCheckFailedException.class, CallNotPermittedException.class), e -> {
                 createAndAddRevocationInfoToList(e, revocationInfoList);
-                return fallbackSupplier.apply();
+                return fallbackSupplier.get();
             });
 
-        CheckedFunction0<RevocationInfo> decoratedSupplier = decorateCheckedSupplier.decorate();
+        CheckedSupplier<RevocationInfo> decoratedSupplier = decorateCheckedSupplier.decorate();
 
-        Try<RevocationInfo> result = Try.of(decoratedSupplier);
+        Try<RevocationInfo> result = Try.of(decoratedSupplier::get);
 
         RevocationInfo revocationInfo = result.getOrElseThrow(throwable -> {
             if (throwable instanceof ResilientUserCertificateOCSPCheckFailedException exception) {