feat: migrate to getConvertedDatasetAttributes from saalfeldlab/n5#191

refactor[BREAKING]: remove constructor parameters for `mapAttributes`, `dimensionSeparator`, `mergeN5Attributes`. Map and Merge are no longer supported (they weren't really for ZarrV3 ever, but the constructors were inherited from ZarrV2). Dimension separator now has a getter/setter

Signed-off-by: Caleb Hulbert <cmhulbert@gmail.com>

Author: cmhulbert

src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueReader.java

@@ -32,6 +32,7 @@
 import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 
 import org.janelia.saalfeldlab.n5.CachedGsonKeyValueN5Reader;
 import org.janelia.saalfeldlab.n5.Compression;
@@ -58,6 +59,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 
+import static org.janelia.saalfeldlab.n5.zarr.ZarrDatasetAttributes.createZArrayAttributes;
+
 /**
  * {@link N5Reader} implementation through {@link KeyValueAccess} with JSON attributes parsed with {@link Gson}.
  *
@@ -84,9 +87,13 @@ public class ZarrKeyValueReader implements CachedGsonKeyValueN5Reader, N5JsonCac
 
 	protected URI uri;
 
-	final protected boolean mapN5DatasetAttributes;
+	protected final HashMap<DatasetAttributes, ZarrDatasetAttributes> datasetAttributesMap = new HashMap<>();
+
+	protected final boolean mapN5DatasetAttributes;
 
-	final protected boolean mergeAttributes;
+	protected final boolean mergeAttributes;
+
+	protected String dimensionSeparator;
 
 	/**
 	 * Opens an {@link ZarrKeyValueReader} at a given base path with a custom {@link GsonBuilder} to support custom
@@ -353,6 +360,24 @@ public DatasetAttributes getDatasetAttributes(final String pathName) throws N5Ex
 		return createDatasetAttributes(getZArray(pathName));
 	}
 
+	@Override
+	public ZarrDatasetAttributes getConvertedDatasetAttributes(DatasetAttributes attributes) {
+
+		final ZarrDatasetAttributes zarrAttrs;
+		if (attributes instanceof ZarrDatasetAttributes)
+			zarrAttrs = ((ZarrDatasetAttributes)attributes);
+		else if (datasetAttributesMap.containsKey(attributes)) {
+			zarrAttrs = datasetAttributesMap.get(attributes);
+			datasetAttributesMap.put(attributes, zarrAttrs);
+		}
+		else {
+			final ZArrayAttributes zArrayAttrs = createZArrayAttributes(dimensionSeparator, attributes);
+			zarrAttrs = new ZarrDatasetAttributes(zArrayAttrs);
+			datasetAttributesMap.put(attributes, zarrAttrs);
+		}
+		return zarrAttrs;
+	}
+
 	/**
 	 * Returns the {@link ZArrayAttributes} located at the given path, if present.
 	 *

src/main/java/org/janelia/saalfeldlab/n5/zarr/ZarrKeyValueWriter.java

@@ -75,8 +75,6 @@
  */
 public class ZarrKeyValueWriter extends ZarrKeyValueReader implements CachedGsonKeyValueN5Writer {
 
-	protected String dimensionSeparator;
-
 	/**
 	 * Opens an {@link ZarrKeyValueWriter} at a given base path with a custom
 	 * {@link GsonBuilder} to support custom attributes.
@@ -241,26 +239,6 @@ else if ( getCache().isDataset(normalPath, ZARRAY_FILE)){
 		}
 	}
 
-	private HashMap<DatasetAttributes, ZarrDatasetAttributes> datasetAttributesMap = new HashMap<>();
-
-
-	private ZarrDatasetAttributes getConvertedDatasetAttributes(final DatasetAttributes datasetAttributes) {
-
-		final ZarrDatasetAttributes zarrAttrs;
-		if (datasetAttributes instanceof ZarrDatasetAttributes)
-			zarrAttrs = ((ZarrDatasetAttributes)datasetAttributes);
-		else if (datasetAttributesMap.containsKey(datasetAttributes)) {
-			zarrAttrs = datasetAttributesMap.get(datasetAttributes);
-			datasetAttributesMap.put(datasetAttributes, zarrAttrs);
-		}
-		else {
-			final ZArrayAttributes zArrayAttrs = createZArrayAttributes(dimensionSeparator, datasetAttributes);
-			zarrAttrs = new ZarrDatasetAttributes(zArrayAttrs);
-			datasetAttributesMap.put(datasetAttributes, zarrAttrs);
-		}
-		return zarrAttrs;
-	}
-
 	@Override
 	public ZarrDatasetAttributes createDataset(
 			final String path,
@@ -507,26 +485,6 @@ protected void writeZAttrs(
 			cache.updateCacheInfo(normalGroupPath, ZATTRS_FILE, attributes);
 	}
 
-	@Override
-	public <T> void writeBlocks(
-					final String datasetPath,
-					final DatasetAttributes datasetAttributes,
-					final DataBlock<T>... dataBlocks) {
-
-		final ZarrDatasetAttributes zarrDatasetAttributes = getConvertedDatasetAttributes(datasetAttributes);
-		CachedGsonKeyValueN5Writer.super.writeBlocks( datasetPath, zarrDatasetAttributes, dataBlocks);
-	}
-
-	@Override
-	public <T> void writeBlock(
-			final String path,
-			final DatasetAttributes datasetAttributes,
-			final DataBlock<T> dataBlock) {
-
-		final ZarrDatasetAttributes zarrDatasetAttributes = getConvertedDatasetAttributes(datasetAttributes);
-		CachedGsonKeyValueN5Writer.super.writeBlock( path, zarrDatasetAttributes, dataBlock);
-	}
-
 	public static byte[] padCrop(
 			final byte[] src,
 			final int[] srcBlockSize,