From 01f9730b6c91c8ba063ec08bf172243e686b73c4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 17 Sep 2020 21:45:41 -0700 Subject: [PATCH] Remove use of org.springframework.util.ObjectUtils. Provide private implementation of nullSafeClassName(:Object). --- .../org/springframework/geode/pdx/PdxInstanceBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java index 3174a7d9..66799cbb 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceBuilder.java @@ -26,7 +26,6 @@ import org.apache.geode.pdx.PdxInstance; import org.apache.geode.pdx.PdxInstanceFactory; import org.springframework.geode.cache.SimpleCacheResolver; -import org.springframework.util.ObjectUtils; /** * The {@link PdxInstanceBuilder} class is a Builder @@ -178,12 +177,16 @@ public class PdxInstanceBuilder { .orElseThrow(() -> { String message = String.format("Expected an instance of PDX but was an instance of type [%s];" - + " Was PDX read-serialized set to true", ObjectUtils.nullSafeClassName(resolvedSource.get())); + + " Was PDX read-serialized set to true", nullSafeClassName(resolvedSource.get())); return new IllegalArgumentException(message); }); } + private String nullSafeClassName(Object target) { + return target != null ? target.getClass().getName() : null; + } + @FunctionalInterface public interface Factory {