Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename toPdxArray(:byte[]) to toPdx(:byte[]).

Browse Source
This commit is contained in:
John Blum
2020-06-09 21:46:36 -07:00
parent e05c627e13
commit db0a00e452
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-geode/src/main/java/org/springframework/geode/data/json/JsonCacheDataImporterExporter.java
View File

@@ -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);
}

10
spring-geode/src/test/java/org/springframework/geode/data/json/JsonCacheDataImporterExporterUnitTests.java
View File

@@ -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));