From f6e3b8dadf2bd560ef1adf2639641414284f9f32 Mon Sep 17 00:00:00 2001
From: alexanderkurash <alexander.kurash@gmail.com>
Date: Thu, 7 Mar 2024 14:56:41 +0200
Subject: [PATCH] CIRC-2036 Fix Sonar reliability issue

---
 .../folio/circulation/domain/notice/TemplateContextUtil.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java b/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java
index 948a695327..fd99258f49 100644
--- a/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java
+++ b/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java
@@ -13,7 +13,6 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -98,7 +97,7 @@ public static JsonObject createCheckInContext(CheckInContext context) {
     JsonObject staffSlipContext = createStaffSlipContext(item, firstRequest);
     JsonObject itemContext = staffSlipContext.getJsonObject(ITEM);
 
-    if (ObjectUtils.allNotNull(item, itemContext)) {
+    if (item != null && itemContext != null) {
       write(itemContext, "lastCheckedInDateTime", ClockUtil.getZonedDateTime());
       if (item.getInTransitDestinationServicePoint() != null) {
         itemContext.put("toServicePoint", item.getInTransitDestinationServicePoint().getName());