Skip to content

Commit cdd153d

Browse files
brokkoli71brokkoli71
committed
make metadata() public but field metadata private
1 parent 94e9e37 commit cdd153d

File tree

7 files changed

+51
-51
lines changed

7 files changed

+51
-51
lines changed

‎src/main/java/dev/zarr/zarrjava/core/Array.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public abstract class Array extends AbstractNode {
2222

2323
protected CodecPipeline codecPipeline;
24-
protected abstract ArrayMetadata metadata();
24+
public abstract ArrayMetadata metadata();
2525

2626
protected Array(StoreHandle storeHandle) throws ZarrException {
2727
super(storeHandle);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
public class Array extends dev.zarr.zarrjava.core.Array implements Node {
2323

24-
public ArrayMetadata metadata;
24+
private final ArrayMetadata metadata;
2525

26-
protected ArrayMetadata metadata() {
26+
public ArrayMetadata metadata() {
2727
return metadata;
2828
}
2929

‎src/main/java/dev/zarr/zarrjava/v3/Array.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
public class Array extends dev.zarr.zarrjava.core.Array implements Node {
2222

23-
public ArrayMetadata metadata;
23+
private final ArrayMetadata metadata;
2424

25-
protected ArrayMetadata metadata(){
25+
public ArrayMetadata metadata(){
2626
return metadata;
2727
}
2828

‎src/test/java/dev/zarr/zarrjava/ZarrPythonTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ public void testReadV3(String codec, String codecParam, DataType dataType) throw
199199
ucar.ma2.Array result = array.read();
200200

201201
Assertions.assertArrayEquals(new int[]{16, 16, 16}, result.getShape());
202-
Assertions.assertEquals(dataType, array.metadata.dataType);
203-
Assertions.assertArrayEquals(new int[]{2, 4, 8}, array.metadata.chunkShape());
204-
Assertions.assertEquals(42, array.metadata.attributes.get("answer"));
202+
Assertions.assertEquals(dataType, array.metadata().dataType);
203+
Assertions.assertArrayEquals(new int[]{2, 4, 8}, array.metadata().chunkShape());
204+
Assertions.assertEquals(42, array.metadata().attributes.get("answer"));
205205

206206
assertIsTestdata(result, DataType.INT32);
207207
}
@@ -262,9 +262,9 @@ public void testWriteV3(String codec, String codecParam, DataType dataType) thro
262262
ucar.ma2.Array result = readArray.read();
263263

264264
Assertions.assertArrayEquals(new int[]{16, 16, 16}, result.getShape());
265-
Assertions.assertEquals(dataType, readArray.metadata.dataType);
266-
Assertions.assertArrayEquals(new int[]{2, 4, 8}, readArray.metadata.chunkShape());
267-
Assertions.assertEquals("test_value", readArray.metadata.attributes.get("test_key"));
265+
Assertions.assertEquals(dataType, readArray.metadata().dataType);
266+
Assertions.assertArrayEquals(new int[]{2, 4, 8}, readArray.metadata().chunkShape());
267+
Assertions.assertEquals("test_value", readArray.metadata().attributes.get("test_key"));
268268

269269
assertIsTestdata(result, DataType.INT32);
270270

@@ -312,9 +312,9 @@ public void testReadV2(String compressor, String compressorParam, dev.zarr.zarrj
312312
ucar.ma2.Array result = array.read();
313313

314314
Assertions.assertArrayEquals(new int[]{16, 16, 16}, result.getShape());
315-
Assertions.assertEquals(dt, array.metadata.dataType);
316-
Assertions.assertArrayEquals(new int[]{2, 4, 8}, array.metadata.chunkShape());
317-
// Assertions.assertEquals(42, array.metadata.attributes.get("answer"));
315+
Assertions.assertEquals(dt, array.metadata().dataType);
316+
Assertions.assertArrayEquals(new int[]{2, 4, 8}, array.metadata().chunkShape());
317+
// Assertions.assertEquals(42, array.metadata().attributes.get("answer"));
318318

319319
assertIsTestdata(result, dt);
320320
}
@@ -356,8 +356,8 @@ public void testWriteV2(String compressor, String compressorParam, dev.zarr.zarr
356356
ucar.ma2.Array result = readArray.read();
357357

358358
Assertions.assertArrayEquals(new int[]{16, 16, 16}, result.getShape());
359-
Assertions.assertEquals(dt, readArray.metadata.dataType);
360-
Assertions.assertArrayEquals(new int[]{2, 4, 8}, readArray.metadata.chunkShape());
359+
Assertions.assertEquals(dt, readArray.metadata().dataType);
360+
Assertions.assertArrayEquals(new int[]{2, 4, 8}, readArray.metadata().chunkShape());
361361
// Assertions.assertEquals("test_value", readArray.metadata.attributes.get("test_key"));
362362
assertIsTestdata(result, dt);
363363

‎src/test/java/dev/zarr/zarrjava/ZarrStoreTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testFileSystemStores() throws IOException, ZarrException {
5252
Assertions.assertInstanceOf(Array.class, colorSubNodes[0]);
5353

5454
Array array = (Array) ((Group) Group.open(fsStore.resolve("l4_sample")).get("color")).get("1");
55-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata.shape);
55+
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata().shape);
5656
}
5757

5858
@Test
@@ -63,14 +63,14 @@ public void testS3Store() throws IOException, ZarrException {
6363
.build(), "static.webknossos.org", "data");
6464
Array array = Array.open(s3Store.resolve("zarr_v3", "l4_sample", "color", "1"));
6565

66-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata.shape);
66+
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata().shape);
6767
}
6868

6969
@Test
7070
public void testHttpStore() throws IOException, ZarrException {
7171
HttpStore httpStore = new dev.zarr.zarrjava.store.HttpStore("https://static.webknossos.org/data/zarr_v3/l4_sample");
7272
Array array = Array.open(httpStore.resolve("color", "1"));
7373

74-
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata.shape);
74+
Assertions.assertArrayEquals(new long[]{1, 4096, 4096, 2048}, array.metadata().shape);
7575
}
7676
}

