From b07ca31e516523d6bbcea19a9d643e48e326602c Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 8 Jun 2020 15:12:40 -0700 Subject: [PATCH] Add file system appropriate file path separator to Resource location on export. --- .../geode/data/json/JsonCacheDataImporterExporter.java | 3 ++- .../data/json/JsonCacheDataImporterExporterUnitTests.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java b/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java index 4da78232..b3bb1c20 100644 --- a/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java +++ b/spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java @@ -19,6 +19,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; @@ -399,7 +400,7 @@ public class JsonCacheDataImporterExporter extends AbstractCacheDataImporterExpo * @return a {@link String file system path} specifying the location for where to export the {@link Resource}. */ protected @NonNull String getResourceLocation() { - return String.format("%1$s%2$s", FILESYSTEM_RESOURCE_PREFIX, System.getProperty("user.dir")); + return String.format("%1$s%2$s%3$s", FILESYSTEM_RESOURCE_PREFIX, System.getProperty("user.dir"), File.separator); } /** diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java index b8493442..a4ea159c 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -826,8 +827,8 @@ public class JsonCacheDataImporterExporterUnitTests { @Test public void getResourceLocationIsInWorkingDirectory() { - assertThat(this.importer.getResourceLocation()).isEqualTo(String.format("%1$s%2$s", - JsonCacheDataImporterExporter.FILESYSTEM_RESOURCE_PREFIX, System.getProperty("user.dir"))); + assertThat(this.importer.getResourceLocation()).isEqualTo(String.format("%1$s%2$s%3$s", + JsonCacheDataImporterExporter.FILESYSTEM_RESOURCE_PREFIX, System.getProperty("user.dir"), File.separator)); } @Test