From db0a00e452e6ff8689c726c08b4ed21506e4379a Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 9 Jun 2020 21:46:36 -0700 Subject: [PATCH] Rename toPdxArray(:byte[]) to toPdx(:byte[]). --- .../geode/data/json/JsonCacheDataImporterExporter.java | 4 ++-- .../json/JsonCacheDataImporterExporterUnitTests.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 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 98c73e72..2b21176b 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 @@ -179,7 +179,7 @@ public class JsonCacheDataImporterExporter extends AbstractCacheDataImporterExpo getResource(region, CLASSPATH_RESOURCE_PREFIX) .filter(Resource::exists) .map(this::getContent) - .map(this::toPdxArray) + .map(this::toPdx) .map(Arrays::stream) .ifPresent(pdxInstances -> pdxInstances.forEach(pdxInstance -> { pdxInstance = postProcess(pdxInstance); @@ -395,7 +395,7 @@ public class JsonCacheDataImporterExporter extends AbstractCacheDataImporterExpo * @see org.apache.geode.pdx.PdxInstance * @see #getJsonToPdxArrayConverter() */ - protected @NonNull PdxInstance[] toPdxArray(@NonNull byte[] json) { + protected @NonNull PdxInstance[] toPdx(@NonNull byte[] json) { return getJsonToPdxArrayConverter().convert(json); } 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 3b845993..066bbfd4 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 @@ -228,7 +228,7 @@ public class JsonCacheDataImporterExporterUnitTests { eq(JsonCacheDataImporterExporter.CLASSPATH_RESOURCE_PREFIX)); doReturn(true).when(mockResource).exists(); doReturn(json).when(this.importer).getContent(eq(mockResource)); - doReturn(ArrayUtils.asArray(mockPdxInstanceOne, mockPdxInstanceTwo)).when(this.importer).toPdxArray(eq(json)); + doReturn(ArrayUtils.asArray(mockPdxInstanceOne, mockPdxInstanceTwo)).when(this.importer).toPdx(eq(json)); doReturn(1).when(this.importer).getIdentifier(eq(mockPdxInstanceOne)); doReturn(2).when(this.importer).getIdentifier(eq(mockPdxInstanceTwo)); @@ -237,7 +237,7 @@ public class JsonCacheDataImporterExporterUnitTests { verify(this.importer, times(1)) .getResource(eq(mockRegion), eq(JsonCacheDataImporterExporter.CLASSPATH_RESOURCE_PREFIX)); verify(this.importer, times(1)).getContent(eq(mockResource)); - verify(this.importer, times(1)).toPdxArray(eq(json)); + verify(this.importer, times(1)).toPdx(eq(json)); verify(this.importer, times(1)).postProcess(eq(mockPdxInstanceOne)); verify(this.importer, times(1)).getIdentifier(eq(mockPdxInstanceOne)); verify(this.importer, times(1)).postProcess(eq(mockPdxInstanceTwo)); @@ -327,7 +327,7 @@ public class JsonCacheDataImporterExporterUnitTests { .getResource(eq(mockRegion), eq(JsonCacheDataImporterExporter.CLASSPATH_RESOURCE_PREFIX)); doReturn(true).when(mockResource).exists(); doReturn(json).when(this.importer).getContent(eq(mockResource)); - doReturn(new PdxInstance[0]).when(this.importer).toPdxArray(eq(json)); + doReturn(new PdxInstance[0]).when(this.importer).toPdx(eq(json)); assertThat(this.importer.doImportInto(mockRegion)).isEqualTo(mockRegion); @@ -335,7 +335,7 @@ public class JsonCacheDataImporterExporterUnitTests { verify(this.importer, times(1)) .getResource(eq(mockRegion), eq(JsonCacheDataImporterExporter.CLASSPATH_RESOURCE_PREFIX)); verify(this.importer, times(1)).getContent(eq(mockResource)); - verify(this.importer, times(1)).toPdxArray(eq(json)); + verify(this.importer, times(1)).toPdx(eq(json)); verify(mockResource, times(1)).exists(); verifyNoMoreInteractions(this.importer); verifyNoMoreInteractions(mockResource); @@ -868,7 +868,7 @@ public class JsonCacheDataImporterExporterUnitTests { doReturn(mockConverter).when(this.importer).getJsonToPdxArrayConverter(); doReturn(pdxArray).when(mockConverter).convert(eq(json)); - assertThat(this.importer.toPdxArray(json)).isEqualTo(pdxArray); + assertThat(this.importer.toPdx(json)).isEqualTo(pdxArray); verify(this.importer, times(1)).getJsonToPdxArrayConverter(); verify(mockConverter, times(1)).convert(eq(json));