From d21ce7d20af9aa8f793fb58891907ab704dba510 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 9 Jul 2020 11:59:33 -0700 Subject: [PATCH] Utilize new enum for Resource prefixes. Simplify ResourceLoaderResourceResolver.getResourceLoader() to use the new 'initialize' operator. Resolves gh-92. --- .../org/springframework/geode/core/io/ResourceResolver.java | 5 ----- .../core/io/support/ResourceLoaderResourceResolver.java | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java index 667a28a0..4c321d46 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/ResourceResolver.java @@ -20,7 +20,6 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.util.Optional; import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; import org.springframework.lang.NonNull; import org.springframework.util.ClassUtils; @@ -34,10 +33,6 @@ import org.springframework.util.ClassUtils; @FunctionalInterface public interface ResourceResolver { - String CLASSPATH_URL_PREFIX = ResourceLoader.CLASSPATH_URL_PREFIX; - String FILESYSTEM_URL_PREFIX = "file:"; - String RESOURCE_PATH_SEPARATOR = "/"; - /** * Gets the {@link ClassLoader} used by this {@link ResourceResolver} to resolve {@literal classpath} * {@link Resource Resources}. diff --git a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java index 2ff98e93..9e5fc7f7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/io/support/ResourceLoaderResourceResolver.java @@ -15,6 +15,8 @@ */ package org.springframework.geode.core.io.support; +import static org.springframework.geode.core.util.ObjectUtils.initialize; + import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; @@ -94,7 +96,7 @@ public class ResourceLoaderResourceResolver implements ResourceLoaderAware, Reso */ protected @NonNull ResourceLoader getResourceLoader() { return this.resolvedResourceLoader.updateAndGet(resourceLoader -> - resourceLoader != null ? resourceLoader : newResourceLoader()); + initialize(resourceLoader, this::newResourceLoader)); } /**