add optional omero fields id, version, name

Author: brokkoli71

src/main/java/dev/zarr/zarrjava/ome/metadata/OmeroMetadata.java

@@ -12,17 +12,36 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class OmeroMetadata {
 
+    @Nullable
+    public final Integer id;
+    @Nullable
+    public final String version;
+    @Nullable
+    public final String name;
     @Nullable
     public final List<Map<String, Object>> channels;
     @Nullable
     public final Map<String, Object> rdefs;
 
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
     public OmeroMetadata(
+            @Nullable @JsonProperty("id") Integer id,
+            @Nullable @JsonProperty("version") String version,
+            @Nullable @JsonProperty("name") String name,
             @Nullable @JsonProperty("channels") List<Map<String, Object>> channels,
             @Nullable @JsonProperty("rdefs") Map<String, Object> rdefs
     ) {
+        this.id = id;
+        this.version = version;
+        this.name = name;
         this.channels = channels;
         this.rdefs = rdefs;
     }
+
+    public OmeroMetadata(
+            @Nullable List<Map<String, Object>> channels,
+            @Nullable Map<String, Object> rdefs
+    ) {
+        this(null, null, null, channels, rdefs);
+    }
 }

src/test/java/dev/zarr/zarrjava/ome/OmeZarrV04Test.java

@@ -81,6 +81,9 @@ void omeroChannels() throws Exception {
                 dev.zarr.zarrjava.ome.v0_4.MultiscaleImage.openMultiscaleImage(imageStoreHandle());
         OmeroMetadata omero = image.getOmeroMetadata();
         assertNotNull(omero);
+        assertNull(omero.id);
+        assertNull(omero.version);
+        assertNull(omero.name);
         assertEquals(2, omero.channels.size());
         assertEquals("DAPI", omero.channels.get(0).get("label"));
         assertEquals("color", omero.rdefs.get("model"));
@@ -174,12 +177,15 @@ void writeOmeroRoundTrip() throws Exception {
         ch.put("label", "DAPI");
         java.util.Map<String, Object> rd = new java.util.HashMap<String, Object>();
         rd.put("model", "color");
-        created.setOmeroMetadata(new OmeroMetadata(Collections.singletonList(ch), rd));
+        created.setOmeroMetadata(new OmeroMetadata(1, "0.5", "example.tif", Collections.singletonList(ch), rd));
 
         dev.zarr.zarrjava.ome.v0_4.MultiscaleImage reopened =
                 dev.zarr.zarrjava.ome.v0_4.MultiscaleImage.openMultiscaleImage(handle);
         OmeroMetadata got = reopened.getOmeroMetadata();
         assertNotNull(got);
+        assertEquals(Integer.valueOf(1), got.id);
+        assertEquals("0.5", got.version);
+        assertEquals("example.tif", got.name);
         assertEquals("DAPI", got.channels.get(0).get("label"));
     }
 

src/test/java/dev/zarr/zarrjava/ome/OmeZarrV05Test.java

@@ -94,6 +94,9 @@ void omeroChannels() throws Exception {
                 dev.zarr.zarrjava.ome.v0_5.MultiscaleImage.openMultiscaleImage(imageStoreHandle());
         OmeroMetadata omero = image.getOmeroMetadata();
         assertNotNull(omero);
+        assertNull(omero.id);
+        assertNull(omero.version);
+        assertNull(omero.name);
         assertEquals(2, omero.channels.size());
         assertEquals("DAPI", omero.channels.get(0).get("label"));
         assertEquals("GFP",  omero.channels.get(1).get("label"));