codecbuilder

Author: normanrz

README.md

@@ -26,7 +26,7 @@ Array array = Array.create(
         .withDataType(DataType.UINT32)
         .withChunkShape(1, 1024, 1024, 1024)
         .withFillValue(0)
-        .withCodecs(c -> c.withSharding(new int[]{1, 32, 32, 32}, c1 -> c1.withBlosc(DataType.UINT32)))
+        .withCodecs(c -> c.withSharding(new int[]{1, 32, 32, 32}, c1 -> c1.withBlosc()))
         .build();
 );
 array.write(

src/main/java/com/scalableminds/zarrjava/v3/ArrayMetadataBuilder.java

@@ -1,6 +1,7 @@
 package com.scalableminds.zarrjava.v3;
 
 import com.scalableminds.zarrjava.ZarrException;
+import com.scalableminds.zarrjava.v3.chunkgrid.ChunkGrid;
 import com.scalableminds.zarrjava.v3.chunkgrid.RegularChunkGrid;
 import com.scalableminds.zarrjava.v3.chunkkeyencoding.ChunkKeyEncoding;
 import com.scalableminds.zarrjava.v3.chunkkeyencoding.DefaultChunkKeyEncoding;
@@ -16,7 +17,7 @@ public class ArrayMetadataBuilder {
 
   long[] shape = null;
   DataType dataType = null;
-  RegularChunkGrid chunkGrid = null;
+  ChunkGrid chunkGrid = null;
   ChunkKeyEncoding chunkKeyEncoding =
       new DefaultChunkKeyEncoding(new DefaultChunkKeyEncoding.Configuration(Separator.SLASH));
 
@@ -32,7 +33,7 @@ protected static ArrayMetadataBuilder fromArrayMetadata(ArrayMetadata arrayMetad
     ArrayMetadataBuilder builder = new ArrayMetadataBuilder();
     builder.shape = arrayMetadata.shape;
     builder.dataType = arrayMetadata.dataType;
-    builder.chunkGrid = (RegularChunkGrid) arrayMetadata.chunkGrid;
+    builder.chunkGrid = arrayMetadata.chunkGrid;
     builder.chunkKeyEncoding = arrayMetadata.chunkKeyEncoding;
     builder.fillValue = arrayMetadata.parsedFillValue;
     builder.codecs = arrayMetadata.codecs;
@@ -96,7 +97,10 @@ public ArrayMetadataBuilder withCodecs(Codec... codecs) {
   }
 
   public ArrayMetadataBuilder withCodecs(Function<CodecBuilder, CodecBuilder> codecBuilder) {
-    CodecBuilder nestedCodecBuilder = new CodecBuilder();
+    if (dataType==null) {
+      throw new IllegalStateException("Please call `withDataType` first.");
+    }
+    CodecBuilder nestedCodecBuilder = new CodecBuilder(dataType);
     this.codecs = codecBuilder.apply(nestedCodecBuilder)
         .build();
     return this;
@@ -127,9 +131,10 @@ public ArrayMetadata build() throws ZarrException {
     if (chunkGrid == null) {
       throw new ZarrException("Chunk grid needs to be provided. Please call `.withChunkShape`.");
     }
-    if (shape.length != chunkGrid.configuration.chunkShape.length) {
+    if (chunkGrid instanceof RegularChunkGrid
+        && shape.length != ((RegularChunkGrid) chunkGrid).configuration.chunkShape.length) {
       throw new ZarrException("Shape (ndim=" + shape.length + ") and chunk shape (ndim=" +
-          chunkGrid.configuration.chunkShape.length +
+          ((RegularChunkGrid) chunkGrid).configuration.chunkShape.length +
           ") need to have the same number of dimensions.");
     }
     return new ArrayMetadata(shape, dataType, chunkGrid, chunkKeyEncoding, fillValue, codecs,

src/main/java/com/scalableminds/zarrjava/v3/GroupMetadata.java

@@ -40,25 +40,7 @@ public GroupMetadata(
     this.attributes = attributes;
   }
 
-  public static Builder builder() {
-    return new Builder();
-  }
-
   public static GroupMetadata defaultValue() throws ZarrException {
     return new GroupMetadata(ZARR_FORMAT, NODE_TYPE, new HashMap<>());
   }
-
-  public static final class Builder {
-
-    Map<String, Object> attributes = new HashMap<>();
-
-    public Builder withAttribute(String key, Object value) {
-      attributes.put(key, value);
-      return this;
-    }
-
-    public GroupMetadata build() throws ZarrException {
-      return new GroupMetadata(ZARR_FORMAT, NODE_TYPE, attributes);
-    }
-  }
 }

src/main/java/com/scalableminds/zarrjava/v3/codec/CodecBuilder.java

@@ -14,10 +14,12 @@
 
 public class CodecBuilder {
 
-  List<Codec> codecs;
+  private DataType dataType;
+  private List<Codec> codecs;
 
-  public CodecBuilder() {
-    codecs = new ArrayList<>();
+  public CodecBuilder(DataType dataType) {
+    this.dataType = dataType;
+    this.codecs = new ArrayList<>();
   }
 
   public CodecBuilder withBlosc(
@@ -33,27 +35,26 @@ public CodecBuilder withBlosc(
     return this;
   }
 
-  public CodecBuilder withBlosc(String cname, String shuffle, int clevel, DataType dataType,
-      int blockSize) {
+  public CodecBuilder withBlosc(String cname, String shuffle, int clevel, int blockSize) {
     return withBlosc(Blosc.Compressor.fromString(cname), Blosc.Shuffle.fromString(shuffle), clevel,
         dataType.getByteCount(), blockSize
     );
   }
 
-  public CodecBuilder withBlosc(String cname, String shuffle, int clevel, DataType dataType) {
-    return withBlosc(cname, shuffle, clevel, dataType, 0);
+  public CodecBuilder withBlosc(String cname, String shuffle, int clevel) {
+    return withBlosc(cname, shuffle, clevel, 0);
   }
 
-  public CodecBuilder withBlosc(String cname, int clevel, DataType dataType) {
-    return withBlosc(cname, "noshuffle", clevel, dataType);
+  public CodecBuilder withBlosc(String cname, int clevel) {
+    return withBlosc(cname, "noshuffle", clevel);
   }
 
-  public CodecBuilder withBlosc(String cname, DataType dataType) {
-    return withBlosc(cname, 5, dataType);
+  public CodecBuilder withBlosc(String cname) {
+    return withBlosc(cname, 5);
   }
 
-  public CodecBuilder withBlosc(DataType dataType) {
-    return withBlosc("zstd", dataType);
+  public CodecBuilder withBlosc() {
+    return withBlosc("zstd");
   }
 
   public CodecBuilder withTranspose(String order) {
@@ -99,7 +100,7 @@ public CodecBuilder withSharding(int[] chunkShape) {
 
   public CodecBuilder withSharding(int[] chunkShape,
       Function<CodecBuilder, CodecBuilder> codecBuilder) {
-    CodecBuilder nestedBuilder = new CodecBuilder();
+    CodecBuilder nestedBuilder = new CodecBuilder(dataType);
     try {
       codecs.add(new ShardingIndexedCodec(
           new ShardingIndexedCodec.Configuration(chunkShape, codecBuilder.apply(nestedBuilder)

src/test/java/com/scalableminds/zarrjava/ZarrTest.java

@@ -107,10 +107,14 @@ public void testV3ShardingReadWrite() throws IOException, ZarrException {
 
   @Test
   public void testV3ArrayMetadataBuilder() throws ZarrException {
-    Array.metadataBuilder().withShape(1, 4096, 4096, 1536).withDataType(DataType.UINT32)
-        .withChunkShape(
-            1, 1024, 1024, 1024).withFillValue(0).withCodecs(
-            c -> c.withSharding(new int[]{1, 32, 32, 32}, c1 -> c1.withBlosc(DataType.UINT32))).build();
+    Array.metadataBuilder()
+        .withShape(1, 4096, 4096, 1536)
+        .withDataType(DataType.UINT32)
+        .withChunkShape(1, 1024, 1024, 1024)
+        .withFillValue(0)
+        .withCodecs(
+            c -> c.withSharding(new int[]{1, 32, 32, 32}, c1 -> c1.withBlosc()))
+        .build();
   }
 
   @Test
@@ -134,7 +138,8 @@ public void testV3Group() throws IOException, ZarrException {
         .withShape(10, 10)
         .withDataType(DataType.UINT8)
         .withChunkShape(5, 5)
-        .build());
+        .build()
+    );
     array.write(new long[]{2, 2}, ucar.ma2.Array.factory(ucar.ma2.DataType.UBYTE, new int[]{8, 8}));
 
     assertArrayEquals(((Array) ((Group) group.list()[0]).list()[0]).metadata.chunkShape(),