From e56541949f078f7060ec9109181b4b341da55e88 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 3 Dec 2018 18:37:04 -0800 Subject: [PATCH] Replace Optional.ofNullable(:Session) with a conditional and a new, private isNonNullAndDirty(:Session) method. --- .../gemfire/GemFireOperationsSessionRepository.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java index c84dd18..929dc04 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java @@ -19,7 +19,6 @@ package org.springframework.session.data.gemfire; import java.time.Duration; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import org.apache.geode.cache.query.SelectResults; @@ -155,15 +154,19 @@ public class GemFireOperationsSessionRepository extends AbstractGemFireOperation */ public void save(@Nullable Session session) { - Optional.ofNullable(session) - .filter(this::isDirty) - .ifPresent(this::doSave); + if (isNonNullAndDirty(session)) { + doSave(session); + } } private boolean isDirty(@NonNull Session session) { return !(session instanceof GemFireSession) || ((GemFireSession) session).hasDelta(); } + private boolean isNonNullAndDirty(@Nullable Session session) { + return session != null && isDirty(session); + } + void doSave(@NonNull Session session) { // Save Session As GemFireSession