Rename ZarrCompatibleStringDataBlock

saalfeldlab · Oct 21, 2023 · 395bf3f · 395bf3f
1 parent 970b6e3
commit 395bf3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/janelia/saalfeldlab/n5/zarr/DType.java b/src/main/java/org/janelia/saalfeldlab/n5/zarr/DType.java
@@ -213,7 +213,7 @@ public DType(final String typestr, final Collection<Filter> filters) {
 			nBits = 0;
 			if (filters.contains(VLEN_UTF8)) {
 				dataBlockFactory = (blockSize, gridPosition, numElements) ->
-						new ZarrCompatibleStringDataBlock(blockSize, gridPosition, new String[0]);
+						new ZarrStringDataBlock(blockSize, gridPosition, new String[0]);
 				byteBlockFactory = (blockSize, gridPosition, numElements) ->
 						new ByteArrayDataBlock(blockSize, gridPosition, new byte[numElements * nBytes]);
 			} else {
@@ -281,7 +281,7 @@ public DType(final DataType dataType, final int nPrimitives) {
 		case STRING:
 			nBytes = 1;
 			dataBlockFactory = (blockSize, gridPosition, numElements) ->
-					new ZarrCompatibleStringDataBlock(blockSize, gridPosition, new String[0]);
+					new ZarrStringDataBlock(blockSize, gridPosition, new String[0]);
 			break;
 		default:
 			nBytes = nPrimitives;

diff --git a/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java b/src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java
@@ -685,9 +685,9 @@ protected static DataBlock<?> readBlock(
 		return dataBlock;
 	}
 
-	private static ZarrCompatibleStringDataBlock readVLenStringBlock(InputStream in, BlockReader reader, ByteArrayDataBlock byteBlock) throws IOException {
+	private static ZarrStringDataBlock readVLenStringBlock(InputStream in, BlockReader reader, ByteArrayDataBlock byteBlock) throws IOException {
 		// read whole chunk and deserialize; this should be improved
-		ZarrCompatibleStringDataBlock dataBlock = new ZarrCompatibleStringDataBlock(byteBlock.getSize(), byteBlock.getGridPosition(), new String[0]);
+		ZarrStringDataBlock dataBlock = new ZarrStringDataBlock(byteBlock.getSize(), byteBlock.getGridPosition(), new String[0]);
 		if (reader instanceof BloscCompression) {
 			// Blosc reader reads actual data and doesn't care about buffer size (but needs special treatment in data block)
 			reader.read(dataBlock, in);

diff --git a/...5/zarr/ZarrCompatibleStringDataBlock.java → ...lfeldlab/n5/zarr/ZarrStringDataBlock.java b/...5/zarr/ZarrCompatibleStringDataBlock.java → ...lfeldlab/n5/zarr/ZarrStringDataBlock.java
@@ -6,13 +6,13 @@
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
-public class ZarrCompatibleStringDataBlock extends StringDataBlock {
+public class ZarrStringDataBlock extends StringDataBlock {
 
-    public ZarrCompatibleStringDataBlock(int[] size, long[] gridPosition, String[] data) {
+    public ZarrStringDataBlock(int[] size, long[] gridPosition, String[] data) {
         super(size, gridPosition, data);
     }
 
-    public ZarrCompatibleStringDataBlock(int[] size, long[] gridPosition, byte[] data) {
+    public ZarrStringDataBlock(int[] size, long[] gridPosition, byte[] data) {
         super(size, gridPosition, data);
     }
 

diff --git a/src/test/java/org/janelia/saalfeldlab/n5/zarr/N5ZarrTest.java b/src/test/java/org/janelia/saalfeldlab/n5/zarr/N5ZarrTest.java
@@ -405,7 +405,7 @@ public void testWriteReadStringBlock() {
 			try (final N5Writer n5 = createN5Writer()) {
 				n5.createDataset("/test/group/dataset", dimensions, blockSize, dataType, compression);
 				DatasetAttributes attributes = n5.getDatasetAttributes("/test/group/dataset");
-				StringDataBlock dataBlock = new ZarrCompatibleStringDataBlock(blockSize, new long[]{0L, 0L, 0L}, stringBlock);
+				StringDataBlock dataBlock = new ZarrStringDataBlock(blockSize, new long[]{0L, 0L, 0L}, stringBlock);
 				n5.writeBlock("/test/group/dataset", attributes, dataBlock);
 				DataBlock<?> loadedDataBlock = n5.readBlock("/test/group/dataset", attributes, 0L, 0L, 0L);
 				assertArrayEquals(stringBlock, (String[])loadedDataBlock.getData());