Skip to content

Commit 8124a5b

Browse files
committed
remove v3 code in v2
1 parent fb7a972 commit 8124a5b

File tree

9 files changed

+92
-7
lines changed

9 files changed

+92
-7
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package dev.zarr.zarrjava.core.codec.core;
2+
3+
import dev.zarr.zarrjava.core.codec.ArrayBytesCodec;
4+
5+
public interface BytesCodec extends ArrayBytesCodec {
6+
7+
/*
8+
TODO: better style would be to make this a class and dev.zarr.zarrjava.v3.codec.Codec an interface
9+
Would this work with the serialization?
10+
*/
11+
}

src/main/java/dev/zarr/zarrjava/v2/Array.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import dev.zarr.zarrjava.core.codec.CodecPipeline;
99
import dev.zarr.zarrjava.v2.codec.Codec;
1010
import dev.zarr.zarrjava.v2.codec.CodecRegistry;
11-
import dev.zarr.zarrjava.v3.codec.core.BytesCodec;
11+
import dev.zarr.zarrjava.v2.codec.core.BytesCodec;
1212

1313
import javax.annotation.Nonnull;
1414
import java.io.IOException;

src/main/java/dev/zarr/zarrjava/v2/ArrayMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ArrayMetadata implements dev.zarr.zarrjava.core.ArrayMetadata {
4747
public Codec compressor;
4848

4949
@JsonIgnore
50-
public dev.zarr.zarrjava.v3.ArrayMetadata.CoreArrayMetadata coreArrayMetadata;
50+
public CoreArrayMetadata coreArrayMetadata;
5151

5252

5353
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
@@ -78,7 +78,7 @@ public ArrayMetadata(
7878
this.filters = filters;
7979
this.compressor = compressor;
8080
this.coreArrayMetadata =
81-
new dev.zarr.zarrjava.v3.ArrayMetadata.CoreArrayMetadata(shape, chunks,
81+
new ArrayMetadata.CoreArrayMetadata(shape, chunks,
8282
this.dataType,
8383
parsedFillValue
8484
);

src/main/java/dev/zarr/zarrjava/v2/DataType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public enum DataType implements dev.zarr.zarrjava.core.DataType {
2525
this.endianness = endianness;
2626
}
2727

28+
//todo remove?
2829
public static DataType fromDataType(dev.zarr.zarrjava.v3.DataType dataType) {
2930
switch (dataType) {
3031
case BOOL:
@@ -58,6 +59,7 @@ public Endianness getEndianness() {
5859
return endianness;
5960
}
6061

62+
//todo remove?
6163
public dev.zarr.zarrjava.v3.DataType toV3() throws ZarrException {
6264
if (this.dtype.equals(BOOL.dtype))
6365
return dev.zarr.zarrjava.v3.DataType.BOOL;

src/main/java/dev/zarr/zarrjava/v2/Endianness.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.zarr.zarrjava.v2;
22

33
import com.fasterxml.jackson.annotation.JsonValue;
4-
import dev.zarr.zarrjava.v3.codec.core.BytesCodec;
4+
import dev.zarr.zarrjava.v2.codec.core.BytesCodec;
55

66
public enum Endianness {
77
LITTLE("<"),

src/main/java/dev/zarr/zarrjava/v2/codec/Codec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonTypeInfo;
44
import dev.zarr.zarrjava.ZarrException;
5-
import dev.zarr.zarrjava.v3.ArrayMetadata;
5+
import dev.zarr.zarrjava.v2.ArrayMetadata;
66

77
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "id")
88
public abstract class Codec implements dev.zarr.zarrjava.core.codec.Codec {

src/main/java/dev/zarr/zarrjava/v2/codec/core/BloscCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import dev.zarr.zarrjava.ZarrException;
1515
import dev.zarr.zarrjava.utils.Utils;
1616
import dev.zarr.zarrjava.v2.codec.Codec;
17-
import dev.zarr.zarrjava.v3.ArrayMetadata;
17+
import dev.zarr.zarrjava.v2.ArrayMetadata;
1818

1919
import javax.annotation.Nonnull;
2020
import java.io.IOException;
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package dev.zarr.zarrjava.v2.codec.core;
2+
3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import com.fasterxml.jackson.annotation.JsonValue;
6+
import dev.zarr.zarrjava.ZarrException;
7+
import dev.zarr.zarrjava.v2.ArrayMetadata;
8+
import dev.zarr.zarrjava.v2.codec.Codec;
9+
import ucar.ma2.Array;
10+
11+
import javax.annotation.Nonnull;
12+
import java.nio.ByteBuffer;
13+
import java.nio.ByteOrder;
14+
15+
public class BytesCodec extends Codec implements dev.zarr.zarrjava.core.codec.core.BytesCodec {
16+
@Nonnull
17+
public final Endian endian;
18+
19+
public final String name = "bytes";
20+
21+
@JsonCreator
22+
public BytesCodec(
23+
@JsonProperty(value = "endian", defaultValue = "little") Endian endian) {
24+
this.endian = endian;
25+
}
26+
27+
28+
@Override
29+
public Array decode(ByteBuffer chunkBytes) {
30+
chunkBytes.order(endian.getByteOrder());
31+
return Array.factory(arrayMetadata.dataType.getMA2DataType(), arrayMetadata.chunkShape,
32+
chunkBytes);
33+
}
34+
35+
@Override
36+
public ByteBuffer encode(Array chunkArray) {
37+
return chunkArray.getDataAsByteBuffer(endian.getByteOrder());
38+
}
39+
40+
@Override
41+
public long computeEncodedSize(long inputByteLength,
42+
ArrayMetadata.CoreArrayMetadata arrayMetadata) throws ZarrException {
43+
return inputByteLength;
44+
}
45+
46+
public enum Endian {
47+
LITTLE("little"),
48+
BIG("big");
49+
private final String endian;
50+
51+
Endian(String endian) {
52+
this.endian = endian;
53+
}
54+
55+
@JsonValue
56+
public String getValue() {
57+
return endian;
58+
}
59+
60+
public ByteOrder getByteOrder() {
61+
switch (this) {
62+
case LITTLE:
63+
return ByteOrder.LITTLE_ENDIAN;
64+
case BIG:
65+
return ByteOrder.BIG_ENDIAN;
66+
default:
67+
throw new RuntimeException("Unreachable");
68+
}
69+
}
70+
}
71+
}
72+

src/main/java/dev/zarr/zarrjava/v3/codec/core/BytesCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import javax.annotation.Nonnull;
1313
import ucar.ma2.Array;
1414

15-
public class BytesCodec extends Codec implements ArrayBytesCodec {
15+
public class BytesCodec extends Codec implements dev.zarr.zarrjava.core.codec.core.BytesCodec {
1616

1717
public final String name = "bytes";
1818
@Nonnull

0 commit comments

Comments
 (0)