Revert "CIRC-2023 Handle exception while calling mod-settings (#1421)"

This reverts commit 83e92b0.
folio-org · Feb 9, 2024 · 9f13436 · 9f13436
1 parent 71917b5
commit 9f13436
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 84 deletions.
diff --git a/src/main/java/org/folio/circulation/infrastructure/storage/SettingsRepository.java b/src/main/java/org/folio/circulation/infrastructure/storage/SettingsRepository.java
@@ -16,7 +16,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import static org.folio.circulation.support.http.client.CqlQuery.exactMatch;
-import static org.folio.circulation.support.results.Result.succeeded;
 
 public class SettingsRepository {
   private static final Logger log = LogManager.getLogger(MethodHandles.lookup().lookupClass());
@@ -39,14 +38,10 @@ public CompletableFuture<Result<CheckoutLockConfiguration>> lookUpCheckOutLockSe
           .map(Configuration::getValue)
           .map(JsonObject::new)
           .orElse(new JsonObject())))
-        .thenApply(r -> r.map(CheckoutLockConfiguration::from))
-        .thenApply(r -> r.mapFailure(failure -> {
-          log.warn("lookUpCheckOutLockSettings:: Error while fetching checkout lock settings {}", failure);
-          return succeeded(CheckoutLockConfiguration.from(new JsonObject()));
-        }));
+        .thenApply(r -> r.map(CheckoutLockConfiguration::from));
     } catch (Exception ex) {
       log.warn("lookUpCheckOutLockSettings:: Unable to retrieve checkoutLockFeature settings ", ex);
-      return CompletableFuture.completedFuture(succeeded(CheckoutLockConfiguration.from(new JsonObject())));
+      return CompletableFuture.completedFuture(Result.succeeded(CheckoutLockConfiguration.from(new JsonObject())));
     }
   }
 }
diff --git a/src/test/java/org/folio/circulation/infrastructure/storage/SettingsRepositoryTest.java b/src/test/java/org/folio/circulation/infrastructure/storage/SettingsRepositoryTest.java