Skip to content

Accept any byte order for single-byte v2 dtypes #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
konstibob wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Accept any byte order for single-byte v2 dtypes #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5303273
Accept any byte order for single-byte v2 dtypes
konstibob Oct 5, 2026
667aae3
Merge branch 'main' into fix/v2-single-byte-dtype-endianness
konstibob Oct 5, 2026
02dc18c
Merge branch 'main' into fix/v2-single-byte-dtype-endianness
konstibob Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/main/java/dev/zarr/zarrjava/v2/DataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.zarr.zarrjava.v2;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

public enum DataType implements dev.zarr.zarrjava.core.DataType {
Expand Down Expand Up @@ -32,6 +33,24 @@ public enum DataType implements dev.zarr.zarrjava.core.DataType {
this.endianness = endianness;
}

@JsonCreator
public static DataType fromValue(String value) {
for (DataType dataType : values()) {
if (dataType.getValue().equals(value)) {
return dataType;
}
}
// byte order is irrelevant for single-byte types, but numpy accepts (and some writers emit) "<u1" or ">u1"
if (value.startsWith(Endianness.LITTLE.getValue()) || value.startsWith(Endianness.BIG.getValue())) {
for (DataType dataType : values()) {
if (dataType.endianness == Endianness.UNSPECIFIED && dataType.dtype.equals(value.substring(1))) {
return dataType;
}
}
}
throw new IllegalArgumentException("Unsupported data type: " + value);
}

public Endianness getEndianness() {
return endianness;
}
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/dev/zarr/zarrjava/ZarrV2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import java.io.BufferedReader;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
Expand Down Expand Up @@ -609,6 +611,16 @@ public void testZarrJsonFormat(Function<ArrayMetadataBuilder, ArrayMetadataBuild
}
}

@ParameterizedTest
@CsvSource({"|u1,UINT8", "<u1,UINT8", ">u1,UINT8", ">i1,INT8", "<b1,BOOL", ">u2,UINT16_BE"})
public void testReadDataTypeWithAnyByteOrder(String dtype, DataType expected) throws ZarrException, IOException {
StoreHandle storeHandle = new MemoryStore().resolve("array");
storeHandle.resolve(ZARRAY).set(ByteBuffer.wrap(("{\"zarr_format\": 2, \"shape\": [2], \"chunks\": [2], " +
"\"dtype\": \"" + dtype + "\", \"compressor\": null, \"fill_value\": 0, \"filters\": null, " +
"\"order\": \"C\"}").getBytes(StandardCharsets.UTF_8)));
Assertions.assertEquals(expected, Array.open(storeHandle).metadata().dataType);
}

@Test
public void testMemoryStore() throws ZarrException, IOException {
StoreHandle storeHandle = new MemoryStore().resolve();
Expand Down
Loading