CIRC-2036 refactoring

folio-org · Mar 7, 2024 · 1ec7b3b · 1ec7b3b
1 parent f6e3b8d
commit 1ec7b3b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java b/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java
@@ -13,6 +13,7 @@
 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;
@@ -97,7 +98,7 @@ public static JsonObject createCheckInContext(CheckInContext context) {
     JsonObject staffSlipContext = createStaffSlipContext(item, firstRequest);
     JsonObject itemContext = staffSlipContext.getJsonObject(ITEM);
 
-    if (item != null && itemContext != null) {
+    if (ObjectUtils.allNotNull(item, itemContext)) {
       write(itemContext, "lastCheckedInDateTime", ClockUtil.getZonedDateTime());
       if (item.getInTransitDestinationServicePoint() != null) {
         itemContext.put("toServicePoint", item.getInTransitDestinationServicePoint().getName());