‎src/test/java/dev/zarr/zarrjava/ZarrV2Test.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testReadBloscDetectTypesize(DataType dt) throws IOException, ZarrExc
5151
StoreHandle storeHandle = new FilesystemStore(TESTDATA).resolve("v2_sample", arrayname);
5252
Array array = Array.open(storeHandle);
5353
ucar.ma2.Array output = array.read(new long[]{0, 0, 0}, new int[]{3, 4, 5});
54-
Assertions.assertEquals(dt, array.metadata.dataType);
54+
Assertions.assertEquals(dt, array.metadata().dataType);
5555
}
5656

5757
@Test
@@ -107,7 +107,7 @@ public void testNoFillValue(DataType dataType) throws IOException, ZarrException
107107
.withChunks(4, 5)
108108
.build()
109109
);
110-
Assertions.assertNull(array.metadata.fillValue);
110+
Assertions.assertNull(array.metadata().fillValue);
111111

112112
ucar.ma2.Array outArray = array.read(new long[]{0, 0}, new int[]{1, 1});
113113
if (dataType == DataType.BOOL) {
@@ -119,7 +119,7 @@ public void testNoFillValue(DataType dataType) throws IOException, ZarrException
119119
Array array2 = Array.open(
120120
storeHandle
121121
);
122-
Assertions.assertNull(array2.metadata.fillValue);
122+
Assertions.assertNull(array2.metadata().fillValue);
123123
}
124124

125125

@@ -130,13 +130,13 @@ public void testOpen() throws ZarrException, IOException {
130130
StoreHandle v3Handle = new FilesystemStore(TESTDATA).resolve("l4_sample");
131131

132132
Array array = (Array) Node.open(arrayHandle);
133-
Assertions.assertEquals(3, (array).metadata.shape.length);
133+
Assertions.assertEquals(3, array.metadata().shape.length);
134134

135135
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayHandle);
136-
Assertions.assertEquals(3, (array).metadata.shape.length);
136+
Assertions.assertEquals(3, array.metadata().shape.length);
137137

138138
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayHandle);
139-
Assertions.assertEquals(3, (array).metadata.shape.length);
139+
Assertions.assertEquals(3, array.metadata().shape.length);
140140

141141
Group group = (Group) Node.open(groupHandle);
142142
Assertions.assertInstanceOf(Group.class, group.get("subgroup"));
@@ -160,19 +160,19 @@ public void testOpenOverloads() throws ZarrException, IOException {
160160
Path v3GroupPath = TESTDATA.resolve("l4_sample");
161161

162162
Array array = (Array) Node.open(arrayPath);
163-
Assertions.assertEquals(3, (array).metadata.shape.length);
163+
Assertions.assertEquals(3, array.metadata().shape.length);
164164
array = (Array) Node.open(arrayPath.toString());
165-
Assertions.assertEquals(3, (array).metadata.shape.length);
165+
Assertions.assertEquals(3, array.metadata().shape.length);
166166

167167
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayPath);
168-
Assertions.assertEquals(3, (array).metadata.shape.length);
168+
Assertions.assertEquals(3, array.metadata().shape.length);
169169
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayPath.toString());
170-
Assertions.assertEquals(3, (array).metadata.shape.length);
170+
Assertions.assertEquals(3, array.metadata().shape.length);
171171

