AUT-2758 Refactor collecting circuit breaker statistics

Author: madislm

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

@@ -223,27 +223,31 @@ private RevocationInfo processResult(Try<RevocationInfo> result, X509Certificate
         if (result.isSuccess()) {
             RevocationInfo revocationInfo = result.get();
             if (revocationInfoList.isEmpty()) {
-                revocationInfo.ocspResponseAttributes().put(RevocationInfo.KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
+                revocationInfo = revocationInfo.withCircuitBreakerStatistics(circuitBreakerStatistics);
             } else {
-                revocationInfoList.get(0).ocspResponseAttributes().put(RevocationInfo.KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
+                addCircuitBreakerStatistics(revocationInfoList, circuitBreakerStatistics);
             }
             return revocationInfo;
         }
+        addCircuitBreakerStatistics(revocationInfoList, circuitBreakerStatistics);
         Throwable throwable = result.getCause();
         if (throwable instanceof ResilientUserCertificateOCSPCheckFailedException exception) {
-            revocationInfoList.get(0).ocspResponseAttributes().put(RevocationInfo.KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
             exception.setValidationInfo(new ValidationInfo(subjectCertificate, revocationInfoList));
             throw exception;
         }
         if (throwable instanceof ResilientUserCertificateRevokedException exception) {
-            revocationInfoList.get(0).ocspResponseAttributes().put(RevocationInfo.KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
             exception.setValidationInfo(new ValidationInfo(subjectCertificate, revocationInfoList));
             throw exception;
         }
-        revocationInfoList.get(0).ocspResponseAttributes().put(RevocationInfo.KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
         throw new ResilientUserCertificateOCSPCheckFailedException(new ValidationInfo(subjectCertificate, revocationInfoList));
     }
 
+    private void addCircuitBreakerStatistics(List<RevocationInfo> revocationInfoList,
+                                             CircuitBreakerStatistics circuitBreakerStatistics) {
+        revocationInfoList.set(0, revocationInfoList.get(0).withCircuitBreakerStatistics(circuitBreakerStatistics));
+    }
+
+
     private void createAndAddRevocationInfoToList(Throwable throwable, List<RevocationInfo> revocationInfoList) {
         if (throwable instanceof ResilientUserCertificateOCSPCheckFailedException exception) {
             revocationInfoList.addAll((exception.getValidationInfo().revocationInfoList()));

src/main/java/eu/webeid/security/validator/revocationcheck/RevocationInfo.java

@@ -21,7 +21,10 @@
  */
 package eu.webeid.security.validator.revocationcheck;
 
+import eu.webeid.resilientocsp.ResilientOcspCertificateRevocationChecker;
+
 import java.net.URI;
+import java.util.HashMap;
 import java.util.Map;
 
 public record RevocationInfo(URI ocspResponderUri, Map<String, Object> ocspResponseAttributes) {
@@ -33,4 +36,10 @@ public record RevocationInfo(URI ocspResponderUri, Map<String, Object> ocspRespo
     public static final String KEY_REQUEST_DURATION = "REQUEST_DURATION";
     public static final String KEY_CIRCUIT_BREAKER_STATISTICS = "CIRCUIT_BREAKER_STATISTICS";
     public static final String KEY_OCSP_RESPONSE_TIME = "OCSP_RESPONSE_TIME";
+
+    public RevocationInfo withCircuitBreakerStatistics(ResilientOcspCertificateRevocationChecker.CircuitBreakerStatistics circuitBreakerStatistics) {
+        Map<String, Object> newOcspResponseAttributes = new HashMap<>(ocspResponseAttributes);
+        newOcspResponseAttributes.put(KEY_CIRCUIT_BREAKER_STATISTICS, circuitBreakerStatistics);
+        return new RevocationInfo(ocspResponderUri, newOcspResponseAttributes);
+    }
 }