172172
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayPath);
173-
Assertions.assertEquals(3, (array).metadata.shape.length);
173+
Assertions.assertEquals(3, array.metadata().shape.length);
174174
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayPath.toString());
175-
Assertions.assertEquals(3, (array).metadata.shape.length);
175+
Assertions.assertEquals(3, array.metadata().shape.length);
176176

177177
Group group = (Group) Node.open(groupPath);
178178
Assertions.assertInstanceOf(Group.class, group.get("subgroup"));
@@ -236,7 +236,7 @@ public void testGroup() throws IOException, ZarrException {
236236
);
237237
array.write(new long[]{2, 2}, ucar.ma2.Array.factory(ucar.ma2.DataType.UBYTE, new int[]{8, 8}));
238238

239-
Assertions.assertArrayEquals(new int[]{5, 5}, ((Array) ((Group) group.listAsArray()[0]).listAsArray()[0]).metadata.chunks);
239+
Assertions.assertArrayEquals(new int[]{5, 5}, ((Array) ((Group) group.listAsArray()[0]).listAsArray()[0]).metadata().chunks);
240240
}
241241

242242

‎src/test/java/dev/zarr/zarrjava/ZarrV3Test.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void testAccess() throws IOException, ZarrException {
220220

221221
Array writeArray = Array.create(
222222
new FilesystemStore(TESTOUTPUT).resolve("l4_sample_2", "color", "1"),
223-
readArray.metadata
223+
readArray.metadata()
224224
);
225225
writeArray.access().withOffset(0, 3073, 3073, 513).write(outArray);
226226
}
@@ -233,7 +233,7 @@ public void testShardingReadWrite(String indexLocation) throws IOException, Zarr
233233
ucar.ma2.Array readArrayContent = readArray.read();
234234
Array writeArray = Array.create(
235235
new FilesystemStore(TESTOUTPUT).resolve("sharding_index_location", indexLocation),
236-
readArray.metadata
236+
readArray.metadata()
237237
);
238238
writeArray.write(readArrayContent);
239239
ucar.ma2.Array outArray = writeArray.read();
@@ -250,7 +250,7 @@ public void testCodecs() throws IOException, ZarrException {
250250
{
251251
Array gzipArray = Array.create(
252252
new FilesystemStore(TESTOUTPUT).resolve("l4_sample_gzip", "color", "8-8-2"),
253-
Array.metadataBuilder(readArray.metadata).withCodecs(c -> c.withGzip(5)).build()
253+
Array.metadataBuilder(readArray.metadata()).withCodecs(c -> c.withGzip(5)).build()
254254
);
255255
gzipArray.write(readArrayContent);
256256
ucar.ma2.Array outGzipArray = gzipArray.read(new long[4], readShape);
@@ -259,7 +259,7 @@ public void testCodecs() throws IOException, ZarrException {
259259
{
260260
Array bloscArray = Array.create(
261261
new FilesystemStore(TESTOUTPUT).resolve("l4_sample_blosc", "color", "8-8-2"),
262-
Array.metadataBuilder(readArray.metadata).withCodecs(c -> c.withBlosc("zstd", 5)).build()
262+
Array.metadataBuilder(readArray.metadata()).withCodecs(c -> c.withBlosc("zstd", 5)).build()
263263
);
264264
bloscArray.write(readArrayContent);
265265
ucar.ma2.Array outBloscArray = bloscArray.read(new long[4], readShape);
@@ -268,7 +268,7 @@ public void testCodecs() throws IOException, ZarrException {
268268
{
269269
Array zstdArray = Array.create(
270270
new FilesystemStore(TESTOUTPUT).resolve("l4_sample_zstd", "color", "8-8-2"),
271-
Array.metadataBuilder(readArray.metadata).withCodecs(c -> c.withZstd(10)).build()
271+
Array.metadataBuilder(readArray.metadata()).withCodecs(c -> c.withZstd(10)).build()
272272
);
273273
zstdArray.write(readArrayContent);
274274
ucar.ma2.Array outZstdArray = zstdArray.read(new long[4], readShape);
@@ -356,8 +356,8 @@ public void testReadL4Sample(String mag) throws IOException, ZarrException {
356356
Array httpArray = Array.open(httpStoreHandle);
357357
Array localArray = Array.open(localStoreHandle);
358358

359-
Assertions.assertArrayEquals(httpArray.metadata.shape, localArray.metadata.shape);
360-
Assertions.assertArrayEquals(httpArray.metadata.chunkShape(), localArray.metadata.chunkShape());
359+
Assertions.assertArrayEquals(httpArray.metadata().shape, localArray.metadata().shape);
360+
Assertions.assertArrayEquals(httpArray.metadata().chunkShape(), localArray.metadata().chunkShape());
361361

362362
ucar.ma2.Array httpData1 = httpArray.read(new long[]{0, 0, 0, 0}, new int[]{1, 64, 64, 64});
363363
ucar.ma2.Array localData1 = localArray.read(new long[]{0, 0, 0, 0}, new int[]{1, 64, 64, 64});
@@ -368,7 +368,7 @@ public void testReadL4Sample(String mag) throws IOException, ZarrException {
368368
long[] offset = new long[4];
369369
long[] originalOffset = new long[]{0, 3073, 3073, 513};
370370
long[] originalShape = new long[]{1, 4096, 4096, 2048};
371-
long[] arrayShape = httpArray.metadata.shape;
371+
long[] arrayShape = httpArray.metadata().shape;
372372
for (int i = 0; i < 4; i++) {
373373
offset[i] = originalOffset[i] / (originalShape[i] / arrayShape[i]);
374374
}
@@ -408,7 +408,7 @@ public void testMetadataAcceptsEmptyStorageTransformer() throws ZarrException, I
408408

409409
Map<String, Object>[] storageTransformersEmpty = Array.open(
410410
new FilesystemStore(TESTDATA).resolve("storage_transformer", "empty")
411-
).metadata.storageTransformers;
411+
).metadata().storageTransformers;
412412
assert storageTransformersEmpty.length == 0;
413413

414414
assertThrows(JsonMappingException.class, () -> Array.open(
@@ -436,13 +436,13 @@ public void testOpen() throws ZarrException, IOException {
436436
StoreHandle v2Handle = new FilesystemStore(TESTDATA).resolve("v2_sample");
437437

438438
Array array = (Array) Node.open(arrayHandle);
439-
Assertions.assertEquals(4, (array).metadata.shape.length);
439+
Assertions.assertEquals(4, array.metadata().shape.length);
440440

441441
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayHandle);
442-
Assertions.assertEquals(4, (array).metadata.shape.length);
442+
Assertions.assertEquals(4, array.metadata().shape.length);
443443

444444
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayHandle);
445-
Assertions.assertEquals(4, (array).metadata.shape.length);
445+
Assertions.assertEquals(4, array.metadata().shape.length);
446446

447447
Group group = (Group) Node.open(groupHandle);
448448
Assertions.assertInstanceOf(Group.class, group.get("color"));
@@ -466,19 +466,19 @@ public void testOpenOverloads() throws ZarrException, IOException {
466466
Path v2GroupPath = TESTDATA.resolve("v2_sample");
467467

468468
Array array = (Array) Node.open(arrayPath);
469-
Assertions.assertEquals(4, (array).metadata.shape.length);
469+
Assertions.assertEquals(4, array.metadata().shape.length);
470470
array = (Array) Node.open(arrayPath.toString());
471-
Assertions.assertEquals(4, (array).metadata.shape.length);
471+
Assertions.assertEquals(4, array.metadata().shape.length);
472472

473473
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayPath);
474-
Assertions.assertEquals(4, (array).metadata.shape.length);
474+
Assertions.assertEquals(4, array.metadata().shape.length);
475475
array = (Array) dev.zarr.zarrjava.core.Array.open(arrayPath.toString());
476-
Assertions.assertEquals(4, (array).metadata.shape.length);
476+
Assertions.assertEquals(4, array.metadata().shape.length);
477477

478478
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayPath);
479-
Assertions.assertEquals(4, (array).metadata.shape.length);
479+
Assertions.assertEquals(4, array.metadata().shape.length);
480480
array = (Array) dev.zarr.zarrjava.core.Node.open(arrayPath.toString());
481-
Assertions.assertEquals(4, (array).metadata.shape.length);
481+
Assertions.assertEquals(4, array.metadata().shape.length);
482482

483483
Group group = (Group) Node.open(groupPath);
484484
Assertions.assertInstanceOf(Group.class, group.get("color"));
@@ -524,7 +524,7 @@ public void testGroup() throws IOException, ZarrException {
524524
);
525525
array.write(new long[]{2, 2}, ucar.ma2.Array.factory(ucar.ma2.DataType.UBYTE, new int[]{8, 8}));
526526

527-
Assertions.assertArrayEquals(new int[]{5, 5}, ((Array) ((Group) group.listAsArray()[0]).listAsArray()[0]).metadata.chunkShape());
527+
Assertions.assertArrayEquals(new int[]{5, 5}, ((Array) ((Group) group.listAsArray()[0]).listAsArray()[0]).metadata().chunkShape());
528528
}
529529

530530
@Test

0 commit comments

Comments
 (0)